Fixes sundry problems with the WPS bundling script. For best results, delete your .rocbox/wps and ./rockbox/themes dirs before upgrading. Note that within CVS, no distinction is made any more between a .wps and .rwps, that's all fixed up at make zip stage. wpses are now all named with a .<width>x<height>x<depth> suffix and the appropriate ones for the platform are installed. Text wpses have a .txt suffix.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9907 a1c6a512-1295-4272-9138-f99709370657

wps/.#WPSLIST.1.2

@@ -0,0 +1,32 @@
+<wps>
+# Name of the WPS _including_ extension
+Name: ipodVOL.wps
+# Name of the creator of the WPS
+Author: xameius
+# prefered font:
+Font: chicago12.fnt
+# Weather the WPS is designed to have the statusbar present or not
+Statusbar: off
+# The minimum required pixel height for the WPS
+Height: 128
+# The minimum required pixel width for the WPS
+Width: 160
+</wps>
+
+<wps>
+Name: rockbox_default.wps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+Height: 2
+Width: 8
+</wps>
+
+<wps>
+Name: boxes.wps
+Author: Christi Scarborough (after the_engineer)
+Font: rockbox_default.fnt
+Statusbar: off
+Height: 128
+Width: 160
+</wps>

wps/.#WPSLIST.1.24

@@ -0,0 +1,132 @@
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+# WPSLIST
+#
+# This should list all WPS and RWPS files we have and what their requirements
+# and preferences are.
+#
+# Each <wps> section will also cause a "theme" .cfg to be made, which the
+# <rwps> sections will not cause.
+#
+# A <wps> section can thus mention a "preferred" rwps file to load when that
+# theme is loaded.
+#
+# All sections should list what their smallest LCD size requirements are and
+# what font and status bar setting they "like".
+
+<wps>
+# Name of the WPS _including_ extension
+Name: ipodVOL.wps
+# default RWPS for the theme (to be loaded with the same theme file)
+RWPS: rockbox_default.rwps
+# Name of the creator of the WPS
+Author: xameius
+# prefered font:
+Font: nimbus-12.fnt
+# Weather the WPS is designed to have the statusbar present or not
+Statusbar: on
+</wps>
+
+<wps>
+Name: rockbox_default.wps
+RWPS: rockbox_default.rwps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+</wps>
+
+<wps>
+Name: boxes.wps
+rwps: boxes.rwps
+Author: Christi Scarborough (after Magnus Westerlund)
+Font: rockbox_default.fnt
+Statusbar: on
+</wps>
+
+<wps>
+Name: engineeer2.wps
+RWPS: engineeer2.rwps
+Author: Magnus Westerlund
+Font: nedore-8.fnt
+Statusbar: on
+</wps>
+
+<wps>
+Name: iAmp.wps
+RWPS: iAmp.rwps
+Author: Raymond Hoh
+Font: nimbus-12.fnt
+Statusbar: on
+</wps>
+
+<wps>
+Name: zezayer.wps
+RWPS: rockbox_default.rwps
+Author: Jake Owen
+Font: nedore-8.fnt
+Statusbar: on
+</wps>
+
+<rwps>
+Name: rockbox_default.rwps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+</rwps>
+
+<rwps>
+Name: iAmp.rwps
+Author: Raymond Hoh
+Font: nimbus-12.fnt
+Statusbar: on
+</rwps>
+
+<rwps>
+Name: boxes.rwps
+Author: Christi Scarborough
+Font: rockbox_default.fnt
+Statusbar: on
+</rwps>
+
+<rwps>
+Name: engineeer2.rwps
+Author: Magnus Westerlund
+Font: nedore-8.fnt
+Statusbar: on
+</rwps>
+
+<wps>
+Name: marquee.wps
+RWPS: marquee.rwps
+Author: Mike Sobel
+Font: chicago12.fnt
+Statusbar: on
+</wps>
+
+<rwps>
+Name: marquee.rwps
+Author: Mike Sobel
+Font: chicago12.fnt
+Statusbar: on
+</rwps>
+
+<wps>
+Name: DancePuffDuo.wps
+RWPS: DancePuffDuo.rwps
+Author: Chris Oxtoby
+Font: chicago12.fnt
+Statusbar: on
+</wps>
+
+<rwps>
+Name: DancePuffDuo.rwps
+Author: Chris Oxtoby
+Font: chicago12.fnt
+Statusbar: on
+</rwps>

