Index: w32sims.pl
===================================================================
--- w32sims.pl	(revision 18923)
+++ w32sims.pl	(working copy)
@@ -9,11 +9,10 @@
     if ($ARGV[0] eq "-h") {
         print $ARGV[0]."\n";
         print <<MOO
-Usage: w32sims [-v] [-u] [-r VERSION] [buildonly]
+Usage: w32sims.pl [-v] [-u] [-r VERSION] [buildonly]
        -v Verbose output
        -u Run svn up before building
-       -r Use the specified version string for filenames (defaults to SVN
-          revision)
+       -r Add the specified version string to filenames
 MOO
 ;
         exit 1;
@@ -25,7 +24,7 @@
         $update =1;
     }
     elsif ($ARGV[0] eq "-r") {
-        $version =$ARGV[1];
+        $version = sprintf("-%s", $ARGV[1]);
         shift @ARGV;
     }
     else {
@@ -46,7 +45,7 @@
 print "rev $rev\n" if($verbose);
 
 if (!defined($version)) {
-    $version = sprintf("r%d", $rev);
+    $version = "";
 }
 
 # made once for all targets
@@ -73,7 +72,7 @@
 
     my $o="rockbox-$dir-w32-sim/rockbox.zip";
     if (-f $o) {
-        my $newo="output/rockbox-$dir-$version-w32-sim.zip";
+        my $newo="output/rockbox-$dir$version-w32-sim.zip";
         system("mkdir -p output");
         system("mv $o $newo");
         print "moved $o to $newo\n" if($verbose);
Index: voices.pl
===================================================================
--- voices.pl	(revision 18923)
+++ voices.pl	(working copy)
@@ -1,19 +1,49 @@
 #!/usr/bin/perl
 
-$version="3.0";
-
-my $verbose;
-if($ARGV[0] eq "-v") {
-    $verbose =1;
+my $verbose, $update, $doonly, $version;
+while (scalar @ARGV > 0) {
+    if ($ARGV[0] eq "-h") {
+        print $ARGV[0]."\n";
+        print <<MOO
+Usage: voices.pl [-v] [-u] [-r VERSION] [buildonly]
+       -v Verbose output
+       -u Run svn up before building
+       -r Add the specified version string to filenames
+MOO
+;
+        exit 1;
+    }
+    elsif ($ARGV[0] eq "-v") {
+        $verbose =1;
+    }
+    elsif ($ARGV[0] eq "-u") {
+        $update =1;
+    }
+    elsif ($ARGV[0] eq "-r") {
+        $version = sprintf("-%s", $ARGV[1]);
+        shift @ARGV;
+    }
+    else {
+        $doonly =$ARGV[0];
+        # This will only be printed if the -v flag comes earler
+        print "only build $doonly\n" if($verbose);
+    }
     shift @ARGV;
 }
 
-my $doonly;
-if($ARGV[0]) {
-    $doonly = $ARGV[0];
-    print "only build $doonly\n" if($verbose);
+if($update) {
+    # svn update!
+    system("svn -q up");
 }
 
+$rev = `svnversion`;
+chomp $rev;
+print "rev $rev\n" if($verbose);
+
+if (!defined($version)) {
+    $version = "";
+}
+
 # made once for all targets
 sub runone {
     my ($dir, $select, $newl)=@_;
@@ -34,8 +64,8 @@
 
     my $o="build-$dir/english.voice";
     if (-f $o) {
-        my $newo="output/$dir-$version-english.zip";
-        system("cp $o output/$dir-$version-english.voice");
+        my $newo="output/$dir$version-english.zip";
+        system("cp $o output/$dir$version-english.voice");
         system("mkdir -p .rockbox/langs");
         system("cp $o .rockbox/langs");
         system("zip -r $newo .rockbox");
@@ -68,8 +98,8 @@
 # run make in tools first to make sure they're up-to-date
 `(cd tools && make ) >/dev/null 2>&1`;
 
-`rm -f /home/dast/tmp/rockbox-voices-$version/voice-pool/*`;
-$ENV{'POOL'}="/home/dast/tmp/rockbox-voices-$version/voice-pool";
+`rm -f $ENV{'HOME'}/tmp/rockbox-voices$version/voice-pool/*`;
+$ENV{'POOL'}=$ENV{'HOME'}."/tmp/rockbox-voices$version/voice-pool";
 
 runone("player", "player", 1);
 runone("recorder", "recorder", 1);
Index: bins.pl
===================================================================
--- bins.pl	(revision 18923)
+++ bins.pl	(working copy)
@@ -1,25 +1,37 @@
 #!/usr/bin/perl
 
-$version="3.0";
-
-my $verbose;
-if($ARGV[0] eq "-v") {
-    $verbose =1;
+my $verbose, $update, $doonly, $version;
+while (scalar @ARGV > 0) {
+    if ($ARGV[0] eq "-h") {
+        print $ARGV[0]."\n";
+        print <<MOO
+Usage: bins.pl [-v] [-u] [-r VERSION] [buildonly]
+       -v Verbose output
+       -u Run svn up before building
+       -r Add the specified version string to filenames
+MOO
+;
+        exit 1;
+    }
+    elsif ($ARGV[0] eq "-v") {
+        $verbose =1;
+    }
+    elsif ($ARGV[0] eq "-u") {
+        $update =1;
+    }
+    elsif ($ARGV[0] eq "-r") {
+        $version = sprintf("-%s", $ARGV[1]);
+        printf("Building version %s", $ARGV[1]) if($verbose);
+        shift @ARGV;
+    }
+    else {
+        $doonly =$ARGV[0];
+        # This will only be printed if the -v flag comes earler
+        print "only build $doonly\n" if($verbose);
+    }
     shift @ARGV;
 }
 
-my $update;
-if($ARGV[0] eq "-u") {
-    $update =1;
-    shift @ARGV;
-}
-
-my $doonly;
-if($ARGV[0]) {
-    $doonly = $ARGV[0];
-    print "only build $doonly\n" if($verbose);
-}
-
 if($update) {
     # svn update!
     system("svn -q up");
@@ -29,6 +41,10 @@
 chomp $rev;
 print "rev $rev\n" if($verbose);
 
+if (!defined($version)) {
+    $version = "";
+}
+
 # made once for all targets
 sub runone {
     my ($dir, $confnum, $extra)=@_;
@@ -49,7 +65,7 @@
 
     my $o="build-$dir/rockbox.zip";
     if (-f $o) {
-        my $newo="output/rockbox-$dir-$version.zip";
+        my $newo="output/rockbox-$dir$version.zip";
         system("mkdir -p output");
         system("mv $o $newo");
         print "moved $o to $newo\n" if($verbose);
@@ -80,7 +96,7 @@
 
     my $o="build-$dir/rockbox-fonts.zip";
     if (-f $o) {
-        my $newo="output/rockbox-fonts-$version.zip";
+        my $newo="output/rockbox-fonts$version.zip";
         system("mv $o $newo");
         print "moved $o to $newo\n" if($verbose);
     }
Index: manuals.pl
===================================================================
--- manuals.pl	(revision 18923)
+++ manuals.pl	(working copy)
@@ -1,19 +1,49 @@
 #!/usr/bin/perl
 
-$version="3.0";
-
-my $verbose;
-if($ARGV[0] eq "-v") {
-    $verbose =1;
+my $verbose, $update, $doonly, $version;
+while (scalar @ARGV > 0) {
+    if ($ARGV[0] eq "-h") {
+        print $ARGV[0]."\n";
+        print <<MOO
+Usage: manuals.pl [-v] [-u] [-r VERSION] [buildonly]
+       -v Verbose output
+       -u Run svn up before building
+       -r Add the specified version string to filenames
+MOO
+;
+        exit 1;
+    }
+    elsif ($ARGV[0] eq "-v") {
+        $verbose =1;
+    }
+    elsif ($ARGV[0] eq "-u") {
+        $update =1;
+    }
+    elsif ($ARGV[0] eq "-r") {
+        $version = sprintf("-%s", $ARGV[1]);
+        shift @ARGV;
+    }
+    else {
+        $doonly =$ARGV[0];
+        # This will only be printed if the -v flag comes earler
+        print "only build $doonly\n" if($verbose);
+    }
     shift @ARGV;
 }
 
-my $doonly;
-if($ARGV[0]) {
-    $doonly = $ARGV[0];
-    print "only build $doonly\n" if($verbose);
+if($update) {
+    # svn update!
+    system("svn -q up");
 }
 
+$rev = `svnversion`;
+chomp $rev;
+print "rev $rev\n" if($verbose);
+
+if (!defined($version)) {
+    $version = "";
+}
+
 # made once for all targets
 sub runone {
     my ($dir, $conf, $nl)=@_;
@@ -34,14 +64,14 @@
 
     my $o="buildm-$dir/manual/rockbox-build.pdf";
     if (-f $o) {
-        my $newo="output/rockbox-$dir-$version.pdf";
+        my $newo="output/rockbox-$dir$version.pdf";
         system("mv $o $newo");
         print "moved $o to $newo\n" if($verbose);
     }
 
     $o="buildm-$dir/rockbox-manual.zip";
     if (-f $o) {
-        my $newo="output/rockbox-$dir-$version-html.zip";
+        my $newo="output/rockbox-$dir$version-html.zip";
         system("mv $o $newo");
         print "moved $o to $newo\n" if($verbose);
     }