Changeset 3c6df4 in git

Timestamp:

Apr 28, 2020, 2:11:30 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

184caf17602365e07f0084fa6bb2db75b5a0ffd4

Parents:

e1ef7b116283b782bdf06753542a2e15e181852b

Message:

removed GIT_VERSION and related

Files:

• .gitattributes (modified) (1 diff)
• .gitignore (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Singular/Makefile.am (modified) (1 diff)
• Singular/misc_ip.cc (modified) (1 diff)
• dox/Makefile.am (modified) (2 diffs)
• git-archive (deleted)
• git-version-gen (deleted)

.gitattributes

@@ -5 +5 @@
 /factory/old/ export-ignore
 /old_modgen/ export-ignore
-/git-archive export-ignore

.gitignore

@@ -19 +19 @@
 *.trs
 *~
-/.tarball-git-version
 /AUTOGEN_generated_stuff
 /desktop/Singular-manual.desktop

Makefile.am

@@ -6 +6 @@
 dox emacs redhat desktop
 
-EXTRA_DIST = README README.md README.pkg autogen.sh git-version-gen doxy redhat/singular.spec.in GPL2 GPL3 doc/doc.tbz2
+EXTRA_DIST = README README.md README.pkg autogen.sh doxy redhat/singular.spec.in GPL2 GPL3 doc/doc.tbz2
 
 bin_SCRIPTS = libsingular-config
-
-dist-hook:
-        $(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
 
 install-data-local:

Singular/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I../m4
 
-GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
-
-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES) $(CCLUSTER_CPPFLAGS)  $(GMP_CPPFLAGS) $(FLINT_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES) $(CCLUSTER_CPPFLAGS)  $(GMP_CPPFLAGS) $(FLINT_CFLAGS)
 
 AM_CXXFLAGS=$(NTL_CPPFLAGS)

Singular/misc_ip.cc

@@ -783 +783 @@
 {
   StringSetS("");
-  StringAppend("Singular for %s version %s (%d, %d bit) %s #%s",
+  StringAppend("Singular for %s version %s (%d, %d bit) %s",
                S_UNAME, VERSION, // SINGULAR_VERSION,
                SINGULAR_VERSION, sizeof(void*)*8,
 #ifdef MAKE_DISTRIBUTION
-               VERSION_DATE, GIT_VERSION);
+               VERSION_DATE);
 #else
-               singular_date, GIT_VERSION);
+               singular_date);
 #endif
   StringAppendS("\nwith\n\t");

dox/Makefile.am

@@ -1 @@
-GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
-
 doxyrun:
         if [ -z "$(DOXYGEN)" ]; then \
@@ -16 +14 @@
         export abs_top_srcdir="$(abs_top_srcdir)"; \
         export abs_top_builddir="$(abs_top_builddir)"; \
-        export git_version="$(GIT_VERSION)"; \
-        echo Running "$(DOXYGEN)" "$(DOXYGEN_CONFIG)" with abs_top_srcdir: "$(abs_top_srcdir)", abs_top_builddir: "$(abs_top_builddir)", GIT_VERSION: "$(git_version)"...; \
+        echo Running "$(DOXYGEN)" "$(DOXYGEN_CONFIG)" with abs_top_srcdir: "$(abs_top_srcdir)", abs_top_builddir: "$(abs_top_builddir)", ...; \
         $(DOXYGEN) $(DOXYGEN_CONFIG) ; \
-        echo Finished running "$(DOXYGEN)" "$(DOXYGEN_CONFIG)" with abs_top_srcdir: "$(abs_top_srcdir)", abs_top_builddir: "$(abs_top_builddir)", GIT_VERSION: "$(git_version)"...;
+        echo Finished running "$(DOXYGEN)" "$(DOXYGEN_CONFIG)" with abs_top_srcdir: "$(abs_top_srcdir)", abs_top_builddir: "$(abs_top_builddir)" ...;
 
 if HAVE_DOXYGEN