mirror of
https://github.com/netsurf-browser/netsurf
synced 2025-02-22 17:34:19 +03:00
If you pass CI_BUILD=xxx to make, it will build a CI #xxx into the version string and also mention it in the testament
This commit is contained in:
Daniel Silverstone
parent
9c1a04e279
commit
9cb4d00ea9
@ -76,6 +76,7 @@ S_BROWSER := $(addprefix desktop/,$(S_BROWSER))
|
||||
|
||||
# The following files depend on the testament
|
||||
content/fetchers/about.c: testament utils/testament.h
|
||||
desktop/version.c: testament utils/testament.h
|
||||
|
||||
# Some extra rules for building the transliteration table.
|
||||
ifeq ($(HOST),riscos)
|
||||
|
||||
@ -476,6 +476,9 @@ static bool fetch_about_testament_handler(struct fetch_about_context *ctx)
|
||||
"# This testament is therefore very useful.\n\n"
|
||||
#else
|
||||
"# This NetSurf was built from a branch (" WT_BRANCHPATH ").\n\n"
|
||||
#endif
|
||||
#if defined(CI_BUILD)
|
||||
"# This build carries the CI build number '" CI_BUILD "'\n\n"
|
||||
#endif
|
||||
);
|
||||
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
const char * const netsurf_version = "3.0 (Development)";
|
||||
#include "utils/testament.h"
|
||||
|
||||
const char * const netsurf_version = "3.0 (Dev"
|
||||
#if defined(CI_BUILD)
|
||||
" CI #" CI_BUILD
|
||||
#endif
|
||||
")"
|
||||
;
|
||||
const int netsurf_version_major = 3;
|
||||
const int netsurf_version_minor = 0;
|
||||
|
||||
@ -138,6 +138,11 @@ $testament .= "#define WT_ROOT \"$qroot\"\n";
|
||||
$testament .= "#define WT_HOSTNAME \"$hostname\"\n";
|
||||
$testament .= "#define WT_COMPILEDATE \"$compiledate\"\n";
|
||||
|
||||
my $cibuild = $ENV{CI_BUILD};
|
||||
if (defined ($cibuild) && ($cibuild ne '')) {
|
||||
$testament .= "#define CI_BUILD \"$cibuild\"\n";
|
||||
}
|
||||
|
||||
$testament .= "#define WT_BRANCHPATH \"$gitinfo{branch}\"\n";
|
||||
|
||||
if ($gitinfo{branch} =~ m@^master$@) {
|
||||
|
||||
@ -1,216 +0,0 @@
|
||||
#!/usr/bin/perl -w
|
||||
|
||||
use strict;
|
||||
|
||||
=head1
|
||||
|
||||
Generate a testament describing the current SVN status. This gets written
|
||||
out in a C form which can be used to construct the NetSurf SVN testament
|
||||
file for signon notification.
|
||||
|
||||
If there is no SVN in place, the data is invented arbitrarily.
|
||||
|
||||
=cut
|
||||
|
||||
$ENV{LC_ALL} = 'C';
|
||||
|
||||
my $root = shift @ARGV;
|
||||
my $targetfile = shift @ARGV;
|
||||
|
||||
my %svninfo; # The SVN info output
|
||||
|
||||
$root .= "/" unless ($root =~ m@/$@);
|
||||
|
||||
my $svn_present = 0;
|
||||
if ( -d ".svn" ) {
|
||||
$svn_present = 1;
|
||||
}
|
||||
|
||||
sub compat_tmpnam {
|
||||
# File::Temp was introduced in Perl 5.6.1
|
||||
my $have_file_tmp = eval { require File::Temp };
|
||||
|
||||
if ( ! $have_file_tmp ) {
|
||||
return "$$.svnt";
|
||||
} else {
|
||||
return File::Temp::tmpnam();
|
||||
}
|
||||
}
|
||||
|
||||
sub compat_md5_hex {
|
||||
# Digest::MD5 was introduced in Perl 5.7.1
|
||||
my $have_digest_md5 = eval { require Digest::MD5 };
|
||||
my $have_md5 = eval { require MD5 };
|
||||
my $data = shift;
|
||||
|
||||
if ( ! $have_digest_md5 ) {
|
||||
return MD5->hexhash($data);
|
||||
} else {
|
||||
return Digest::MD5->new->add($data)->hexdigest;
|
||||
}
|
||||
}
|
||||
|
||||
sub gather_output {
|
||||
my $cmd = shift;
|
||||
my $tmpfile = compat_tmpnam();
|
||||
local $/ = undef();
|
||||
system("$cmd > $tmpfile");
|
||||
open(my $CMDH, "<", $tmpfile);
|
||||
my $ret = <$CMDH>;
|
||||
close($CMDH);
|
||||
unlink($tmpfile);
|
||||
return $ret;
|
||||
}
|
||||
|
||||
if ( $svn_present ) {
|
||||
foreach my $line (split(/\n/, gather_output("svn info $root"))) {
|
||||
my ($key, $value) = split(/: /, $line, 2);
|
||||
$key = lc($key);
|
||||
$key =~ s/\s+//g;
|
||||
$svninfo{$key} = $value;
|
||||
}
|
||||
} else {
|
||||
$svninfo{repositoryroot} = "http://nowhere/";
|
||||
$svninfo{url} = "http://nowhere/tarball/";
|
||||
$svninfo{revision} = "unknown";
|
||||
}
|
||||
|
||||
my %svnstatus; # The SVN status output
|
||||
|
||||
if ( $svn_present ) {
|
||||
foreach my $line (split(/\n/, gather_output("svn status $root"))) {
|
||||
chomp $line;
|
||||
my $op = substr($line, 0, 1);
|
||||
if ($op eq ' ' && substr($line, 1, 1) ne ' ') { $op = "p"; }
|
||||
my $fn = substr($line, 8);
|
||||
$fn = substr($fn, length($root)) if (substr($fn, 0, length($root)) eq $root);
|
||||
next unless (care_about_file($fn, $op));
|
||||
$svnstatus{$fn} = $op;
|
||||
}
|
||||
}
|
||||
|
||||
my %userinfo; # The information about the current user
|
||||
|
||||
{
|
||||
my @pwent = getpwuid($<);
|
||||
$userinfo{USERNAME} = $pwent[0];
|
||||
my $gecos = $pwent[6];
|
||||
$gecos =~ s/,.+//g;
|
||||
$gecos =~ s/"/'/g;
|
||||
$userinfo{GECOS} = $gecos;
|
||||
}
|
||||
|
||||
# The current date, in AmigaOS version friendly format (dd.mm.yyyy)
|
||||
|
||||
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime();
|
||||
my $compiledate = sprintf("%02d.%02d.%d",$mday,$mon+1,$year+1900);
|
||||
chomp $compiledate;
|
||||
|
||||
# Spew the testament out
|
||||
|
||||
my $testament = "";
|
||||
|
||||
$testament .= "#define USERNAME \"$userinfo{USERNAME}\"\n";
|
||||
$testament .= "#define GECOS \"$userinfo{GECOS}\"\n";
|
||||
|
||||
my $qroot = $root;
|
||||
$qroot =~ s/"/\\"/g;
|
||||
|
||||
my $hostname = $ENV{HOSTNAME};
|
||||
|
||||
unless ( defined($hostname) && $hostname ne "") {
|
||||
# Try hostname command if env-var empty
|
||||
$hostname = gather_output("hostname");
|
||||
chomp $hostname;
|
||||
}
|
||||
|
||||
$hostname = "unknown-host" unless (defined($hostname) && $hostname ne "");
|
||||
$hostname =~ s/"/\\"/g;
|
||||
|
||||
$testament .= "#define WT_ROOT \"$qroot\"\n";
|
||||
$testament .= "#define WT_HOSTNAME \"$hostname\"\n";
|
||||
$testament .= "#define WT_COMPILEDATE \"$compiledate\"\n";
|
||||
|
||||
my $url = $svninfo{url};
|
||||
# This only works on 1.3.x and above
|
||||
$url = substr($url, length($svninfo{repositoryroot}));
|
||||
if ( substr($url,0,1) ne '/' ) { $url = "/$url"; }
|
||||
$testament .= "#define WT_BRANCHPATH \"$url\"\n";
|
||||
if ($url =~ m@/trunk/@) {
|
||||
$testament .= "#define WT_BRANCHISTRUNK 1\n";
|
||||
}
|
||||
if ($url =~ m@/tags/@) {
|
||||
$testament .= "#define WT_BRANCHISTAG 1\n";
|
||||
}
|
||||
if ($url =~ m@/tarball/@) {
|
||||
$testament .= "#define WT_NO_SVN 1\n";
|
||||
}
|
||||
$testament .= "#define WT_REVID \"$svninfo{revision}\"\n";
|
||||
$testament .= "#define WT_MODIFIED " . scalar(keys %svnstatus) . "\n";
|
||||
$testament .= "#define WT_MODIFICATIONS {\\\n";
|
||||
my $doneone = 0;
|
||||
foreach my $filename (sort keys %svnstatus) {
|
||||
if ($doneone) {
|
||||
$testament .= ", \\\n";
|
||||
}
|
||||
$testament .= " { \"$filename\", \"$svnstatus{$filename}\" }";
|
||||
$doneone = 1;
|
||||
}
|
||||
$testament .= " \\\n}\n";
|
||||
|
||||
my $oldcsum = "";
|
||||
if ( -e $targetfile ) {
|
||||
open(my $OLDVALUES, "<", $targetfile);
|
||||
foreach my $line (readline($OLDVALUES)) {
|
||||
if ($line =~ /MD5:([0-9a-f]+)/) {
|
||||
$oldcsum = $1;
|
||||
}
|
||||
}
|
||||
close($OLDVALUES);
|
||||
}
|
||||
|
||||
my $newcsum = compat_md5_hex($testament);
|
||||
|
||||
if ($oldcsum ne $newcsum) {
|
||||
print "TESTMENT: $targetfile\n";
|
||||
open(my $NEWVALUES, ">", $targetfile) or die "$!";
|
||||
print $NEWVALUES "/* ", $targetfile,"\n";
|
||||
print $NEWVALUES <<'EOS';
|
||||
*
|
||||
* Revision testament.
|
||||
*
|
||||
* *WARNING* this file is automatically generated by svn-testament.pl
|
||||
*
|
||||
* Copyright 2011 NetSurf Browser Project
|
||||
*/
|
||||
|
||||
EOS
|
||||
|
||||
print $NEWVALUES "#ifndef NETSURF_REVISION_TESTAMENT\n";
|
||||
print $NEWVALUES "#define NETSURF_REVISION_TESTAMENT \"$newcsum\"\n\n";
|
||||
print $NEWVALUES "/* Revision testament checksum:\n";
|
||||
print $NEWVALUES " * MD5:", $newcsum,"\n */\n\n";
|
||||
print $NEWVALUES "/* Revision testament: */\n";
|
||||
print $NEWVALUES $testament;
|
||||
print $NEWVALUES "\n#endif\n";
|
||||
close($NEWVALUES);
|
||||
foreach my $unwanted (@ARGV) {
|
||||
next unless(-e $unwanted);
|
||||
print "TESTAMENT: Removing $unwanted\n";
|
||||
system("rm", "-f", "--", $unwanted);
|
||||
}
|
||||
} else {
|
||||
print "TESTMENT: unchanged\n";
|
||||
}
|
||||
|
||||
exit 0;
|
||||
|
||||
sub care_about_file {
|
||||
my ($fn, $op) = @_;
|
||||
return 0 if ($fn =~ /\.d$/); # Don't care for extraneous DEP files
|
||||
return 0 if ($fn =~ /\.a$/); # Don't care for extraneous archive files
|
||||
return 0 if ($fn =~ /\.md5$/); # Don't care for md5sum files
|
||||
return 0 if ($fn =~ /\.map$/); # Don't care for map files
|
||||
return 0 if ($fn =~ /\.svnt$/); # Don't care for testament temp files
|
||||
return 1;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user