[SCM] GNU Libtool branch, master, updated. 85953e3b87e76d2af6e98e80f65c428bd91d01ea

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  85953e3b87e76d2af6e98e80f65c428bd91d01ea (commit)
       via  3528106688e06c4be785e17966b2ad3067250fec (commit)
      from  484680fe022563c93a37dad3b1bca46028b1e866 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 85953e3b87e76d2af6e98e80f65c428bd91d01ea
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Apr 15 22:09:10 2008 +0200

    Add .gitignore files.
    
    * .gitignore, doc/.gitignore, libltdl/.gitignore,
    libltdl/config/.gitignore, libltdl/m4/.gitignore,
    tests/.gitignore, tests/cdemo/.gitignore,
    tests/demo/.gitignore, tests/depdemo/.gitignore,
    tests/f77demo/.gitignore, tests/fcdemo/.gitignore,
    tests/mdemo/.gitignore, tests/mdemo2/.gitignore,
    tests/pdemo/.gitignore, tests/tagdemo/.gitignore:
    New files.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 3528106688e06c4be785e17966b2ad3067250fec
Author: Peter O'Gorman <address@hidden>
Date:   Tue Apr 15 15:33:06 2008 -0500

    Allow bootstrap from git repository.
    
    * Makefile.am: Pass srcdir as an argument to mkstamp and expect only 2 
fields in mkstamps output.
    * clcommit.m4sh: Ditto.
    * configure.ac: Ditto.
    * libltdl/config/mkstamp: return a revision and date based on the number of 
lines which look like dates in all the ChangeLog* files in the directory we got 
as arg 1.

-----------------------------------------------------------------------

Summary of changes:
 .cvsignore => .gitignore                  |   45 +++++++++++++++++++---------
 ChangeLog                                 |   11 +++++++
 Makefile.am                               |    4 +-
 clcommit.m4sh                             |    2 +-
 configure.ac                              |    2 +-
 doc/.gitignore                            |    8 +++++
 libltdl/.gitignore                        |    2 +
 libltdl/config/{.cvsignore => .gitignore} |    2 -
 libltdl/config/mkstamp                    |   31 +++++++++++++------
 libltdl/m4/{.cvsignore => .gitignore}     |    0 
 tests/{.cvsignore => .gitignore}          |    3 +-
 tests/cdemo/.gitignore                    |    1 +
 tests/demo/.gitignore                     |    7 ++++
 tests/depdemo/.gitignore                  |    2 +
 tests/f77demo/.gitignore                  |    2 +
 tests/fcdemo/.gitignore                   |    2 +
 tests/mdemo/.gitignore                    |    2 +
 tests/mdemo2/.gitignore                   |    2 +
 tests/pdemo/.gitignore                    |    3 ++
 tests/tagdemo/.gitignore                  |    1 +
 20 files changed, 99 insertions(+), 33 deletions(-)
 copy .cvsignore => .gitignore (71%)
 create mode 100644 doc/.gitignore
 create mode 100644 libltdl/.gitignore
 copy libltdl/config/{.cvsignore => .gitignore} (88%)
 copy libltdl/m4/{.cvsignore => .gitignore} (100%)
 copy tests/{.cvsignore => .gitignore} (73%)
 create mode 100644 tests/cdemo/.gitignore
 create mode 100644 tests/demo/.gitignore
 create mode 100644 tests/depdemo/.gitignore
 create mode 100644 tests/f77demo/.gitignore
 create mode 100644 tests/fcdemo/.gitignore
 create mode 100644 tests/mdemo/.gitignore
 create mode 100644 tests/mdemo2/.gitignore
 create mode 100644 tests/pdemo/.gitignore
 create mode 100644 tests/tagdemo/.gitignore

diff --git a/.cvsignore b/.gitignore
similarity index 71%
copy from .cvsignore
copy to .gitignore
index a9384a9..252219d 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -1,32 +1,47 @@
+*.aux
+*.cp
+*.cps
+*.dvi
+*.fn
+*.ky
+*.la
+*.lo
+*.log
+*.o
+*.pg
+*.toc
+*.tp
+*.vr
++build
++dest
++inst
 .*.prcs_aux
 .clcommitrc
 .cvslog-tlasync
-.gdb_history
-.pc
 .deps
+.dirstamp
+.gdb_history
 .libs
-_libs
-+build
-+dest
-+inst
-COPYING
+.pc
 INSTALL
 Makefile
 Makefile.in
