Changeset 574cee in git

Timestamp:

Sep 6, 2013, 4:46:41 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

6e5fb8733fcf1f4906723aab1d2feac2351a2769fbdfd4f418831ca76aed28c186cc3a8ce706a46c

Parents:

4401c687951c96cf1094bab8118bc46ab9e3e5fa

Message:

Moved GIT commit id into the versionString

Location:

Singular

Files:

• Makefile.am (modified) (4 diffs)
• misc_ip.cc (modified) (1 diff)
• tesths.cc (modified) (1 diff)

Singular/Makefile.am

@@ -17 +17 @@
 # 
 
+GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
 
 if ENABLE_FACTORY
@@ -24 +25 @@
 endif
 
-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H  -DGIT_VERSION='"$(GIT_VERSION)"'
 AMLDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
 
@@ -279 +280 @@
 # Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
 
-GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
-
-Singular_CPPFLAGS = ${AM_CPPFLAGS} -DGIT_VERSION='"$(GIT_VERSION)"'
+# Singular_CPPFLAGS = ${AM_CPPFLAGS} -DGIT_VERSION='"$(GIT_VERSION)"'
 
 # Singularg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
@@ -307 +306 @@
 # Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
 
-Singulard_CPPFLAGS = ${AM_CPPFLAGS}  -DGIT_VERSION='"$(GIT_VERSION)"'
+# Singulard_CPPFLAGS = ${AM_CPPFLAGS}  -DGIT_VERSION='"$(GIT_VERSION)"'
 
 # Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG

Singular/misc_ip.cc

@@ -785 +785 @@
 #endif
 
-char * versionString()
+char * versionString(/*const bool bShowDetails = false*/ )
 {
   StringSetS("");
-  StringAppend("Singular for %s version %s (%s, %d bit) %s",
+  StringAppend("Singular for %s version %s (%s, %d bit) %s #%s",
                S_UNAME, S_VERSION1, // SINGULAR_VERSION,
-               PACKAGE_VERSION, SIZEOF_LONG*8, singular_date);
+               PACKAGE_VERSION, SIZEOF_LONG*8, singular_date, GIT_VERSION);
   StringAppendS("\nwith\n\t");
 #ifdef HAVE_FACTORY

Singular/tesths.cc

@@ -153 +153 @@
 " by: W. Decker, G.-M. Greuel, G. Pfister, H. Schoenemann     \\   %s\n"
 "FB Mathematik der Universitaet, D-67653 Kaiserslautern        \\\n"
-//#ifndef MAKE_DISTRIBUTION
-"BUILD ID: " GIT_VERSION "\n"
-//#endif
 , PACKAGE_VERSION, VERSION_DATE);
   if (feOptValue(FE_OPT_NO_SHELL)) Warn("running in restricted mode:"