diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-08-01 16:15:27 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-01 16:15:27 +0000 |
commit | 9c0b2479f7025a84444adf08e3be8ced60dad013 (patch) | |
tree | f3d328dd73f46d599f0432cc43ae206798cbe4f6 /tools/buildzip.pl | |
parent | 2e7d92fef707a2cd30820fd0053c539c3ac8e2b3 (diff) | |
download | rockbox-9c0b2479f7025a84444adf08e3be8ced60dad013.tar.gz rockbox-9c0b2479f7025a84444adf08e3be8ced60dad013.zip |
Rockbox as an application: add get_user_file_path().
For RaaA it evaluates user paths at runtime. For everything but codecs/plugins it will give the path under $HOME/.config/rockbox.org if write access is needed or if the file/folder in question exists there (otherwise it gives /usr/local/share/rockbox).
This allows for installing themes under $HOME as well as having config.cfg and other important files there while installing the application (and default themes) under /usr/local.
On the DAPs it's a no-op, returing /.rockbox directly.
Not converted to use get_user_file_path() are plugins themselves, because RaaA doesn't build plugins yet.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27656 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/buildzip.pl')
-rwxr-xr-x | tools/buildzip.pl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index 0358459c9c..7a127dea20 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -30,7 +30,6 @@ my $target_id; # passed in, not currently used | |||
30 | my $rbdir=".rockbox"; # can be changed for special builds | 30 | my $rbdir=".rockbox"; # can be changed for special builds |
31 | my $app; | 31 | my $app; |
32 | 32 | ||
33 | |||
34 | sub glob_mkdir { | 33 | sub glob_mkdir { |
35 | my ($dir) = @_; | 34 | my ($dir) = @_; |
36 | mkpath ($dir, $verbose, 0777); | 35 | mkpath ($dir, $verbose, 0777); |
@@ -550,7 +549,7 @@ STOP | |||
550 | if(-d "$ROOT/wps") { | 549 | if(-d "$ROOT/wps") { |
551 | my $wps_build_cmd="perl $ROOT/wps/wpsbuild.pl "; | 550 | my $wps_build_cmd="perl $ROOT/wps/wpsbuild.pl "; |
552 | $wps_build_cmd=$wps_build_cmd."-v " if $verbose; | 551 | $wps_build_cmd=$wps_build_cmd."-v " if $verbose; |
553 | $wps_build_cmd=$wps_build_cmd." --rbdir=$rbdir -r $ROOT -m $modelname $ROOT/wps/WPSLIST $target"; | 552 | $wps_build_cmd=$wps_build_cmd." --tempdir=$temp_dir --rbdir=$rbdir -r $ROOT -m $modelname $ROOT/wps/WPSLIST $target"; |
554 | print "wpsbuild: $wps_build_cmd\n" if $verbose; | 553 | print "wpsbuild: $wps_build_cmd\n" if $verbose; |
555 | system("$wps_build_cmd"); | 554 | system("$wps_build_cmd"); |
556 | print "wps_build_cmd: done\n" if $verbose; | 555 | print "wps_build_cmd: done\n" if $verbose; |
@@ -607,6 +606,10 @@ sub runone { | |||
607 | 606 | ||
608 | # in the app the the layout is different (no .rockbox, but bin/lib/share) | 607 | # in the app the the layout is different (no .rockbox, but bin/lib/share) |
609 | $app = ($modelname eq "application"); | 608 | $app = ($modelname eq "application"); |
609 | unless ($app) { | ||
610 | #rbdir starts with '/', strip it | ||
611 | $rbdir = substr($rbdir, 1); | ||
612 | } | ||
610 | 613 | ||
611 | # build a full install .rockbox ($rbdir) directory | 614 | # build a full install .rockbox ($rbdir) directory |
612 | buildzip($target, $fonts); | 615 | buildzip($target, $fonts); |