Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix wpsbuild to properly generate "-" for theme related settings (to get the default values/no file for filename settings).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24813 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-02-21 19:10:57 +00:00
parent f85103e8f2
commit d401d7bc55
2 changed files with 53 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
wps/WPSLIST
View file

@ -73,8 +73,8 @@ backdrop:
iconset:
viewers iconset:
selector type: bar (inverse)
ui viewport: -
remote ui viewport: -
ui viewport:
remote ui viewport:
</wps>
<wps>
@ -89,8 +89,8 @@ backdrop:
iconset:
viewers iconset:
selector type: bar (inverse)
ui viewport: -
remote ui viewport: -
ui viewport:
remote ui viewport:
</wps>
<wps>
@ -105,8 +105,8 @@ iconset:
viewers iconset:
selector type: bar (inverse)
Statusbar: top
ui viewport: -
remote ui viewport: -
ui viewport:
remote ui viewport:
</wps>
<wps>
@ -174,8 +174,8 @@ backdrop:
iconset:
viewers iconset:
selector type: bar (inverse)
ui viewport: -
remote ui viewport: -
ui viewport:
remote ui viewport:
</wps>
<rwps>
@ -211,8 +211,8 @@ backdrop:
iconset:
viewers iconset:
selector type: bar (inverse)
ui viewport: -
remote ui viewport: -
ui viewport:
remote ui viewport:
</wps>
<rwps>
@ -237,8 +237,8 @@ backdrop:
iconset:
viewers iconset:
selector type: bar (inverse)
ui viewport: -
remote ui viewport: -
ui viewport:
remote ui viewport:
</wps>
<rwps>
@ -274,8 +274,8 @@ backdrop:
iconset:
viewers iconset:
selector type: bar (inverse)
ui viewport: -
remote ui viewport: -
ui viewport:
remote ui viewport:
</wps>
<wps>
@ -313,7 +313,7 @@ background color: 000000
line selector start color: fde89e
line selector end color: b58c00
line selector text color: 000000
filetype colours: -
filetype colours:
#backdrop - remember this is the source file name in your SVN folder, not dest name!
backdrop.320x240x16: backdrops/cabbiev2.320x240x16.bmp
@ -372,8 +372,8 @@ Statusbar: top
remote statusbar: top
# list & remote ui viewports
ui viewport: -
remote ui viewport: -
ui viewport:
remote ui viewport:
</wps>
<rwps>

44
wps/wpsbuild.pl
View file

@ -274,7 +274,7 @@ MOO
push @out, "sbs: /$rbdir/wps/$sbs\n";
}
}
if(defined($sbs) && $has_remote) {
if(defined($rsbs) && $has_remote) {
if ($rsbs eq '') {
push @out, "rsbs: -\n";
} else {
@ -282,7 +282,11 @@ MOO
}
}
if($font) {
push @out, "font: /$rbdir/fonts/$font\n";
if ($font eq '') {
push @out, "font: -\n";
} else {
push @out, "font: /$rbdir/fonts/$font\n";
}
}
if($fgcolor && $main_depth > 2) {
push @out, "foreground color: $fgcolor\n";
@ -315,25 +319,49 @@ MOO
push @out, "selector type: $selecttype\n";
}
if(defined($iconset)) {
push @out, "iconset: $iconset\n";
if ($iconset eq '') {
push @out, "iconset: -\n";
} else {
push @out, "iconset: $iconset\n";
}
}
if(defined($viewericon)) {
push @out, "viewers iconset: $viewericon\n";
if ($viewericon eq '') {
push @out, "viewers iconset: -\n";
} else {
push @out, "viewers iconset: $viewericon\n";
}
}
if($lineselecttextcolor && $main_depth > 2 ) {
push @out, "line selector text color: $lineselecttextcolor\n";
}
if($filetylecolor && $main_depth > 2) {
push @out, "filetype colours: $filetylecolor\n";
if ($filetylecolor eq '') {
push @out, "filetype colours: -\n";
} else {
push @out, "filetype colours: $filetylecolor\n";
}
}
if($rwps && $has_remote ) {
push @out, "rwps: /$rbdir/wps/$rwps\n";
if ($rwps eq '') {
push @out, "rwps: -\n";
} else {
push @out, "rwps: /$rbdir/wps/$rwps\n";
}
}
if(defined($listviewport)) {
push @out, "ui viewport: $listviewport\n";
if ($listviewport eq '') {
push @out, "ui viewport: -\n";
} else {
push @out, "ui viewport: $listviewport\n";
}
}
if(defined($remotelistviewport) && $has_remote) {
push @out, "remote ui viewport: $listviewport\n";
if ($remotelistviewport eq '') {
push @out, "remote ui viewport: -\n";
} else {
push @out, "remote ui viewport: $listviewport\n";
}
}
if(-f "$rbdir/wps/$cfg") {
print STDERR "wpsbuild warning: wps/$cfg already exists!\n";