diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | include/libxml/xmlversion.h.in | 2 | ||||
| -rw-r--r-- | include/libxml/xmlwin32version.h.in | 2 | ||||
| -rw-r--r-- | win32/configure.js | 14 |
5 files changed, 7 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am index eb906b07..5ed6e369 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1209,14 +1209,14 @@ cleanup: dist-hook: cleanup libxml2.spec -cp libxml2.spec $(distdir) - (cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn --exclude .git win32 macos os400 vms VxWorks bakefile test result) | (cd $(distdir); tar xf -) + (cd $(srcdir) ; tar -cf - --exclude .git win32 macos os400 vms VxWorks bakefile test result) | (cd $(distdir); tar xf -) dist-source: distdir $(AMTAR) -chof - --exclude Tests --exclude test --exclude result $(distdir) | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-sources+"`.tar.gz dist-test: distdir (mkdir -p $(distdir)) - (cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn --exclude .git xstc/Tests) | (cd $(distdir); tar xf -) + (cd $(srcdir) ; tar -cf - --exclude .git xstc/Tests) | (cd $(distdir); tar xf -) tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/testapi.c $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz @(rm -rf $(distdir)/xstc/Test) @@ -1246,7 +1246,6 @@ DISTCLEANFILES = COPYING missing.lst confexecdir=$(libdir) confexec_DATA = xml2Conf.sh -CVS_EXTRA_DIST= EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ libxml.m4 Copyright check-xml-test-suite.py gentest.py \ check-relaxng-test-suite.py check-relaxng-test-suite2.py \ @@ -1260,8 +1259,7 @@ EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ dbgen.pl dbgenattr.pl regressions.py regressions.xml \ README.tests Makefile.tests libxml2.syms timsort.h \ README.zOS \ - CMakeLists.txt config.h.cmake.in libxml2-config.cmake.cmake.in \ - $(CVS_EXTRA_DIST) + CMakeLists.txt config.h.cmake.in libxml2-config.cmake.cmake.in pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 45e1df45..86d84625 100644 --- a/configure.ac +++ b/configure.ac @@ -21,21 +21,7 @@ LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML LIBXML_VERSION_NUMBER=`expr $LIBXML_MAJOR_VERSION \* 10000 + $LIBXML_MINOR_VERSION \* 100 + $LIBXML_MICRO_VERSION` -if test -f CVS/Entries ; then - extra=`grep ChangeLog CVS/Entries | grep -v LIBXML | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%` - echo extra=$extra - if test "$extra" != "" - then - LIBXML_VERSION_EXTRA="-CVS$extra" - fi -else if test -d .svn ; then - extra=`svn info | grep Revision | sed 's+Revision: ++'` - echo extra=$extra - if test "$extra" != "" - then - LIBXML_VERSION_EXTRA="-SVN$extra" - fi -else if test -d .git ; then +if test -d .git ; then extra=`git describe 2>/dev/null | sed 's+LIBXML[[0-9.]]*-++'` echo extra=$extra if test "$extra" != "" @@ -43,8 +29,7 @@ else if test -d .git ; then LIBXML_VERSION_EXTRA="-GIT$extra" fi fi -fi -fi + AC_SUBST(LIBXML_MAJOR_VERSION) AC_SUBST(LIBXML_MINOR_VERSION) AC_SUBST(LIBXML_MICRO_VERSION) diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in index c995fe51..f9f79a2f 100644 --- a/include/libxml/xmlversion.h.in +++ b/include/libxml/xmlversion.h.in @@ -48,7 +48,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); /** * LIBXML_VERSION_EXTRA: * - * extra version information, used to show a CVS compilation + * extra version information, used to show a git commit description */ #define LIBXML_VERSION_EXTRA "@LIBXML_VERSION_EXTRA@" diff --git a/include/libxml/xmlwin32version.h.in b/include/libxml/xmlwin32version.h.in index 90e97ef5..4766d75b 100644 --- a/include/libxml/xmlwin32version.h.in +++ b/include/libxml/xmlwin32version.h.in @@ -47,7 +47,7 @@ extern void xmlCheckVersion(int version); /** * LIBXML_VERSION_EXTRA: * - * extra version information, used to show a CVS compilation + * extra version information, used to show a git commit description */ #define LIBXML_VERSION_EXTRA "-win32" diff --git a/win32/configure.js b/win32/configure.js index 8f03b464..d784f3bf 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -180,20 +180,6 @@ function discoverVersion() var fso, cf, vf, ln, s, iDot, iSlash; fso = new ActiveXObject("Scripting.FileSystemObject"); verCvs = ""; - if (useCvsVer && fso.FileExists("..\\CVS\\Entries")) { - cf = fso.OpenTextFile("..\\CVS\\Entries", 1); - while (cf.AtEndOfStream != true) { - ln = cf.ReadLine(); - s = new String(ln); - if (s.search(/^\/ChangeLog\//) != -1) { - iDot = s.indexOf("."); - iSlash = s.indexOf("/", iDot); - verCvs = "CVS" + s.substring(iDot + 1, iSlash); - break; - } - } - cf.Close(); - } cf = fso.OpenTextFile(configFile, 1); if (compiler == "msvc") versionFile = ".\\config.msvc"; |