[Libreoffice-commits] core.git: autogen.sh Makefile.in

[Tor Lillqvist]

 Makefile.in |    1 -
 autogen.sh  |   47 ++---------------------------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

New commits:
commit 7496c83374f68148c62ac23a6e4c4c314d67273d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 18 17:16:33 2017 +0300

    Goodbye autogen.lastrun
    
    Change-Id: I46b92baf88661d49da2905699b9639522c0940d8
    Reviewed-on: https://gerrit.libreoffice.org/42418
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/Makefile.in b/Makefile.in
index 62924dc2aae0..03184af18d44 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,6 @@ $(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 && \
diff --git a/autogen.sh b/autogen.sh
index a4bab811a36b..02d160bdca92 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,15 +1,7 @@
 :
 #
-# 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 or autogen.lastrun
-# Else
-#   Backup autogen.lastrun as autogen.lastrun.bak
-#   Write autogen.lastrun with new commandline args
+#   Read args from autogen.input
 #
 # Run configure with checked args
 #
@@ -186,7 +178,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, so we don't clobber autogen.lastrun
+# Handle help arguments first
 for my $arg (@ARGV) {
     if ($arg =~ /^(--help|-h|-\?)$/) {
         print STDOUT "autogen.sh - libreoffice configuration helper\n";
@@ -201,24 +193,10 @@ 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) {
@@ -265,27 +243,6 @@ 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";