wps/.#WPSLIST.1.5

@@ -0,0 +1,66 @@
+<wps>
+# Name of the WPS _including_ extension
+Name: ipodVOL.wps
+# Name of the creator of the WPS
+Author: xameius
+# prefered font:
+Font: chicago12.fnt
+# Weather the WPS is designed to have the statusbar present or not
+Statusbar: off
+# The minimum required pixel height for the WPS
+Height: 128
+# The minimum required pixel width for the WPS
+Width: 160
+</wps>
+
+<wps>
+Name: rockbox_default.wps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+Height: 14
+Width: 55
+</wps>
+
+<wps>
+Name: boxes.wps
+Author: Christi Scarborough (after Magnus Westerlund)
+Font: rockbox_default.fnt
+Statusbar: off
+Height: 128
+Width: 160
+</wps>
+
+<wps>
+# Name of the WPS (_including_ .wps extension)
+Name: engineeer2.wps
+# Real name of the creator of the WPS
+Author: Magnus Westerlund
+# Preferred font (including .fnt extension - leave blank for player):
+Font: Nedore-8.fnt
+# Whether the WPS is designed to have the statusbar on or off
+Statusbar: Off
+# The minimum required pixel height for the WPS
+#  176 for H3xx, 128 for H1xx, 64 for Recorder/Ondio, 14 for player
+Height: 128
+# The minimum required pixel width for the WPS 
+#  220 for H3xx, 160 for H1xx, 112 for Recorder/Ondio, 55 for player
+Width: 160
+</wps>
+
+<wps>
+# Name of the WPS (_including_ .wps extension)
+Name: zezayer.wps
+# Real name of the creator of the WPS
+Author: Jake Owen
+# Preferred font (including .fnt extension - leave blank for player):
+Font: nedore-8.fnt
+# Whether the WPS is designed to have the statusbar on or off
+Statusbar: off
+# The minimum required pixel height for the WPS
+# 176 for H3xx, 128 for H1xx, 64 for Recorder/Ondio, 14 for player
+Height: 128
+# The minimum required pixel width for the WPS 
+# 220 for H3xx, 160 for H1xx, 112 for Recorder/Ondio, 55 for player
+Width: 160
+</wps>

wps/.#wpsbuild.pl.1.9

