Index: tools/release/bins.pl =================================================================== --- tools/release/bins.pl (revision 21166) +++ tools/release/bins.pl (working copy) @@ -1,7 +1,5 @@ #!/usr/bin/perl -$version="3.0"; - my $verbose; if($ARGV[0] eq "-v") { $verbose =1; @@ -14,6 +12,9 @@ shift @ARGV; } +my $version = $ARGV[0]; +shift @ARGV; + my $doonly; if($ARGV[0]) { $doonly = $ARGV[0]; @@ -33,13 +34,12 @@ sub runone { my ($dir, $confnum, $extra)=@_; my $a; - if($doonly && ($doonly ne $dir)) { return; } - mkdir "build-$dir"; - chdir "build-$dir"; + mkdir "build-$dir" or die; + chdir "build-$dir" or die; print "Build in build-$dir\n" if($verbose); # build the manual(s) @@ -97,15 +97,12 @@ my ($target, $confnum, $extra)=@_; `rm -rf * >/dev/null 2>&1`; - - my $c = sprintf('echo -e "%s\n%sn\n" | ../tools/configure', - $confnum, $extra); - - print "C: $c\n" if($verbose); - `$c`; - + + print "../tools/configure --target=$confnum --type=N --release=$version-$rev $extra\n" if($verbose); + `../tools/configure --target=$confnum --type=N --release=$version-$rev $extra`; + print "Run 'make'\n" if($verbose); - `make -j 2>/dev/null`; + `make -j 6>/dev/null`; print "Run 'make zip'\n" if($verbose); `make zip 2>/dev/null`; @@ -133,22 +130,22 @@ print "cd tools && make\n" if($verbose); `(cd tools && make ) >/dev/null 2>&1`; -runone("player", "player", '\n'); -runone("recorder", "recorder", '\n'); -runone("recorder8mb", "recorder", '8\n'); -runone("fmrecorder", "fmrecorder", '\n'); -runone("fmrecorder8mb", "fmrecorder", '8\n'); -runone("recorderv2", "recorderv2", '\n'); -runone("ondiosp", "ondiosp", '\n'); -runone("ondiofm", "ondiofm", '\n'); +runone("player", "player", "--ram=2"); +runone("recorder", "recorder", "--ram=2"); +runone("recorder8mb", "recorder", "--ram=8"); +runone("fmrecorder", "fmrecorder", "--ram=2"); +runone("fmrecorder8mb", "fmrecorder", "--ram=8"); +runone("recorderv2", "recorderv2", "--ram=2"); +runone("ondiosp", "ondiosp", "--ram=2"); +runone("ondiofm", "ondiofm", "--ram=2"); runone("h100", "h100"); runone("h120", "h120"); runone("h300", "h300"); runone("ipodcolor", "ipodcolor"); runone("ipodnano", "ipodnano"); runone("ipod4gray", "ipod4g"); -runone("ipodvideo", "ipodvideo", '32\n'); -runone("ipodvideo64mb", "ipodvideo", '64\n'); +runone("ipodvideo", "ipodvideo", "--ram=32"); +runone("ipodvideo64mb", "ipodvideo", "--ram=64"); runone("ipod3g", "ipod3g"); runone("ipod1g2g", "ipod1g2g"); runone("iaudiox5", "x5"); Index: tools/configure =================================================================== --- tools/configure (revision 21166) +++ tools/configure (working copy) @@ -74,7 +74,7 @@ # parse the argument list, returns the value after the = in case of a # option=value type option, returns 0 in case of --ccache or --no-ccache, -# returns 1 if the searched argument type wasn't fount in the argument list +# returns 1 if the searched argument type wasn't found in the argument list # Usage [var = ]`parse_args `, e.g. `parse_args --target` # var definitons below are needed so that parse_args can see the arguments @@ -2509,6 +2509,11 @@ echo "Using alternate rockbox dir: ${rbdir}" fi +if [ "1" != `parse_args --release` ]; then + release=`parse_args --release`; + echo "building rockbox release: ${release}" +fi + sed > autoconf.h \ -e "s,@ENDIAN@,${defendian},g" \ -e "s,^#undef ROCKBOX_HAS_LOGF,$use_logf,g" \ @@ -2642,6 +2647,7 @@ -e "s,@RBDIR@,${rbdir},g" \ -e "s,@PREFIX@,$PREFIX,g" \ -e "s,@CMDLINE@,$cmdline,g" \ + -e "s,@RELEASE@,${release},g" \ <