diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-02-21 19:10:57 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-02-21 19:10:57 +0000 |
commit | d401d7bc5528360130746e4511e03068821cc3af (patch) | |
tree | 4cde2edaeb8f72d72a84ad7121f4febcd2417963 | |
parent | f85103e8f2fe19b8e4495bc0317dd853f6aca23a (diff) | |
download | rockbox-d401d7bc5528360130746e4511e03068821cc3af.tar.gz rockbox-d401d7bc5528360130746e4511e03068821cc3af.zip |
Fix wpsbuild to properly generate "-" for theme related settings (to get the default values/no file for filename settings).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24813 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | wps/WPSLIST | 34 | ||||
-rwxr-xr-x | wps/wpsbuild.pl | 44 |
2 files changed, 53 insertions, 25 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST index 9b52416ec2..e6dc238466 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST | |||
@@ -73,8 +73,8 @@ backdrop: | |||
73 | iconset: | 73 | iconset: |
74 | viewers iconset: | 74 | viewers iconset: |
75 | selector type: bar (inverse) | 75 | selector type: bar (inverse) |
76 | ui viewport: - | 76 | ui viewport: |
77 | remote ui viewport: - | 77 | remote ui viewport: |
78 | </wps> | 78 | </wps> |
79 | 79 | ||
80 | <wps> | 80 | <wps> |
@@ -89,8 +89,8 @@ backdrop: | |||
89 | iconset: | 89 | iconset: |
90 | viewers iconset: | 90 | viewers iconset: |
91 | selector type: bar (inverse) | 91 | selector type: bar (inverse) |
92 | ui viewport: - | 92 | ui viewport: |
93 | remote ui viewport: - | 93 | remote ui viewport: |
94 | </wps> | 94 | </wps> |
95 | 95 | ||
96 | <wps> | 96 | <wps> |
@@ -105,8 +105,8 @@ iconset: | |||
105 | viewers iconset: | 105 | viewers iconset: |
106 | selector type: bar (inverse) | 106 | selector type: bar (inverse) |
107 | Statusbar: top | 107 | Statusbar: top |
108 | ui viewport: - | 108 | ui viewport: |
109 | remote ui viewport: - | 109 | remote ui viewport: |
110 | </wps> | 110 | </wps> |
111 | 111 | ||
112 | <wps> | 112 | <wps> |
@@ -174,8 +174,8 @@ backdrop: | |||
174 | iconset: | 174 | iconset: |
175 | viewers iconset: | 175 | viewers iconset: |
176 | selector type: bar (inverse) | 176 | selector type: bar (inverse) |
177 | ui viewport: - | 177 | ui viewport: |
178 | remote ui viewport: - | 178 | remote ui viewport: |
179 | </wps> | 179 | </wps> |
180 | 180 | ||
181 | <rwps> | 181 | <rwps> |
@@ -211,8 +211,8 @@ backdrop: | |||
211 | iconset: | 211 | iconset: |
212 | viewers iconset: | 212 | viewers iconset: |
213 | selector type: bar (inverse) | 213 | selector type: bar (inverse) |
214 | ui viewport: - | 214 | ui viewport: |
215 | remote ui viewport: - | 215 | remote ui viewport: |
216 | </wps> | 216 | </wps> |
217 | 217 | ||
218 | <rwps> | 218 | <rwps> |
@@ -237,8 +237,8 @@ backdrop: | |||
237 | iconset: | 237 | iconset: |
238 | viewers iconset: | 238 | viewers iconset: |
239 | selector type: bar (inverse) | 239 | selector type: bar (inverse) |
240 | ui viewport: - | 240 | ui viewport: |
241 | remote ui viewport: - | 241 | remote ui viewport: |
242 | </wps> | 242 | </wps> |
243 | 243 | ||
244 | <rwps> | 244 | <rwps> |
@@ -274,8 +274,8 @@ backdrop: | |||
274 | iconset: | 274 | iconset: |
275 | viewers iconset: | 275 | viewers iconset: |
276 | selector type: bar (inverse) | 276 | selector type: bar (inverse) |
277 | ui viewport: - | 277 | ui viewport: |
278 | remote ui viewport: - | 278 | remote ui viewport: |
279 | </wps> | 279 | </wps> |
280 | 280 | ||
281 | <wps> | 281 | <wps> |
@@ -313,7 +313,7 @@ background color: 000000 | |||
313 | line selector start color: fde89e | 313 | line selector start color: fde89e |
314 | line selector end color: b58c00 | 314 | line selector end color: b58c00 |
315 | line selector text color: 000000 | 315 | line selector text color: 000000 |
316 | filetype colours: - | 316 | filetype colours: |
317 | 317 | ||
318 | #backdrop - remember this is the source file name in your SVN folder, not dest name! | 318 | #backdrop - remember this is the source file name in your SVN folder, not dest name! |
319 | backdrop.320x240x16: backdrops/cabbiev2.320x240x16.bmp | 319 | backdrop.320x240x16: backdrops/cabbiev2.320x240x16.bmp |
@@ -372,8 +372,8 @@ Statusbar: top | |||
372 | remote statusbar: top | 372 | remote statusbar: top |
373 | 373 | ||
374 | # list & remote ui viewports | 374 | # list & remote ui viewports |
375 | ui viewport: - | 375 | ui viewport: |
376 | remote ui viewport: - | 376 | remote ui viewport: |
377 | </wps> | 377 | </wps> |
378 | 378 | ||
379 | <rwps> | 379 | <rwps> |
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index 7cc5367381..81a90f3c04 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl | |||
@@ -274,7 +274,7 @@ MOO | |||
274 | push @out, "sbs: /$rbdir/wps/$sbs\n"; | 274 | push @out, "sbs: /$rbdir/wps/$sbs\n"; |
275 | } | 275 | } |
276 | } | 276 | } |
277 | if(defined($sbs) && $has_remote) { | 277 | if(defined($rsbs) && $has_remote) { |
278 | if ($rsbs eq '') { | 278 | if ($rsbs eq '') { |
279 | push @out, "rsbs: -\n"; | 279 | push @out, "rsbs: -\n"; |
280 | } else { | 280 | } else { |
@@ -282,7 +282,11 @@ MOO | |||
282 | } | 282 | } |
283 | } | 283 | } |
284 | if($font) { | 284 | if($font) { |
285 | push @out, "font: /$rbdir/fonts/$font\n"; | 285 | if ($font eq '') { |
286 | push @out, "font: -\n"; | ||
287 | } else { | ||
288 | push @out, "font: /$rbdir/fonts/$font\n"; | ||
289 | } | ||
286 | } | 290 | } |
287 | if($fgcolor && $main_depth > 2) { | 291 | if($fgcolor && $main_depth > 2) { |
288 | push @out, "foreground color: $fgcolor\n"; | 292 | push @out, "foreground color: $fgcolor\n"; |
@@ -315,25 +319,49 @@ MOO | |||
315 | push @out, "selector type: $selecttype\n"; | 319 | push @out, "selector type: $selecttype\n"; |
316 | } | 320 | } |
317 | if(defined($iconset)) { | 321 | if(defined($iconset)) { |
318 | push @out, "iconset: $iconset\n"; | 322 | if ($iconset eq '') { |
323 | push @out, "iconset: -\n"; | ||
324 | } else { | ||
325 | push @out, "iconset: $iconset\n"; | ||
326 | } | ||
319 | } | 327 | } |
320 | if(defined($viewericon)) { | 328 | if(defined($viewericon)) { |
321 | push @out, "viewers iconset: $viewericon\n"; | 329 | if ($viewericon eq '') { |
330 | push @out, "viewers iconset: -\n"; | ||
331 | } else { | ||
332 | push @out, "viewers iconset: $viewericon\n"; | ||
333 | } | ||
322 | } | 334 | } |
323 | if($lineselecttextcolor && $main_depth > 2 ) { | 335 | if($lineselecttextcolor && $main_depth > 2 ) { |
324 | push @out, "line selector text color: $lineselecttextcolor\n"; | 336 | push @out, "line selector text color: $lineselecttextcolor\n"; |
325 | } | 337 | } |
326 | if($filetylecolor && $main_depth > 2) { | 338 | if($filetylecolor && $main_depth > 2) { |
327 | push @out, "filetype colours: $filetylecolor\n"; | 339 | if ($filetylecolor eq '') { |
340 | push @out, "filetype colours: -\n"; | ||
341 | } else { | ||
342 | push @out, "filetype colours: $filetylecolor\n"; | ||
343 | } | ||
328 | } | 344 | } |
329 | if($rwps && $has_remote ) { | 345 | if($rwps && $has_remote ) { |
330 | push @out, "rwps: /$rbdir/wps/$rwps\n"; | 346 | if ($rwps eq '') { |
347 | push @out, "rwps: -\n"; | ||
348 | } else { | ||
349 | push @out, "rwps: /$rbdir/wps/$rwps\n"; | ||
350 | } | ||
331 | } | 351 | } |
332 | if(defined($listviewport)) { | 352 | if(defined($listviewport)) { |
333 | push @out, "ui viewport: $listviewport\n"; | 353 | if ($listviewport eq '') { |
354 | push @out, "ui viewport: -\n"; | ||
355 | } else { | ||
356 | push @out, "ui viewport: $listviewport\n"; | ||
357 | } | ||
334 | } | 358 | } |
335 | if(defined($remotelistviewport) && $has_remote) { | 359 | if(defined($remotelistviewport) && $has_remote) { |
336 | push @out, "remote ui viewport: $listviewport\n"; | 360 | if ($remotelistviewport eq '') { |
361 | push @out, "remote ui viewport: -\n"; | ||
362 | } else { | ||
363 | push @out, "remote ui viewport: $listviewport\n"; | ||
364 | } | ||
337 | } | 365 | } |
338 | if(-f "$rbdir/wps/$cfg") { | 366 | if(-f "$rbdir/wps/$cfg") { |
339 | print STDERR "wpsbuild warning: wps/$cfg already exists!\n"; | 367 | print STDERR "wpsbuild warning: wps/$cfg already exists!\n"; |