@@ -0,0 +1,242 @@
+#!/usr/bin/perl
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+
+$ROOT="..";
+
+if($ARGV[0] eq "-r") {
+    $ROOT=$ARGV[1];
+    shift @ARGV;
+    shift @ARGV;    
+}
+
+my $verbose;
+if($ARGV[0] eq "-v") {
+    $verbose =1;
+    shift @ARGV;
+}
+
+my $firmdir="$ROOT/firmware";
+
+my $wpslist=$ARGV[0];
+
+my $target = $ARGV[1];
+my $cppdef = $target;
+
+
+if(!$wpslist) {
+    print "Usage: wpsbuilds.pl <WPSLIST> <target>\n",
+    "Run this script in the root of the target build, and it will put all the\n",
+    "stuff in .rockbox/wps/\n";
+    exit;
+}
+
+sub getlcdsizes {
+    my ($remote) = @_;
+
+    open(GCC, ">gcctemp");
+    if($remote) {
+        # Get the remote LCD screen size
+    print GCC <<STOP
+\#include "config.h"
+#ifdef HAVE_REMOTE_LCD
+Height: LCD_REMOTE_HEIGHT
+Width: LCD_REMOTE_WIDTH
+#endif
+STOP
+;
+    }
+    else {
+    print GCC <<STOP
+\#include "config.h"
+Height: LCD_HEIGHT
+Width: LCD_WIDTH
+STOP
+;
+}
+    close(gcc);
+
+    my $c="cat gcctemp | gcc $cppdef -I. -I$firmdir/export -E -P -";
+
+    #print "CMD $c\n";
+
+    open(GETSIZE, "$c|");
+
+    my ($height, $width);
+    while(<GETSIZE>) {
+        if($_ =~ /^Height: (\d*)/) {
+            $height = $1;
+        }
+        elsif($_ =~ /^Width: (\d*)/) {
+            $width = $1;
+        }
+        if($height && $width) {
+            last;
+        }
+    }
+    close(GETSIZE);
+    unlink("gcctemp");
+
+    return ($height, $width);
+}
+
+sub mkdirs {        
+    my $wpsdir = $wps;
+    $wpsdir =~ s/\.(r|)wps//;
+    mkdir ".rockbox/wps", 0777;
+    mkdir ".rockbox/themes", 0777;
+
+    if( -d ".rockbox/wps/$wpsdir") {
+        #print STDERR "wpsbuild warning: directory wps/$wpsdir already exists!\n";
+    }
+    else {
+        mkdir ".rockbox/wps/$wpsdir", 0777;
+    }
+}
+
+sub copywps {
+    # we assume that we copy the WPS files from the same dir the WPSLIST
+    # file is located in
+    my $dir;
+
+    if($wpslist =~ /(.*)WPSLIST/) {
+        $dir = $1;
+        my $wpsdir = $wps;
+        $wpsdir =~ s/\.(r|)wps//;
+        system("cp $dir/$wps .rockbox/wps/");
+
+        if (-e "$dir/$wpsdir") {
+           system("cp $dir/$wpsdir/*.bmp .rockbox/wps/$wpsdir/");
+        }
+    }
+    else {
+        print STDERR "beep, no dir to copy WPS from!\n";
+    }
+}
+
+sub buildcfg {
+    my $cfg = $wps;
+    my @out;
+
+    $cfg =~ s/\.(r|)wps/.cfg/;
+
+    push @out, <<MOO
+\#
+\# $cfg generated by wpsbuild.pl
+\# $wps is made by $author
+\#
+wps: /.rockbox/wps/$wps
+MOO
+;
+    if($font) {
+        push @out, "font: /.rockbox/fonts/$font\n";
+    }
+    if($statusbar) {
+        push @out, "statusbar: $statusbar\n";
+    }
+    if($rwps && $has_remote ) {
+        push @out, "rwps: /.rockbox/wps/$rwps\n";
+    }
+
+    if(-f ".rockbox/wps/$cfg") {
+        print STDERR "wpsbuild warning: wps/$cfg already exists!\n";
+    }
+    else {
+        open(CFG, ">.rockbox/themes/$cfg");
+        print CFG @out;
+        close(CFG);
+    }
+}
+
+# Get the LCD sizes first
+my ($main_height, $main_width) = getlcdsizes();
+my ($remote_height, $remote_width) = getlcdsizes(1);
+
+$has_remote = true if ($remote_height && $remote_width);
+
+open(WPS, "<$wpslist");
+while(<WPS>) {
+    my $l = $_;
+    if($l =~ /^ *\#/) {
+        # skip comment
+        next;
+    }
+    if($l =~ /^ *<(r|)wps>/i) {
+        $isrwps = $1;
+        $within = 1;
+        next;
+    }
+    if($within) {
+        if($l =~ /^ *<\/${isrwps}wps>/i) {
+            # Get the required width and height
+            my ($rheight, $rwidth);
+            if($isrwps) {
+                ($rheight, $rwidth) = ($remote_height, $remote_width);
+            }
+            else {
+                ($rheight, $rwidth) = ($main_height, $main_width);
+            }
+
+            if(!$rheight || !$rwidth) {
+                printf STDERR "wpsbuild notice: No %sLCD size, skipping $wps\n",
+                $isrwps?"remote ":"";
+                next;
+            }
+
+            #print "LCD: $wps wants $height x $width\n";
+            #print "LCD: is $rheight x $rwidth\n";
+
+            if(($height <= $rheight) && ($width <= $rwidth)) {
+                #
+                # The target model has an LCD that is suitable for this
+                # WPS
+                #
+                #print "Size requirement is fine!\n";
+
+                mkdirs();
+                if(!$isrwps) {
+                    # We only make .cfg files for <wps> sections:
+                    buildcfg();
+                }
+                copywps();
+            }
+            else {
+                #print "Skip $wps due to size restraints\n";
+            }
+            $within = 0;
+
+            undef $wps, $rwps, $width, $height, $font, $statusbar, $author;
+        }
+        elsif($l =~ /^Name: (.*)/i) {
+            # Note that in the case this is within <rwps>, $wps will contain the
+            # name of the rwps. Use $isrwps to figure out what type it is.
+            $wps = $1;
+        }
+        elsif($l =~ /^RWPS: (.*)/i) {
+            $rwps = $1;
+        }
+        elsif($l =~ /^Author: (.*)/i) {
+            $author = $1;
+        }
+        elsif($l =~ /^Width: (.*)/i) {
+            $width = $1;
+        }
+        elsif($l =~ /^Height: (.*)/i) {
+            $height = $1;
+        }
+        elsif($l =~ /^Font: (.*)/i) {
+            $font = $1;
+        }
+        elsif($l =~ /^Statusbar: (.*)/i) {
+            $statusbar = $1;
+        }
+    }
+}
+
+close(WPS)

