diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-04-04 06:26:53 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-04 06:26:53 +0000 |
commit | abd103c315540cbbb9897ae96985e756786c6ffd (patch) | |
tree | 889df7c4ee702d74fb02a9e5acd27c009e422749 | |
parent | 5a6968918800d64062fa03deae530886aaa42db7 (diff) | |
download | rockbox-abd103c315540cbbb9897ae96985e756786c6ffd.tar.gz rockbox-abd103c315540cbbb9897ae96985e756786c6ffd.zip |
Enable building WPSs and themes for charcell targets, and add an example WPS using special charcell progress and text alignment.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13015 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | tools/buildzip.pl | 2 | ||||
-rw-r--r-- | wps/WPSLIST | 5 | ||||
-rw-r--r-- | wps/progressive.11x2x1.wps | 3 | ||||
-rwxr-xr-x | wps/wpsbuild.pl | 30 |
4 files changed, 24 insertions, 16 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index 3ddb0163d3..380c3a41e2 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -178,6 +178,7 @@ sub buildzip { | |||
178 | } | 178 | } |
179 | 179 | ||
180 | mkdir ".rockbox/wps", 0777; | 180 | mkdir ".rockbox/wps", 0777; |
181 | mkdir ".rockbox/themes", 0777; | ||
181 | mkdir ".rockbox/codepages", 0777; | 182 | mkdir ".rockbox/codepages", 0777; |
182 | 183 | ||
183 | if($bitmap) { | 184 | if($bitmap) { |
@@ -191,7 +192,6 @@ sub buildzip { | |||
191 | 192 | ||
192 | if($bitmap) { | 193 | if($bitmap) { |
193 | mkdir ".rockbox/codecs", 0777; | 194 | mkdir ".rockbox/codecs", 0777; |
194 | mkdir ".rockbox/themes", 0777; | ||
195 | if($depth > 1) { | 195 | if($depth > 1) { |
196 | mkdir ".rockbox/backdrops", 0777; | 196 | mkdir ".rockbox/backdrops", 0777; |
197 | } | 197 | } |
diff --git a/wps/WPSLIST b/wps/WPSLIST index a633764ebb..75d7f060f0 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST | |||
@@ -191,3 +191,8 @@ Foreground Color: 000000 | |||
191 | Background Color: FFC000 | 191 | Background Color: FFC000 |
192 | Statusbar: on | 192 | Statusbar: on |
193 | </wps> | 193 | </wps> |
194 | |||
195 | <wps> | ||
196 | Name: progressive.wps | ||
197 | Author: Jens Arnold | ||
198 | </wps> \ No newline at end of file | ||
diff --git a/wps/progressive.11x2x1.wps b/wps/progressive.11x2x1.wps new file mode 100644 index 0000000000..1e5d853726 --- /dev/null +++ b/wps/progressive.11x2x1.wps | |||
@@ -0,0 +1,3 @@ | |||
1 | #wps for the archos player with text alignment | ||
2 | %s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d2> - %?id<%id|%d1> | ||
3 | %al%pc%ac%pb%ar%pt \ No newline at end of file | ||
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index b33e70bf4a..46aa46eeb8 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl | |||
@@ -56,11 +56,9 @@ STOP | |||
56 | else { | 56 | else { |
57 | print GCC <<STOP | 57 | print GCC <<STOP |
58 | \#include "config.h" | 58 | \#include "config.h" |
59 | #ifdef HAVE_LCD_BITMAP | ||
60 | Height: LCD_HEIGHT | 59 | Height: LCD_HEIGHT |
61 | Width: LCD_WIDTH | 60 | Width: LCD_WIDTH |
62 | Depth: LCD_DEPTH | 61 | Depth: LCD_DEPTH |
63 | #endif | ||
64 | STOP | 62 | STOP |
65 | ; | 63 | ; |
66 | } | 64 | } |
@@ -93,7 +91,7 @@ STOP | |||
93 | return ($height, $width, $depth); | 91 | return ($height, $width, $depth); |
94 | } | 92 | } |
95 | 93 | ||
96 | sub mkdirs { | 94 | sub mkdirs { |
97 | my $wpsdir = $wps; | 95 | my $wpsdir = $wps; |
98 | $wpsdir =~ s/\.(r|)wps//; | 96 | $wpsdir =~ s/\.(r|)wps//; |
99 | mkdir ".rockbox/wps", 0777; | 97 | mkdir ".rockbox/wps", 0777; |
@@ -132,20 +130,22 @@ sub copywps { | |||
132 | } | 130 | } |
133 | close(WPSFILE); | 131 | close(WPSFILE); |
134 | 132 | ||
135 | if (-e "$dir/$wps_prefix/$req_g") { | 133 | if ($#filelist >= 0) { |
136 | foreach $file (@filelist) { | 134 | if (-e "$dir/$wps_prefix/$req_g") { |
137 | system("cp $dir/$wps_prefix/$req_g/$file .rockbox/wps/$wps_prefix/"); | 135 | foreach $file (@filelist) { |
136 | system("cp $dir/$wps_prefix/$req_g/$file .rockbox/wps/$wps_prefix/"); | ||
137 | } | ||
138 | } | ||
139 | elsif (-e "$dir/$wps_prefix") { | ||
140 | foreach $file (@filelist) { | ||
141 | system("cp $dir/$wps_prefix/$file .rockbox/wps/$wps_prefix/"); | ||
142 | } | ||
138 | } | 143 | } |
139 | } | 144 | else { |
140 | elsif (-e "$dir/$wps_prefix") { | 145 | print STDERR "beep, no dir to copy WPS from!\n"; |
141 | foreach $file (@filelist) { | ||
142 | system("cp $dir/$wps_prefix/$file .rockbox/wps/$wps_prefix/"); | ||
143 | } | 146 | } |
144 | } | ||
145 | else { | ||
146 | print STDERR "beep, no dir to copy WPS from!\n"; | ||
147 | } | 147 | } |
148 | 148 | ||
149 | } else { | 149 | } else { |
150 | print STDERR "Skipping $wps - no matching resolution.\n"; | 150 | print STDERR "Skipping $wps - no matching resolution.\n"; |
151 | } | 151 | } |
@@ -255,7 +255,7 @@ while(<WPS>) { | |||
255 | $req_g = $rwidth . "x" . $rheight . "x" . $d; | 255 | $req_g = $rwidth . "x" . $rheight . "x" . $d; |
256 | 256 | ||
257 | $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; | 257 | $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; |
258 | last if (-e "$wpsdir/$req_g_wps"); | 258 | last if (-e "$wpsdir/$req_g_wps"); |
259 | 259 | ||
260 | if ($isrwps) { | 260 | if ($isrwps) { |
261 | $req_g = $req_g . "." . $main_width . "x" . $main_height . "x" . "$main_depth"; | 261 | $req_g = $req_g . "." . $main_width . "x" . $main_height . "x" . "$main_depth"; |