diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-06-25 08:54:21 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-06-25 08:54:21 +0200 |
commit | bc7ff53eab7341035d5128999576b5987eb2bbe8 (patch) | |
tree | 1f3ff1b6b8c74d0d3a2d920164c60c320838fce4 | |
parent | 388014567fae75c9324d861986bd8e02a74301ba (diff) | |
download | rockbox-bc7ff53eab7341035d5128999576b5987eb2bbe8.tar.gz rockbox-bc7ff53eab7341035d5128999576b5987eb2bbe8.zip |
wpsbuild.pl: Fix FS#12706 - paths for backdrops and icons were not properly constructed.
Change-Id: I90b92241501f61e6b1de5305ff6482a9ddbdf722
-rw-r--r-- | android/.classpath | 1 | ||||
-rwxr-xr-x | wps/wpsbuild.pl | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/android/.classpath b/android/.classpath index 1b4b1eed7e..0ca188f976 100644 --- a/android/.classpath +++ b/android/.classpath | |||
@@ -3,5 +3,6 @@ | |||
3 | <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> | 3 | <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> |
4 | <classpathentry kind="src" path="src"/> | 4 | <classpathentry kind="src" path="src"/> |
5 | <classpathentry kind="src" path="gen"/> | 5 | <classpathentry kind="src" path="gen"/> |
6 | <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> | ||
6 | <classpathentry kind="output" path="bin/classes"/> | 7 | <classpathentry kind="output" path="bin/classes"/> |
7 | </classpath> | 8 | </classpath> |
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index ce4e0e9dd3..6df35df585 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl | |||
@@ -589,20 +589,19 @@ while(<WPS>) { | |||
589 | # mangles some filenames | 589 | # mangles some filenames |
590 | if (defined($backdrop) && $backdrop ne "-") { | 590 | if (defined($backdrop) && $backdrop ne "-") { |
591 | copybackdrop(); | 591 | copybackdrop(); |
592 | $backdrop = normalize($backdrop); | 592 | $backdrop = "$rbdir/" . normalize($backdrop); |
593 | } | 593 | } |
594 | foreach my $i ($iconset, $viewericon, $remoteiconset, $remoteviewericon) { | 594 | foreach my $i ($iconset, $viewericon, $remoteiconset, $remoteviewericon) { |
595 | if (defined($i) && $i ne "-") { | 595 | if (defined($i) && $i ne "-") { |
596 | copythemeicon($i); | 596 | copythemeicon($i); |
597 | $i = "$rbdir/$i"; | ||
597 | } | 598 | } |
598 | } | 599 | } |
599 | if (defined($font) && $font ne "-") { | 600 | foreach my $i ($font, $remotefont) { |
600 | copythemefont($font); | 601 | if (defined($i) && $i ne "-") { |
601 | $font = "$rbdir/fonts/$font"; | 602 | copythemefont($font); |
602 | } | 603 | $i = "$rbdir/fonts/$font"; |
603 | if (defined($remotefont) && $remotefont ne "-") { | 604 | } |
604 | copythemefont($remotefont); | ||
605 | $remotefont = "$rbdir/fonts/$remotefont"; | ||
606 | } | 605 | } |
607 | buildcfg(); | 606 | buildcfg(); |
608 | copywps(); | 607 | copywps(); |