FS#9763 - Sansa Clip modified WPS. This modified wps avoids wps elements getting split over the yellow/cyan

parts of the display. Also introduces a mechanism for selecting a target specific wps if there is already 
another wps with the same screen size.


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

2 files changed, 10 insertions, 10 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 85ffea58dd..7df6af3a36 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -24,7 +24,7 @@ my $verbose;
 my $sim;
 my $exe;
 my $target;
-my $archos;
+my $modelname;
 my $incfonts;
 my $target_id; # passed in, not currently used
 my $rbdir=".rockbox"; # can be changed for special builds
@@ -70,7 +70,7 @@ sub find_copyfile {
 # Get options
 GetOptions ( 'r|root=s'         => \$ROOT,
              'z|ziptool=s'      => \$ziptool,
-             't|target=s'       => \$archos,     # The target name as used in ARCHOS in the root makefile
+             'm|modelname=s' => \$modelname,  # The model name as used in ARCHOS in the root makefile
              'i|id=s'           => \$target_id,  # The target id name as used in TARGET_ID in the root makefile
              'o|output=s'       => \$output,
              'f|fonts=s'        => \$incfonts,   # 0 - no fonts, 1 - fonts only 2 - fonts and package
@@ -389,7 +389,7 @@ STOP
     if(-d "$ROOT/wps") {
         my $wps_build_cmd="perl $ROOT/wps/wpsbuild.pl ";
         $wps_build_cmd=$wps_build_cmd."-v " if $verbose;
-        $wps_build_cmd=$wps_build_cmd." --rbdir=$rbdir -r $ROOT $ROOT/wps/WPSLIST $target";
+        $wps_build_cmd=$wps_build_cmd." --rbdir=$rbdir -r $ROOT -m $modelname $ROOT/wps/WPSLIST $target";
         print "wpsbuild: $wps_build_cmd\n" if $verbose;
         system("$wps_build_cmd");
         print "wps_build_cmd: done\n" if $verbose;
diff --git a/tools/root.make b/tools/root.make
index 7de1cafc31..bdc2745fec 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -203,27 +203,27 @@ tags:
         $(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC))
 
 fontzip:
-        $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY)
+        $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY)
 
 zip:
         $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \
-        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\"  -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
+        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\"  -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
 
 mapzip:
         $(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip
 
 fullzip:
         $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
-        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\"  -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY)
+        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\"  -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY)
 
 7zip:
         $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
-        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\"  -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
+        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\"  -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
 
 tar:
         $(SILENT)rm -f rockbox.tar
         $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
-        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\"  -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
+        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\"  -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
 
 bzip2: tar
         $(SILENT)bzip2 -f9 rockbox.tar
@@ -256,12 +256,12 @@ ifdef SIMVER
 install:
         @echo "Installing your build in your 'simdisk' dir"
         $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
-        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY)
+        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY)
 
 fullinstall:
         @echo "Installing a full setup in your 'simdisk' dir"
         $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
-        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY)
+        $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY)
 
 endif