+_libs
 acinclude.m4
 aclocal.m4
 autom4te.cache
 clibtool.cfg
-configure
+commit
+config-h.in
 config.*
+configure
+conftest*
 libtool
+libtool-*.tar.bz2
+libtool-*.tar.gz
+libtool-*.tar.lzma
 libtoolize
 libtoolize.in
-patches
-stamp-h1
-stamp-vcl
-config-h.in
-commit
 manual.html
-libtool-*.tar.gz
-libtool-*.tar.bz2
+patches
+stamp-*
diff --git a/ChangeLog b/ChangeLog
index b4fac02..04d364a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-04-15  Peter O'Gorman  <address@hidden>
+
+       Allow bootstrap from git repository.
+       * Makefile.am: Pass srcdir as an argument to mkstamp and expect
+       only 2 fields in mkstamps output.
+       * clcommit.m4sh: Ditto.
+       * configure.ac: Ditto.
+       * libltdl/config/mkstamp: return a revision and date based on
+       the number of lines which look like dates in all the ChangeLog*
+       files in the directory we got as arg 1.
+
 2008-04-11  Eric Blake  <address@hidden>
 
        Fix usage of setmode without declaration on cygwin.
diff --git a/Makefile.am b/Makefile.am
index 0168a41..480b647 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,9 +50,9 @@ lt__cd                = 
CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 
 MKSTAMP = $(SHELL) $(srcdir)/$(auxdir)/mkstamp
 
-timestamp = set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
+timestamp = set dummy `$(MKSTAMP) $(srcdir)`; shift; \
        case $(VERSION) in \
-         *[acegikmoqsuwy]) TIMESTAMP=" $$1 $$2 $$3" ;; \
+         *[acegikmoqsuwy]) TIMESTAMP=" $$1 $$2" ;; \
          *) TIMESTAMP="" ;; \
        esac
 
diff --git a/clcommit.m4sh b/clcommit.m4sh
index 3439dae..7fe9d2d 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -444,7 +444,7 @@ func_mailnotify ()
       test -f CVS/Root &&
           echo "CVSROOT:       `$SED -e 's,.*:,,g' CVS/Root`"
       test -f $MKSTAMP &&
-          echo "TIMESTAMP:     `$SHELL $MKSTAMP < ./ChangeLog`"
+          echo "TIMESTAMP:     `$SHELL $MKSTAMP .`"
       test -f CVS/Repository &&
           echo "Module name:   `cat CVS/Repository`"
       test -f CVS/Tag &&
diff --git a/configure.ac b/configure.ac
index 6f49016..4660a67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ AC_SUBST([LASTRELEASE])
 # This is a sanity check so we can see which version is used in bug reports.
 # It is assumed that we only want to see the date extension for cvs libtool
 # versions (i.e. "odd" letters) and not actual alpha releases.
-TIMESTAMP=`${CONFIG_SHELL} ${ac_aux_dir}/mkstamp < ${srcdir}/ChangeLog`
+TIMESTAMP=`${CONFIG_SHELL} ${ac_aux_dir}/mkstamp ${srcdir}`
 package_revision=`( set $TIMESTAMP; echo $1; )`
 case $lt_alpha in
   [[bdfhjlnprtvxz]])
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..bc21901
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,8 @@
+stamp-vti
+version.texi
+notes.txt
+*.dvi
+*.info*
+*.html
+*.ps
+*.pdf
diff --git a/libltdl/.gitignore b/libltdl/.gitignore
new file mode 100644
index 0000000..94729d4
--- /dev/null
+++ b/libltdl/.gitignore
@@ -0,0 +1,2 @@
+Makefile.am
+argz.h
diff --git a/libltdl/config/.cvsignore b/libltdl/config/.gitignore
similarity index 88%
copy from libltdl/config/.cvsignore
copy to libltdl/config/.gitignore
index 27981a3..a3959de 100644
--- a/libltdl/config/.cvsignore
+++ b/libltdl/config/.gitignore
@@ -1,5 +1,3 @@
-COPYING
-INSTALL
 install-sh
 ltmain.in
 ltmain.sh
diff --git a/libltdl/config/mkstamp b/libltdl/config/mkstamp
index 8d8e7d8..edd5be1 100755
--- a/libltdl/config/mkstamp
+++ b/libltdl/config/mkstamp
@@ -23,15 +23,26 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ####
 
-# This script expects to find a line containing both Revision and Date
-# tags, and it edits this line so that it looks like ` $rev $date'
+# This script takes a directory as an argument and generates a
+# revision and date based upon the ChangeLog files in that directory.
 
