vishapoberon/compiler
1
0
Fork 0
mirror of https://github.com/vishapoberon/compiler.git synced 2026-04-06 02:52:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move version string physically into Version binary, fix diff parm on centos.

Browse source
This commit is contained in:
David Brown 2016-07-08 23:28:51 +01:00
parent 365275ebcd
commit 92e2c51806
3 changed files with 5 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tools/make/configure.c
View file

@ -394,7 +394,6 @@ void writeConfigurationMod() {
fprintf(fd, "MODULE Configuration;\n");
fprintf(fd, "CONST\n");
fprintf(fd, " name* = '%s';\n", oname);
fprintf(fd, " versionLong* = '%s';\n", versionstring);
fprintf(fd, " intsize* = %d;\n", intsize);
fprintf(fd, " addressSize* = %d;\n", addressSize);
fprintf(fd, " alignment* = %d;\n", alignment);
@ -406,6 +405,10 @@ void writeConfigurationMod() {
fprintf(fd, " dataModel* = '%s';\n", dataModel);
fprintf(fd, " installdir* = '%s';\n", installdir);
fprintf(fd, " staticLink* = '%s';\n", staticlink);
fprintf(fd, "VAR\n");
fprintf(fd, " versionLong-: ARRAY %d OF CHAR;\n", strnlen(versionstring, 100)+1);
fprintf(fd, "BEGIN\n");
fprintf(fd, " versionLong := '%s';\n", versionstring);
fprintf(fd, "END Configuration.\n");
fclose(fd);

110
src/tools/make/pt.pl
View file

@ -1,110 +0,0 @@
#!perl -w
use strict;
use warnings;
use POSIX "strftime";
my %status = ();
sub parselog {
my ($fn) = @_;
#print "Parsing log $fn\n";
my $date = "";
my $time = "";
my $branch = "";
my $os = "";
my $compiler = "";
my $datamodel = "";
my $compilerok = "";
my $libraryok = "";
my $sourcechange = "";
my $tests = "";
open(my $log, $fn) // die "Couldn't open build log $fn.";
while (<$log>) {
if (/^([0-9\/]+) [0-9.]+ [^ ]+\.log$/) {$date = $1;}
if (/^[^ ]+ --- Cleaning branch ([^ ]+) ([^ ]+) ([^ ]+) ([^ ]+) ---$/) {
($branch, $os, $compiler, $datamodel) = ($1, $2, $3, $4, $5);
}
if (/^([0-9.]+) --- Compiler build started ---$/) {$compilerok = "Started";}
if (/^([0-9.]+) --- Compiler build successfull ---$/) {$compilerok = "Built";}
if (/^([0-9.]+) --- Library build started ---$/) {$libraryok = "Started";}
if (/^([0-9.]+) --- Library build successfull ---$/) {$libraryok = "Built";}
if (/^([0-9.]+) --- Generated c source files match bootstrap ---$/) {$sourcechange = "Unchanged";}
if (/^([0-9.]+) --- Generated c source files differ from bootstrap ---$/) {$sourcechange = "Changed";}
if (/^([0-9.]+) --- Confidence tests started ---$/) {$tests = "Started";}
if (/^([0-9.]+) --- Confidence tests passed ---$/) {$tests = "Passed";}
}
close($log);
my $key = "$os-$compiler-$datamodel";
if ($key ne "") {
$status{$key} = [$date, $time, $os, $compiler, $datamodel, $branch, $compilerok, $libraryok, $sourcechange, $tests];
}
}
opendir DIR, "log" // die "Could not open log directory.";
my @logs = readdir DIR;
closedir DIR;
for my $logname (sort @logs) {
$logname = "log/" . $logname;
#print "Consider $logname\n";
if (-f $logname) {parselog($logname);}
}
my $emsperline = 1.2;
sub svgtext {
my ($f, $x, $y, $colour, $msg) = @_;
print $f '<text x="', $x;
print $f '" y="', ($y+1)*$emsperline + 0.3;
print $f 'em" font-family="Verdana" font-size="1em" fill="';
print $f $colour;
print $f '">';
print $f $msg;
print $f "</text>\n";
}
my $rows = keys %status;
open(my $svg, ">build-status.svg") // die "Could not create build-status.svg.";
print $svg '<svg width="680" height="';
print $svg ($rows+2) * $emsperline;
print $svg 'em" xmlns="http://www.w3.org/2000/svg" version="1.1">', "\n";
print $svg '<rect width="100%" height="100%" rx="20" ry="20" fill="#404040"/>', "\n";
my $col1 = 20;
my $col2 = 110;
my $col3 = 200;
my $col4 = 310;
my $col5 = 400;
my $col6 = 490;
my $col7 = 580;
svgtext($svg, $col1, 0, "#e0e0e0", "OS");
svgtext($svg, $col2, 0, "#e0e0e0", "Compiler");
svgtext($svg, $col3, 0, "#e0e0e0", "Data model");
svgtext($svg, $col4, 0, "#e0e0e0", "Compiler");
svgtext($svg, $col5, 0, "#e0e0e0", "Library");
svgtext($svg, $col6, 0, "#e0e0e0", "C Source");
svgtext($svg, $col7, 0, "#e0e0e0", "Tests");
my $i=1;
for my $key (sort keys %status) {
my ($date, $time, $os, $compiler, $datamodel,
$branch, $compilerok, $libraryok, $sourcechange, $tests) = @{$status{$key}};
svgtext($svg, $col1, $i, "#c0c0c0", $os);
svgtext($svg, $col2, $i, "#c0c0c0", $compiler);
svgtext($svg, $col3, $i, "#c0c0c0", $datamodel);
svgtext($svg, $col4, $i, "#60ff60", $compilerok);
svgtext($svg, $col5, $i, "#60ff60", $libraryok);
svgtext($svg, $col6, $i, "#60ff60", $sourcechange);
svgtext($svg, $col7, $i, "#60ff60", $tests);
$i++;
}
print $svg "</svg>\n";
system 'scp -p build-status.svg dave@hub:/var/www';

2
src/tools/make/sourcechanges.sh
View file

@ -16,7 +16,7 @@ for f in $1/*; do
fn=$(basename $f)
egrep -v "^/\* voc " $f >$fn.old
egrep -v "^/\* voc " $fn >$fn.new
if ! diff --tabsize=2 -U 2 -b $fn.old $fn.new >$fn.diff; then
if ! diff -U 2 -b $fn.old $fn.new >$fn.diff; then
echo ""
echo ""
cat $fn.diff