@@ -1,3 +1,7 @@ +2008-03-12 Dustin J. Mitchell <dustin@zmanda.com> + * gnulib/regenerate/regenerate gnulib/Makefile.am DEVELOPING: update + documentation to reflect use of gnulib's git repository + 2008-03-12 Jean-Louis Martineau <martineau@zmanda.com> * installcheck/Makefile.am: Remove CONFIG_CLOBBER_MY_CONFIG, it is done automaticaly. ChangeLog @@ -18,15 +18,25 @@ This should probably be done after most releases, so that we have adequate time to uncover any bugs or problems in the new gnulib before we make another release. -To update the gnulib files included with Amanda, you'll first need a -CVS checkout of gnulib; let's call it $GNULIB_CO. Then, in the root -of the Amanda source, run +To update the gnulib files included with Amanda, you'll first need a git +working copy of gnulib; let's call it $GNULIB_BR: - GNULIB_TOOL=$GNULIB_CO/gnulib-tool ./gnulib/regenerate/regenerate + cd /tmp + git clone git://git.savannah.gnu.org/gnulib.git + GNULIB_BR=/tmp/gnulib + +See http://www.gnu.org/software/gnulib/ for more information. Then, in the +root of the Amanda source, run + + GNULIB_TOOL=$GNULIB_BR/gnulib-tool ./gnulib/regenerate/regenerate Use 'svn status' to figure out what changed, and 'svn add' / 'svn rm' to inform Subversion. Then re-run autogen, configure, make, and test -the result. If all is well, commit. +the result. + +Get the object ID of the latest commit, using 'git show', and replace the +previous object ID in Amanda's gnulib/regenerate/regenerate, so that other +developers can access the same "release" of gnulib as you did. Updating Libtool ---------------- DEVELOPING @@ -707,4 +707,4 @@ mostlyclean-local: mostlyclean-generic : # Make sure regenerate/* are in the distribution tarball -EXTRA_DIST += regenerate/no-error.patch regenerate/regenerate regenerate/getaddrinfo-cygwin.patch +EXTRA_DIST += regenerate/getaddrinfo-cygwin.patch regenerate/no-error.patch regenerate/regenerate gnulib/Makefile.am @@ -1,7 +1,10 @@ #! /bin/bash -# Gnulib files in zmanda repo are from gnulib CVS updated with: -# cvs update -D '2007-10-25 17:00:00 -0600' +# Gnulib files in zmanda repo are from gnulib GIT. To check out the +# same version as was used to generate the source in the repository, +# run the following in your git repository: +# +# git checkout 03400ebfaa064922caf3767d6641d7e1cdc8cd1b # get to the project root cd `dirname $0`/../.. @@ -68,7 +71,7 @@ patch -p0 < "${PATCH_DIR}/getaddrinfo-cygwin.patch" || exit 1 # the distribution tarball ( echo "" echo "# Make sure regenerate/* are in the distribution tarball" - echo "EXTRA_DIST += "`cd gnulib; find regenerate -name .svn -prune -o -type f -print ` + echo "EXTRA_DIST += "`cd gnulib; find regenerate -name .svn -prune -o -type f -print | sort` ) >> gnulib/Makefile.am ###################################################################### gnulib/regenerate/regenerate 3bcf1a6a54fc2d3c04eea8a61e07b6ef8ada50f0 Dustin J. Mitchell djmitche@users.sourceforge.net http://github.com/nikolasco/amanda/commit/ccd6f279cf678f45022c18525080b80489d505be ccd6f279cf678f45022c18525080b80489d505be 2008-03-12T11:06:26-07:00 2008-03-12T11:06:26-07:00 * gnulib/regenerate/regenerate gnulib/Makefile.am DEVELOPING: update documentation to reflect use of gnulib's git repository git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@885 a8d146d6-cc15-0410-8900-af154a0219e0 77616c2a65b46b4bcd88dad76218acb4724a9388 Dustin J. Mitchell djmitche@users.sourceforge.net