diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-11-22 12:03:03 -0500 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-11-22 12:03:03 -0500 |
| commit | 340ac0447a9415f7e076df14a79293977b752315 (patch) | |
| tree | 2e7b0e3fe05134fb91142fa4d0491d04f680484f | |
| parent | 28b961d2ff6e09fb36ef4b8fc229302815abfff5 (diff) | |
| download | www-340ac0447a9415f7e076df14a79293977b752315.tar.gz www-340ac0447a9415f7e076df14a79293977b752315.zip | |
build-info: Rework format of development builds.
| -rwxr-xr-x | buildserver/devbuilds.pl | 53 | ||||
| -rw-r--r-- | buildserver/devbuilds.pm | 34 | ||||
| -rwxr-xr-x | buildserver/hooks/roundcomplete.sh | 11 | ||||
| -rwxr-xr-x | buildserver/mktitlepics.pl | 67 |
4 files changed, 52 insertions, 113 deletions
diff --git a/buildserver/devbuilds.pl b/buildserver/devbuilds.pl index ae35e23..3b24c3c 100755 --- a/buildserver/devbuilds.pl +++ b/buildserver/devbuilds.pl @@ -1,7 +1,41 @@ #!/usr/bin/perl require "../rockbox.pm"; -require "./devbuilds.pm"; + +my $basedir = "/home/rockbox/build"; +my %revs; + +sub buildtable { + print "<p><table class='rockbox' cellpadding=\"0\"><tr valign=top>\n"; + for my $m (usablebuilds()) { + if( ($m =~ /source/ ) || -r "$basedir/data/rockbox-$m.zip") { + my $pack="data/rockbox-$m.zip"; + my $name= $builds{$m}{name}, + my $version = ""; + my $rev="broken?"; + my @ver = `unzip -p data/rockbox-$m.zip .rockbox/rockbox-info.txt`; + $version = (grep /^Version/, @ver)[0]; + chomp $version; + if($version =~ /^Version: *(\w+)/) { + $rev = $1; + } + else { + print "<br>Failed regex: $version\n"; + } + $revs{$m} = $rev; + if($col++ > 7) { + print "</tr><tr valign=\"top\">"; + $col=1; + } + printf("<td align='center'><a href=\"$pack\" title=\"$name\"><img border=\"0\" src=\"//www.rockbox.org%s\" alt=\"$name\"><p>$name</a><br><small>$rev</small></td>\n", + playerpic($m)); + } + else { + #print "<br>MISSING: $basedir/data/rockbox-$m.zip\n"; + } + } + print "</tr></table>"; +} header_b("Rockbox Development Builds"); @@ -13,7 +47,7 @@ print <<HEAD builds are not currently showing, wait 5-10 minutes and then refresh the page. <p> Since these builds are generated from actively developed source, at times - they may be buggy or even unusable. + they may be buggy or even unusable. We appreciate your feedback on any issues you may encounter. $beware @@ -22,7 +56,7 @@ $beware For a stable build, <a href="//www.rockbox.org/download/">download the latest stable release</a>. <p> -<a href="dev.cgi">Autobuilder details</a> · +<a href="dev.cgi">Autobuilder details</a> · <a href="//www.rockbox.org/manual.shtml">Manuals</a> · <a href="//www.rockbox.org/daily.shtml">Archived developer builds</a> HEAD @@ -31,3 +65,16 @@ HEAD buildtable(); footer(); + +my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time); +my $date=sprintf("%04d%02d%02dT%02d%02d%02dZ", $year + 1900, $mon + 1, $mday, $hour, $min, $sec); + +open(F, ">build-info.new"); +print F "[bleeding]\n"; +print F "timestamp=\"$date\"\n"; +print F "rev=\"$ARGV[0]\"\n"; +print F "[development]\n"; +for my $m (usablebuilds()) { + print F "$m=$revs{$m},https://build.rockbox.org/data/rockbox-$m.zip\n"; +} +close(F); diff --git a/buildserver/devbuilds.pm b/buildserver/devbuilds.pm deleted file mode 100644 index 9337325..0000000 --- a/buildserver/devbuilds.pm +++ /dev/null @@ -1,34 +0,0 @@ -my $basedir = "/home/rockbox/build"; - -sub buildtable { - print "<p><table class='rockbox' cellpadding=\"0\"><tr valign=top>\n"; - for my $m (usablebuilds()) { - if( ($m =~ /source/ ) || -r "$basedir/data/rockbox-$m.zip") { - my $pack="data/rockbox-$m.zip"; - my $name= $builds{$m}{name}, - my $version = ""; - my $rev="broken?"; - my @ver = `unzip -p data/rockbox-$m.zip .rockbox/rockbox-info.txt`; - $version = (grep /^Version/, @ver)[0]; - chomp $version; - if($version =~ /^Version: *(\w+)/) { - $rev = $1; - } - else { - print "<br>Failed regex: $version\n"; - } - if($col++ > 7) { - print "</tr><tr valign=\"top\">"; - $col=1; - } - printf("<td align='center'><a href=\"$pack\" title=\"$name\"><img border=\"0\" src=\"//www.rockbox.org%s\" alt=\"$name\"><p>$name</a><br><small>$rev</small></td>\n", - playerpic($m)); - } - else { - #print "<br>MISSING: $basedir/data/rockbox-$m.zip\n"; - } - } - print "</tr></table>"; -} - -1; diff --git a/buildserver/hooks/roundcomplete.sh b/buildserver/hooks/roundcomplete.sh index 16f2bd3..4878f33 100755 --- a/buildserver/hooks/roundcomplete.sh +++ b/buildserver/hooks/roundcomplete.sh @@ -21,15 +21,8 @@ else perl showbuilds.pl > builds.html.new && mv builds.html.new builds.html perl showbuilds.pl 1 > builds_all.html.new && mv builds_all.html.new builds_all.html perl showsize.pl > sizes.html.new && mv sizes.html.new sizes.html - perl devbuilds.pl > devbuilds.html.new && mv devbuilds.html.new devbuilds.html -# perl mktitlepics.pl - - # make build-info for rbutil - echo "[bleeding]" > build-info.new - date +'timestamp = "%Y%m%dT%H%M%SZ"' >> build-info.new - echo -n 'rev = "' >> build-info.new - echo -n $rev >> build-info.new - echo '"' >> build-info.new + perl devbuilds.pl $rev > devbuilds.html.new && mv devbuilds.html.new devbuilds.html + # created by devbuilds.pl mv build-info.new /home/rockbox/download/build-info.devbuild # udpate local git repo diff --git a/buildserver/mktitlepics.pl b/buildserver/mktitlepics.pl deleted file mode 100755 index 9221204..0000000 --- a/buildserver/mktitlepics.pl +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/perl - -my $dir = "titles"; - -my %builds; - -# copy from rbmaster.pl, could be made a .pm -sub getbuilds { - my ($filename)=@_; - open(F, "<$filename"); - while(<F>) { - # sdl:nozip:recordersim:Recorder - Simulator:rockboxui:--target=recorder,--ram=2,--type=s - next if (/^#/); - if($_ =~ /([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):(.*)/) { - my ($arch, $zip, $id, $name, $file, $confopts) = - ($1, $2, $3, $4, $5, $6); - $builds{$id}{'arch'}=$arch; - $builds{$id}{'zip'}=$zip; - $builds{$id}{'name'}=$name; - $builds{$id}{'file'}=$file; - $builds{$id}{'confopts'}=$confopts; - $builds{$id}{'handcount'} = 0; # not handed out to anyone - $builds{$id}{'done'} = 0; # not done - } - } - close(F); -} - - -getbuilds("builds"); - -foreach my $id (keys %builds) { - next if (-f "$dir/$id.png"); - - my $text = $builds{$id}{'name'}; - print "long: $text => "; - - $text =~ s/FM Recorder/FM Rec/; - $text =~ s/Debug/Dbg/; - $text =~ s/Normal//; - $text =~ s/Simulator/Sim/; - $text =~ s/iriver *//i; - $text =~ s/Archos *//i; - $text =~ s/ - $//; - $text =~ s/Win32/Win/; - $text =~ s/- +-/-/g; - $text =~ s/Grayscale/Gray/; - $text =~ s/Sim - Win/Sim32/; - $text =~ s/Toshiba *//i; - $text =~ s/SanDisk *//i; - $text =~ s/Olympus *//i; - $text =~ s/Creative *//i; - $text =~ s/Philips *//i; - $text =~ s/Zen Vision M/ZVM/i; - $text =~ s/Samsung/Smsg/i; - $text =~ s/Packard Bell *//i; - - print "short: $text\n"; - - # create image with text - `convert -font helvetica -pointsize 13 -fill black -draw "text 1,13 '$text'" text-bg.png dump.png`; - - # rotate image - `convert -rotate -90 dump.png $dir/$id.png`; -} - -unlink "dump.png"; |