strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Goodbye autogen.lastrun"

Browse source 
Welcome back autogen.lastrun. I just don't have the energy to convince
tinderbox maintainers to fix their scripts. Oh well.

This reverts commit 7496c83374.
This commit is contained in:
Tor Lillqvist 2017-09-22 16:51:22 +03:00
parent 7df3faa8eb
commit c32d54f244
2 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.in
View file

@ -46,6 +46,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/configure.ac \
$(SRCDIR)/config_host/*.h.in \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
$(BUILDDIR)/autogen.sh \
) \
$(shell . $(SRCDIR)/bin/get_config_variables JAVA_HOME && \

47
autogen.sh
View file

@ -1,7 +1,15 @@
:
#
# This script checks various configure parameters and uses three files:
# * autogen.input (ro)
# * autogen.lastrun (rw)
# * autogen.lastrun.bak (rw)
#
# If _no_ parameters:
# Read args from autogen.input
# Read args from autogen.input or autogen.lastrun
# Else
# Backup autogen.lastrun as autogen.lastrun.bak
# Write autogen.lastrun with new commandline args
#
# Run configure with checked args
#
@ -178,7 +186,7 @@ unlink ("configure");
system ("autoconf -I ${src_path}") && die "Failed to run autoconf";
die "Failed to generate the configure script" if (! -f "configure");
# Handle help arguments first
# Handle help arguments first, so we don't clobber autogen.lastrun
for my $arg (@ARGV) {
if ($arg =~ /^(--help|-h|-\?)$/) {
print STDOUT "autogen.sh - libreoffice configuration helper\n";
@ -193,10 +201,24 @@ for my $arg (@ARGV) {
my @cmdline_args = ();
my $input = "autogen.input";
my $lastrun = "autogen.lastrun";
if (!@ARGV) {
if (-f $input) {
if (-f $lastrun) {
print STDERR <<WARNING;
********************************************************************
*
* Reading $input and ignoring $lastrun!
* Consider removing $lastrun to get rid of this warning.
*
********************************************************************
WARNING
}
@cmdline_args = read_args ($input);
} elsif (-f $lastrun) {
print STDERR "Reading $lastrun. Please rename it to $input to avoid this message.\n";
@cmdline_args = read_args ($lastrun);
}
} else {
if (-f $input) {
@ -243,6 +265,27 @@ for my $arg (@args) {
if (defined $ENV{NOCONFIGURE}) {
print "Skipping configure process.";
} else {
# Save autogen.lastrun only if we did get some arguments on the command-line
if (! -f $input && @ARGV) {
if (scalar(@cmdline_args) > 0) {
# if there's already an autogen.lastrun, make a backup first
if (-e $lastrun) {
open (my $fh, $lastrun) || warn "Can't open $lastrun.\n";
open (BAK, ">$lastrun.bak") || warn "Can't create backup file $lastrun.bak.\n";
while (<$fh>) {
print BAK;
}
close (BAK) && close ($fh);
}
# print "Saving command-line args to $lastrun\n";
my $fh;
open ($fh, ">autogen.lastrun") || die "Can't open autogen.lastrun: $!";
for my $arg (@cmdline_args) {
print $fh "$arg\n";
}
close ($fh);
}
}
push @args, "--srcdir=$src_path";
push @args, "--enable-option-checking=$option_checking";