diff options
Diffstat (limited to 'wps/wpsbuild.pl')
-rwxr-xr-x | wps/wpsbuild.pl | 13 |
1 files changed, 8 insertions, 5 deletions
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 { | |||
92 | mkdir ".rockbox/wps", 0777; | 92 | mkdir ".rockbox/wps", 0777; |
93 | 93 | ||
94 | if( -d ".rockbox/wps/$wpsdir") { | 94 | if( -d ".rockbox/wps/$wpsdir") { |
95 | print STDERR "wpsbuild warning: directory wps/$wpsdir already exists!\n"; | 95 | #print STDERR "wpsbuild warning: directory wps/$wpsdir already exists!\n"; |
96 | } | 96 | } |
97 | else { | 97 | else { |
98 | mkdir ".rockbox/wps/$wpsdir", 0777; | 98 | mkdir ".rockbox/wps/$wpsdir", 0777; |
@@ -109,9 +109,7 @@ sub copywps { | |||
109 | my $wpsdir = $wps; | 109 | my $wpsdir = $wps; |
110 | $wpsdir =~ s/\.(r|)wps//; | 110 | $wpsdir =~ s/\.(r|)wps//; |
111 | system("cp $dir/$wps .rockbox/wps/"); | 111 | system("cp $dir/$wps .rockbox/wps/"); |
112 | if ($rwps) { | 112 | |
113 | system("cp $dir/$rwps .rockbox/wps/"); | ||
114 | } | ||
115 | if (-e "$dir/$wpsdir") { | 113 | if (-e "$dir/$wpsdir") { |
116 | system("cp $dir/$wpsdir/*.bmp .rockbox/wps/$wpsdir/"); | 114 | system("cp $dir/$wpsdir/*.bmp .rockbox/wps/$wpsdir/"); |
117 | } | 115 | } |
@@ -199,7 +197,10 @@ while(<WPS>) { | |||
199 | #print "Size requirement is fine!\n"; | 197 | #print "Size requirement is fine!\n"; |
200 | 198 | ||
201 | mkdirs(); | 199 | mkdirs(); |
202 | buildcfg(); | 200 | if(!$isrwps) { |
201 | # We only make .cfg files for <wps> sections: | ||
202 | buildcfg(); | ||
203 | } | ||
203 | copywps(); | 204 | copywps(); |
204 | } | 205 | } |
205 | else { | 206 | else { |
@@ -210,6 +211,8 @@ while(<WPS>) { | |||
210 | undef $wps, $rwps, $width, $height, $font, $statusbar, $author; | 211 | undef $wps, $rwps, $width, $height, $font, $statusbar, $author; |
211 | } | 212 | } |
212 | elsif($l =~ /^Name: (.*)/i) { | 213 | elsif($l =~ /^Name: (.*)/i) { |
214 | # Note that in the case this is within <rwps>, $wps will contain the | ||
215 | # name of the rwps. Use $isrwps to figure out what type it is. | ||
213 | $wps = $1; | 216 | $wps = $1; |
214 | } | 217 | } |
215 | elsif($l =~ /^RWPS: (.*)/i) { | 218 | elsif($l =~ /^RWPS: (.*)/i) { |