daily/voices : get rid of duplicates, add in source/voice URL templates

Change-Id: I757c5d4a2637383683831529963d5a82e3521131

2 files changed, 4 insertions, 27 deletions

diff --git a/tools/buildall-daily.pl b/tools/buildall-daily.pl
index a342958..2908f70 100755
--- a/tools/buildall-daily.pl
+++ b/tools/buildall-daily.pl
@@ -45,20 +45,6 @@ if ($bleeding[2] =~ /rev = \W*(\w+)/) {
     $rev = $1;
 }
 
-if (open OUT, ">output/build-info") {
-    print OUT
-        "[dailies]\n".
-        "timestamp = \"$date\"\n".
-        "rev = \"$rev\"\n";
-
-    print OUT "[daily]\n";
-    for (@targets) {
-        print OUT "$_=$date,https://download.rockbox.org/daily/$_/rockbox-$_-$date.zip\n";
-    }
-
-    close OUT;
-}
-
 if (open OUT, ">output/build-info-$date") {
     print OUT
         "[dailies]\n".
@@ -73,9 +59,9 @@ if (open OUT, ">output/build-info-$date") {
     }
 
     close OUT;
-
 }
 
 # update build-info.daily
+`cp "output/build-info-$date" "output/build-info"`;
 `cp "output/build-info-$date" "../download/build-info.daily"`;
 `(cd ../download ; . .scripts/mkbuildinfo.sh )`;
diff --git a/tools/buildall-voices.pl b/tools/buildall-voices.pl
index 64bb5f5..f71e700 100755
--- a/tools/buildall-voices.pl
+++ b/tools/buildall-voices.pl
@@ -84,16 +84,6 @@ sub buildinfo {
 
     my @voices=&allvoices();
 
-    # store info for the latest build
-    open(F, ">output/build-info-voice");
-    print F "[voices]\n";
-    print F "3.15=english\n";  # Needed for all Archos targets
-    print F "3.13=english\n";  # Needed for Archos recorder only
-    print F "daily=";
-    print F join(",",@voices);
-    print F "\n";
-    close(F);
-
     # store info for this particular date
     open(F, ">output/build-info-voice-$date");
     print F "[voices]\n";
@@ -103,8 +93,9 @@ sub buildinfo {
     print F join(",",@voices);
     close(F);
 
-    `cp "output/build-info-voice" "../download/build-info.voice"`;
-    `(cd ../download ; . .scripts/mkbuildinfo.sh )`;
+   `cp "output/build-info-voice-$date" "output/build-info-voice"`;
+   `cp "output/build-info-voice-$date" "../download/build-info.voice"`;
+   `(cd ../download ; . .scripts/mkbuildinfo.sh )`;
 }
 
 # run make in tools first to make sure they're up-to-date