-# Command-line arguments are passed down to sed; additional -e cmd
-# arguments are acceptable.  Input is from from stdin.  The original
-# version of this script accepted input from a named file or stdin.
+# Generate a revision that looks similar to CVS revision by using 1.
+# then the number of lines in the ChangeLogs starting with dates (an
+# approximation of the number of commits) + 1000. 
+# For those pulling from the savannah git repository it should be
+# possible to go from this revision number to the git revision fairly
+# easily. The number will also always increase.
 
-tr -d "\015" | sed -e '
-       s%.*\$''Revision: \([^$]*\) \$.*\$''Date: \([^$]*\) \$.*% \1 \2%
-       t end
-       d
-       : end' ${1+"$@"}
+awk 'BEGIN {
+       cocount=0;
+}
+/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]  / {
+        if (cocount== 0) {
+                datestr=$1
+        }
+       cocount++;
+}
+END {
+       cocount = cocount + 1000;
+        print "1." cocount " " datestr;
+}' $1/ChangeLog $1/ChangeLog.[12][0-9][0-9][0-9]
diff --git a/libltdl/m4/.cvsignore b/libltdl/m4/.gitignore
similarity index 100%
copy from libltdl/m4/.cvsignore
copy to libltdl/m4/.gitignore
diff --git a/tests/.cvsignore b/tests/.gitignore
similarity index 73%
copy from tests/.cvsignore
copy to tests/.gitignore
index 7b25241..d66dec6 100644
--- a/tests/.cvsignore
+++ b/tests/.gitignore
@@ -1,8 +1,7 @@
-Makefile
-Makefile.in
 atconfig
 defs.in
 defs
 package.m4
 testsuite
+testsuite.dir
 testsuite.log
diff --git a/tests/cdemo/.gitignore b/tests/cdemo/.gitignore
new file mode 100644
index 0000000..eebd27f
--- /dev/null
+++ b/tests/cdemo/.gitignore
@@ -0,0 +1 @@
+cdemo
diff --git a/tests/demo/.gitignore b/tests/demo/.gitignore
new file mode 100644
index 0000000..cee443d
--- /dev/null
+++ b/tests/demo/.gitignore
@@ -0,0 +1,7 @@
+hc-direct
+hc-libflag
+hc-libpath
+hc-minusL
+hell
+hell_static
+helldl
diff --git a/tests/depdemo/.gitignore b/tests/depdemo/.gitignore
new file mode 100644
index 0000000..3aa957b
--- /dev/null
+++ b/tests/depdemo/.gitignore
@@ -0,0 +1,2 @@
+depdemo
+depdemo_static
diff --git a/tests/f77demo/.gitignore b/tests/f77demo/.gitignore
new file mode 100644
index 0000000..a7668b9
--- /dev/null
+++ b/tests/f77demo/.gitignore
@@ -0,0 +1,2 @@
+cprogram
+fprogram
diff --git a/tests/fcdemo/.gitignore b/tests/fcdemo/.gitignore
new file mode 100644
index 0000000..a7668b9
--- /dev/null
+++ b/tests/fcdemo/.gitignore
@@ -0,0 +1,2 @@
+cprogram
+fprogram
diff --git a/tests/mdemo/.gitignore b/tests/mdemo/.gitignore
new file mode 100644
index 0000000..0b4a56b
--- /dev/null
+++ b/tests/mdemo/.gitignore
@@ -0,0 +1,2 @@
+mdemo
+mdemo_static
diff --git a/tests/mdemo2/.gitignore b/tests/mdemo2/.gitignore
new file mode 100644
index 0000000..6e24c0b
--- /dev/null
+++ b/tests/mdemo2/.gitignore
@@ -0,0 +1,2 @@
+mdemo2
+mdemo2_static
diff --git a/tests/pdemo/.gitignore b/tests/pdemo/.gitignore
new file mode 100644
index 0000000..1cc71be
--- /dev/null
+++ b/tests/pdemo/.gitignore
@@ -0,0 +1,3 @@
+hell
+hell_static
+helldl
diff --git a/tests/tagdemo/.gitignore b/tests/tagdemo/.gitignore
new file mode 100644
index 0000000..a36b095
--- /dev/null
+++ b/tests/tagdemo/.gitignore
@@ -0,0 +1 @@
+tagdemo


hooks/post-receive
--
GNU Libtool