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

wpsbuild.pl: Fix FS#12706 - paths for backdrops and icons were not properly constructed.

Browse source 
Change-Id: I90b92241501f61e6b1de5305ff6482a9ddbdf722
This commit is contained in:
Thomas Martitz 2012-06-25 08:54:21 +02:00
parent 388014567f
commit bc7ff53eab
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/.classpath
View file

@ -3,5 +3,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

15
wps/wpsbuild.pl
View file

@ -589,20 +589,19 @@ while(<WPS>) {
# mangles some filenames # mangles some filenames
if (defined($backdrop) && $backdrop ne "-") { if (defined($backdrop) && $backdrop ne "-") {
copybackdrop(); copybackdrop();
$backdrop = normalize($backdrop); $backdrop = "$rbdir/" . normalize($backdrop);
} }
foreach my $i ($iconset, $viewericon, $remoteiconset, $remoteviewericon) { foreach my $i ($iconset, $viewericon, $remoteiconset, $remoteviewericon) {
if (defined($i) && $i ne "-") { if (defined($i) && $i ne "-") {
copythemeicon($i); copythemeicon($i);
$i = "$rbdir/$i";
} }
} }
if (defined($font) && $font ne "-") { foreach my $i ($font, $remotefont) {
copythemefont($font); if (defined($i) && $i ne "-") {
$font = "$rbdir/fonts/$font"; copythemefont($font);
} $i = "$rbdir/fonts/$font";
if (defined($remotefont) && $remotefont ne "-") { }
copythemefont($remotefont);
$remotefont = "$rbdir/fonts/$remotefont";
} }
buildcfg(); buildcfg();
copywps(); copywps();