wps/DancePuffDuo.128x64x1.wps

@@ -29,7 +29,7 @@
 %xl|V|aac.bmp|70|66|
 %xl|W|shn.bmp|70|66|
 %xl|X|aiff.bmp|70|66|
-%xl|Y|unk.bmp|70|66|
+%xl|Y|Unk.bmp|70|66|
 %xl|Z|A-B.bmp|145|0|
 %wd
 %al   %pv%?mh<%xdy|>%?mr<%xdz|>%ac%?mp<%xdb|%xdc|%xdd|%xde|%xdf>%?mm<|%xdg|%xdh|%xdi|%xdZ>%?ps<%xdj|>

wps/DancePuffDuo.160x128x1.wps

@@ -48,7 +48,7 @@
 %xl|V|aac.bmp|70|66|
 %xl|W|shn.bmp|70|66|
 %xl|X|aiff.bmp|70|66|
-%xl|Y|unk.bmp|70|66|
+%xl|Y|Unk.bmp|70|66|
 %xl|Z|A-B.bmp|145|0|
 %wd
 %al   %pv%?mh<%xdy|>%?mr<%xdz|>%ac%?mp<%xdb|%xdc|%xdd|%xde|%xdf>%?mm<|%xdg|%xdh|%xdi|%xdZ>%?ps<%xdj|>

wps/DancePuffDuo.220x176x1.wps

@@ -1,4 +1,4 @@
-%x|a|bg.bmp|0|0|
+%x|a|bg-220x176.bmp|0|0|
 %xl|b|Stp.bmp|102|0|
 %xl|c|Ply.bmp|102|0|
 %xl|d|Pse.bmp|102|0|
@@ -48,7 +48,7 @@
 %xl|V|aac.bmp|100|90|
 %xl|W|shn.bmp|100|90|
 %xl|X|aiff.bmp|100|90|
-%xl|Y|unk.bmp|100|90|
+%xl|Y|Unk.bmp|100|90|
 %xl|Z|A-B.bmp|145|0|
 %wd
 %al   %pv%?mh<%xdy|>%?mr<%xdz|>%ac%?mp<%xdb|%xdc|%xdd|%xde|%xdf>%?mm<|%xdg|%xdh|%xdi|%xdZ>%?ps<%xdj|>

wps/FILES

@@ -1,12 +1,10 @@
 WPSLIST
 *.wps
-*.rwps
 wpsbuild.pl
