diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/buildzip.pl | 13 | ||||
-rwxr-xr-x | tools/configure | 11 |
2 files changed, 21 insertions, 3 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index e6ddab9b3d..107c1b7ff1 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -50,6 +50,7 @@ $ROOT=".."; | |||
50 | my $ziptool="zip -r9"; | 50 | my $ziptool="zip -r9"; |
51 | my $output="rockbox.zip"; | 51 | my $output="rockbox.zip"; |
52 | my $verbose; | 52 | my $verbose; |
53 | my $sim; | ||
53 | my $exe; | 54 | my $exe; |
54 | my $target; | 55 | my $target; |
55 | my $archos; | 56 | my $archos; |
@@ -95,6 +96,10 @@ while(1) { | |||
95 | $verbose =1; | 96 | $verbose =1; |
96 | shift @ARGV; | 97 | shift @ARGV; |
97 | } | 98 | } |
99 | elsif($ARGV[0] eq "-s") { | ||
100 | $sim =1; | ||
101 | shift @ARGV; | ||
102 | } | ||
98 | else { | 103 | else { |
99 | $target = $ARGV[0]; | 104 | $target = $ARGV[0]; |
100 | $exe = $ARGV[1]; | 105 | $exe = $ARGV[1]; |
@@ -448,7 +453,13 @@ sub runone { | |||
448 | if($verbose) { | 453 | if($verbose) { |
449 | print "$ziptool $output .rockbox $target >/dev/null\n"; | 454 | print "$ziptool $output .rockbox $target >/dev/null\n"; |
450 | } | 455 | } |
451 | system("$ziptool $output .rockbox $target >/dev/null"); | 456 | |
457 | if($sim) { | ||
458 | system("cp -r .rockbox archos/ >/dev/null"); | ||
459 | } | ||
460 | else { | ||
461 | system("$ziptool $output .rockbox $target >/dev/null"); | ||
462 | } | ||
452 | 463 | ||
453 | # remove the .rockbox afterwards | 464 | # remove the .rockbox afterwards |
454 | rmtree('.rockbox'); | 465 | rmtree('.rockbox'); |
diff --git a/tools/configure b/tools/configure index 43974e8dc8..443ea9fbc6 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -2595,7 +2595,8 @@ help: | |||
2595 | @echo "mapzip - creates rockbox-maps.zip with all .map files" | 2595 | @echo "mapzip - creates rockbox-maps.zip with all .map files" |
2596 | @echo "tools - builds the tools only" | 2596 | @echo "tools - builds the tools only" |
2597 | @echo "voicetools - builds the voice tools only" | 2597 | @echo "voicetools - builds the voice tools only" |
2598 | @echo "install - installs your build (for simulator builds only)" | 2598 | @echo "install - installs your build (for simulator builds only, no fonts)" |
2599 | @echo "fullinstall - installs your build (for simulator builds only, with fonts)" | ||
2599 | 2600 | ||
2600 | EOF | 2601 | EOF |
2601 | 2602 | ||
@@ -2604,8 +2605,14 @@ if [ "yes" = "$simulator" ]; then | |||
2604 | cat >> Makefile <<EOF | 2605 | cat >> Makefile <<EOF |
2605 | 2606 | ||
2606 | install: | 2607 | install: |
2608 | @echo "installing your build in your archos dir" | ||
2609 | \$(SILENT)for f in \`cat \$(BUILDDIR)/apps/features\`; do feat="\$\$feat:\$\$f" ; done; \\ | ||
2610 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -s -r "\$(ROOTDIR)" -f 0 \$(TARGET) \$(BINARY) | ||
2611 | |||
2612 | fullinstall: | ||
2607 | @echo "installing a full setup in your archos dir" | 2613 | @echo "installing a full setup in your archos dir" |
2608 | @(\$(MAKE) fullzip && cd archos && unzip -oq ../rockbox-full.zip) | 2614 | \$(SILENT)for f in \`cat \$(BUILDDIR)/apps/features\`; do feat="\$\$feat:\$\$f" ; done; \\ |
2615 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -s -r "\$(ROOTDIR)" -f 2 \$(TARGET) \$(BINARY) | ||
2609 | EOF | 2616 | EOF |
2610 | 2617 | ||
2611 | fi | 2618 | fi |