Added tiny docs, only make .cfg files for <wps> sections and shut up a few

outputs.


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

2 files changed, 40 insertions, 5 deletions

diff --git a/wps/WPSLIST b/wps/WPSLIST
index b425543dc0..6f06f71967 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -1,3 +1,26 @@
+#             __________               __   ___.
+#   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
@@ -59,3 +82,12 @@ Statusbar: off
 Height: 128
 Width: 160
 </wps>
+
+<rwps>
+Name: rockbox_default.rwps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+Height: 64
+Width: 128
+</rwps>
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 366f77bfe1..7fe46adcf3 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -92,7 +92,7 @@ sub mkdirs {
     mkdir ".rockbox/wps", 0777;
 
     if( -d ".rockbox/wps/$wpsdir") {
-        print STDERR "wpsbuild warning: directory wps/$wpsdir already exists!\n";
+        #print STDERR "wpsbuild warning: directory wps/$wpsdir already exists!\n";
     }
     else {
         mkdir ".rockbox/wps/$wpsdir", 0777;
@@ -109,9 +109,7 @@ sub copywps {
         my $wpsdir = $wps;
         $wpsdir =~ s/\.(r|)wps//;
         system("cp $dir/$wps .rockbox/wps/");
-        if ($rwps) {
-          system("cp $dir/$rwps .rockbox/wps/");
-        }
+
         if (-e "$dir/$wpsdir") {
            system("cp $dir/$wpsdir/*.bmp .rockbox/wps/$wpsdir/");
         }
@@ -199,7 +197,10 @@ while(<WPS>) {
                 #print "Size requirement is fine!\n";
 
                 mkdirs();
-                buildcfg();
+                if(!$isrwps) {
+                    # We only make .cfg files for <wps> sections:
+                    buildcfg();
+                }
                 copywps();
             }
             else {
@@ -210,6 +211,8 @@ while(<WPS>) {
             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) {