mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-21 13:34:59 +02:00
2a4a149624
This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
58 lines
1.3 KiB
Perl
Executable File
58 lines
1.3 KiB
Perl
Executable File
#!/usr/bin/perl -w
|
|
|
|
$CONFIGURE_IN = './configure.in';
|
|
$ORCONFIG_H = './src/win32/orconfig.h';
|
|
$TOR_NSI = './contrib/tor-mingw.nsi.in';
|
|
|
|
sub demand {
|
|
my $fn = shift;
|
|
die "Missing file $fn" unless (-f $fn);
|
|
}
|
|
|
|
demand($CONFIGURE_IN);
|
|
demand($ORCONFIG_H);
|
|
demand($TOR_NSI);
|
|
|
|
# extract version from configure.in
|
|
|
|
open(F, $CONFIGURE_IN) or die "$!";
|
|
$version = undef;
|
|
while (<F>) {
|
|
if (/AC_INIT\(\[tor\],\s*\[([^\]]*)\]\)/) {
|
|
$version = $1;
|
|
last;
|
|
}
|
|
}
|
|
die "No version found" unless $version;
|
|
print "Tor version is $version\n";
|
|
close F;
|
|
|
|
sub correctversion {
|
|
my ($fn, $defchar) = @_;
|
|
undef $/;
|
|
open(F, $fn) or die "$!";
|
|
my $s = <F>;
|
|
close F;
|
|
if ($s =~ /^$defchar(?:)define\s+VERSION\s+\"([^\"]+)\"/m) {
|
|
$oldver = $1;
|
|
if ($oldver ne $version) {
|
|
print "Version mismatch in $fn: It thinks that the version is $oldver. Fixing.\n";
|
|
$line = $defchar . "define VERSION \"$version\"";
|
|
open(F, ">$fn.bak");
|
|
print F $s;
|
|
close F;
|
|
$s =~ s/^$defchar(?:)define\s+VERSION.*?$/$line/m;
|
|
open(F, ">$fn");
|
|
print F $s;
|
|
close F;
|
|
} else {
|
|
print "$fn has the correct version. Good.\n";
|
|
}
|
|
} else {
|
|
print "Didn't find a version line in $fn -- uh oh.\n";
|
|
}
|
|
}
|
|
|
|
correctversion($TOR_NSI, "!");
|
|
correctversion($ORCONFIG_H, "#");
|