-ipodVOL/*.bmp
-boxes/*.bmp
-marquee/*.bmp
-DancePuffDuo/*.bmp
-boxes-176x132c/*.bmp
-engineeer2/*.bmp
-iAmp/*.bmp
-zezayer/*.bmp
+ipodVOL.*/*.bmp
+boxes.*/*.bmp
+marquee.*/*.bmp
+DancePuffDuo.*/*.bmp
+engineeer2.*/*.bmp
+iAmp.*/*.bmp
+zezayer.*/*.bmp

wps/WPSLIST

@@ -19,7 +19,6 @@
 #
 # All sections should list what their smallest LCD size requirements are and
 # what font and status bar setting they "like".
-#
 
 <wps>
 # Name of the WPS _including_ extension
@@ -32,10 +31,6 @@ Author: xameius
 Font: nimbus-12.fnt
 # Weather the WPS is designed to have the statusbar present or not
 Statusbar: on
-# The minimum required pixel height for the WPS
-Height: 128
-# The minimum required pixel width for the WPS
-Width: 160
 </wps>
 
 <wps>
@@ -44,8 +39,6 @@ RWPS: rockbox_default.rwps
 Author: Rockbox team
 Font: rockbox_default.fnt
 Statusbar: on
-Height: 14
-Width: 55
 </wps>
 
 <wps>
@@ -54,45 +47,6 @@ rwps: boxes.rwps
 Author: Christi Scarborough (after Magnus Westerlund)
 Font: rockbox_default.fnt
 Statusbar: on
-Height: 128
-Width: 160
-</wps>
-
-<wps>
-Name: boxes-176x132c.wps
-Author: Christi Scarborough (after Magnus Westerlund)
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 132
-Width: 176
-</wps>
-
-<wps>
-Name: boxes-220x176c.wps
-rwps: boxes.wps
-Author: Christi Scarborough (after Magnus Westerlund)
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 176
-Width: 220
-</wps>
-
-<wps>
-Name: boxes-320x240c.wps
-Author: Zakk Roberts (after Christi Scarborough and Magnus Westerlund)
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 240
-Width: 320
-</wps>
-
-<wps>
-Name: boxes-112x64.wps
-Author: Christi Scarborough (after Magnus Westerlund)
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 64
-Width: 112
 </wps>
 
 <wps>
@@ -101,8 +55,6 @@ RWPS: engineeer2.rwps
 Author: Magnus Westerlund
 Font: nedore-8.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <wps>
@@ -111,8 +63,6 @@ RWPS: iAmp.rwps
 Author: Raymond Hoh
 Font: nimbus-12.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <wps>
@@ -121,8 +71,6 @@ RWPS: rockbox_default.rwps
 Author: Jake Owen
 Font: nedore-8.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <rwps>
@@ -130,8 +78,6 @@ Name: rockbox_default.rwps
 Author: Rockbox team
 Font: rockbox_default.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <rwps>
@@ -139,8 +85,6 @@ Name: iAmp.rwps
 Author: Raymond Hoh
 Font: nimbus-12.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <rwps>
@@ -148,8 +92,6 @@ Name: boxes.rwps
 Author: Christi Scarborough
 Font: rockbox_default.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <rwps>
@@ -157,8 +99,6 @@ Name: engineeer2.rwps
 Author: Magnus Westerlund
 Font: nedore-8.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <wps>
@@ -167,8 +107,6 @@ RWPS: marquee.rwps
 Author: Mike Sobel
 Font: chicago12.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <rwps>
@@ -176,28 +114,14 @@ Name: marquee.rwps
 Author: Mike Sobel
 Font: chicago12.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
-<wps>
-Name: DancePuffDuo-220x176.wps
-RWPS: DancePuffDuo.rwps
-Author: Chris Oxtoby
-Font: chicago12.fnt
-Statusbar: on
-Height: 176
-Width: 220
-</wps>
-
 <wps>
 Name: DancePuffDuo.wps
 RWPS: DancePuffDuo.rwps
 Author: Chris Oxtoby
 Font: chicago12.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <rwps>
@@ -205,6 +129,4 @@ Name: DancePuffDuo.rwps
 Author: Chris Oxtoby
 Font: chicago12.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>