diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2009-04-11 23:20:09 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2009-04-11 23:20:09 +0000 |
commit | a2008f9bdeed215256d8762d378397c8e417f7df (patch) | |
tree | 24a2498b64bc6314851fe463796217ca8449c5b1 /tools/buildzip.pl | |
parent | fbe39975cfcce5b297cd54ff2952dd6cecebe3eb (diff) | |
download | rockbox-a2008f9bdeed215256d8762d378397c8e417f7df.tar.gz rockbox-a2008f9bdeed215256d8762d378397c8e417f7df.zip |
Revert r20687 since it breaks make zip.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20692 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/buildzip.pl')
-rwxr-xr-x | tools/buildzip.pl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index c32733bcd9..7df6af3a36 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -21,7 +21,7 @@ my $ROOT=".."; | |||
21 | my $ziptool="zip -r9"; | 21 | my $ziptool="zip -r9"; |
22 | my $output="rockbox.zip"; | 22 | my $output="rockbox.zip"; |
23 | my $verbose; | 23 | my $verbose; |
24 | my $install="/dev/null"; | 24 | my $sim; |
25 | my $exe; | 25 | my $exe; |
26 | my $target; | 26 | my $target; |
27 | my $modelname; | 27 | my $modelname; |
@@ -75,7 +75,7 @@ GetOptions ( 'r|root=s' => \$ROOT, | |||
75 | 'o|output=s' => \$output, | 75 | 'o|output=s' => \$output, |
76 | 'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package | 76 | 'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package |
77 | 'v|verbose' => \$verbose, | 77 | 'v|verbose' => \$verbose, |
78 | 'install=s' => \$install, # install destination | 78 | 's|sim' => \$sim, |
79 | 'rbdir=s' => \$rbdir, # If we want to put in a different directory | 79 | 'rbdir=s' => \$rbdir, # If we want to put in a different directory |
80 | ); | 80 | ); |
81 | 81 | ||
@@ -438,11 +438,8 @@ sub runone { | |||
438 | print "$ziptool $output $rbdir $target >/dev/null\n"; | 438 | print "$ziptool $output $rbdir $target >/dev/null\n"; |
439 | } | 439 | } |
440 | 440 | ||
441 | if($install) { | 441 | if($sim) { |
442 | if ($install =~ /\/dev\/null/) { | 442 | system("cp -r $rbdir simdisk/ >/dev/null"); |
443 | die "ERROR: No PREFIX given\n" | ||
444 | } | ||
445 | system("cp -r $rbdir \"$install\" >/dev/null"); | ||
446 | } | 443 | } |
447 | else { | 444 | else { |
448 | system("$ziptool $output $rbdir $target >/dev/null"); | 445 | system("$ziptool $output $rbdir $target >/dev/null"); |