[Libreoffice-commits] .: autogen.sh

[Josh Heidenreich]

 autogen.sh |8 
 1 file changed, 8 insertions(+)

New commits:
commit 6635337181c3c3530ceaa2fb49330c2b152107d7
Author: Josh Heidenreich josh.sickm...@gmail.com
Date:   Tue Mar 13 08:57:16 2012 +1030

Fix authgen.sh to not clobber autogen.lastrun when using --help

Fix also works for -h and -?

diff --git a/autogen.sh b/autogen.sh
index 2935619..78a6f67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -86,6 +86,14 @@ sub invalid_distro($$)
 closedir ($dirh);
 }
 
+# Handle help arguments first, so we don't clobber autogen.lastrun
+for my $arg (@ARGV) {
+if ($arg =~ /^(--help|-h|-\?)$/) {
+system (./configure --help);
+exit;
+}
+}
+
 my @cmdline_args = ();
 if (!@ARGV) {
 my $lastrun = autogen.lastrun;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autogen.sh

[Tor Lillqvist]

 autogen.sh |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 0847fd63d773732ff3e441ef868957c55760d69a
Author: Thomas Collerton tom.col...@gmail.com
Date:   Fri Mar 2 20:21:59 2012 +0100

Improvement to fdo#46565

diff --git a/autogen.sh b/autogen.sh
index 2133d07..2935619 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -146,7 +146,12 @@ if (defined $ENV{NOCONFIGURE}) {
 if (scalar(@cmdline_args)  0) {
 # if there's already an autogen.lastrun, make a backup first
 if (-e autogen.lastrun) {
-system(cp autogen.lastrun autogen.lastrun.bak);
+open (my $fh, autogen.lastrun) || warn can't open 
autogen.lastrun. \n;
+open (BAK, autogen.lastrun.bak) || warn can't create 
backup file. \n;
+while ($fh) {
+print BAK;
+}
+close (BAK)  close ($fh);
 }
 # print writing args to autogen.lastrun\n;
 my $fh;
@@ -159,7 +164,8 @@ if (defined $ENV{NOCONFIGURE}) {
 }
 elsif ( ! -e autogen.lastrun)
 {
-system(touch autogen.lastrun);
+open (my $fh, autogen.lastrun) || die can't create 
autogen.lastrun;
+close ($fh);
 }
 print running ./configure with ' . join (' ', @args), '\n;
 system (./configure, @args)  die Error running configure;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autogen.sh

[Michael Meeks]

 autogen.sh |4 
 1 file changed, 4 insertions(+)

New commits:
commit 39d026a11fc67bc45fc974fe8eab04ef9499fa31
Author: Thomas Collerton tom.col...@gmail.com
Date:   Wed Feb 29 11:50:02 2012 +0100

fdo#46565: perl / autogen.sh should backup autogen.lastrun

diff --git a/autogen.sh b/autogen.sh
index d41ccdd..2133d07 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -144,6 +144,10 @@ if (defined $ENV{NOCONFIGURE}) {
 # Save autogen.lastrun only if we did get some arguments on the 
command-line
 if (@ARGV) {
 if (scalar(@cmdline_args)  0) {
+# if there's already an autogen.lastrun, make a backup first
+if (-e autogen.lastrun) {
+system(cp autogen.lastrun autogen.lastrun.bak);
+}
 # print writing args to autogen.lastrun\n;
 my $fh;
 open ($fh, autogen.lastrun) || die can't open autogen.lastrun: 
$!;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autogen.sh

[Miklos Vajna]

 autogen.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a36addcc85c23e14aa9ac0d0cf32ea229b61
Author: Miklos Vajna vmik...@frugalware.org
Date:   Mon Jan 9 22:29:10 2012 +0100

autogen: sync vim modeline with emacs one

diff --git a/autogen.sh b/autogen.sh
index a37953c..f423fe1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -164,4 +164,4 @@ if (defined $ENV{NOCONFIGURE}) {
 # indent-tabs-mode: nil
 # End:
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: #
+# vim:set ft=perl shiftwidth=4 softtabstop=4 expandtab: #
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits