Changeset 92644b in git

Timestamp:

Jun 4, 2013, 6:44:20 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

4fb517c2abf52c3388acf86b567442ce177a47ad

Parents:

502dd5528b44d6832fd6972089729d9108c820de

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-06-04 18:44:20+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-06-04 18:46:06+02:00

Message:

fix: version checks for header

removed Singular/version.h (define now in config.h)
new check for S_UNAME: uname -m uname -s
remmoved feVersionId

Files:

• Singular/Makefile.am (modified) (1 diff)
• Singular/cntrlc.cc (modified) (5 diffs)
• Singular/emacs.cc (modified) (2 diffs)
• Singular/misc_ip.cc (modified) (3 diffs)
• Singular/tesths.cc (modified) (2 diffs)
• Singular/version.h (deleted)
• configure.ac (modified) (1 diff)
• m4/cpu-check.m4 (modified) (2 diffs)

Singular/Makefile.am

@@ -165 +165 @@
 # nodist_libSingular_g_la_SOURCES = iparith.inc
 
-noinst_HEADERS = version.h
-
 libSingular_la_LDFLAGS    = -release ${PACKAGE_VERSION}
 

Singular/cntrlc.cc

@@ -29 +29 @@
 void sig_chld_hdl(int sig); /*#include <Singular/links/ssiLink.h>*/
 //#include <Singular/feOpt.h>
-//#include <Singular/version.h>
 //#include <Singular/silink.h>
 //#include <Singular/ssiLink.h>
@@ -38 +37 @@
 #include "cntrlc.h"
 #include "feOpt.h"
-#include "version.h"
 #include "links/silink.h"
 
@@ -223 +221 @@
 void sigsegv_handler(int sig, sigcontext s)
 {
-  fprintf(stderr,"Singular : signal %d (v: %d/%s):\n",sig,SINGULAR_VERSION,feVersionId);
+  fprintf(stderr,"Singular : signal %d (v: %d):\n",sig,SINGULAR_VERSION);
   if (sig!=SIGINT)
   {
@@ -262 +260 @@
 void sigsegv_handler(int sig, int code, struct sigcontext *scp, char *addr)
 {
-  fprintf(stderr,"Singular : signal %d, code %d (v: %d/%s):\n",
-    sig,code,SINGULAR_VERSION,feVersionId);
+  fprintf(stderr,"Singular : signal %d, code %d (v: %d):\n",
+    sig,code,SINGULAR_VERSION);
   if ((sig!=SIGINT)&&(sig!=SIGABRT))
   {
@@ -293 +291 @@
 void sigsegv_handler(int sig)
 {
-  fprintf(stderr,"Singular : signal %d (v: %d/%s):\n",
-    sig,SINGULAR_VERSION,feVersionId);
+  fprintf(stderr,"Singular : signal %d (v: %d):\n",
+    sig,SINGULAR_VERSION);
   if (sig!=SIGINT)
   {

Singular/emacs.cc

@@ -28 +28 @@
 
 #include <omalloc/omalloc.h>
-#include <Singular/version.h>
 #include <resources/feResource.h>
 #include <Singular/feOpt.h>
@@ -91 +90 @@
 "Bug occured at %s:%d\n"
 "Message: %s\n"
-"Version: " S_UNAME S_VERSION1 " (%lu) " __DATE__ __TIME__,
-        file, line, msg, feVersionId);
+"Version: " S_UNAME S_VERSION1 __DATE__ __TIME__,
+        file, line, msg);
 
 }

Singular/misc_ip.cc

@@ -392 +392 @@
 #include "ipid.h"
 #include "ipshell.h"
-
-#include "version.h"
 
 #include "fehelp.h"
@@ -773 +771 @@
 {
   StringSetS("");
-  StringAppend("Singular for %s version %s (%s %s)  %s\nwith\n", // %d-
+  StringAppend("Singular for %s version %s (%s)  %s\nwith\n", // %d-
                S_UNAME, S_VERSION1, // SINGULAR_VERSION,
-               PACKAGE_VERSION, feVersionId, singular_date);
+               PACKAGE_VERSION, singular_date);
   StringAppendS("\t");
 #ifdef HAVE_FACTORY
@@ -878 +876 @@
 #endif
               StringAppend("random=%d\n",siRandomStart);
-              StringAppend("\tCC=%s,\n\tCXX=%s"
+              StringAppend("\tCC=%s %s,\n\tCXX=%s %s"
 #ifdef __GNUC__
               "(" __VERSION__ ")"
 #endif
-              "\n",CC,CXX);
+              "\n",CC,CFLAGS,CXX,CXXFLAGS);
               feStringAppendResources(0);
               feStringAppendBrowsers(0);

Singular/tesths.cc

@@ -39 +39 @@
 #include "feOpt.h"
 #include "distrib.h"
-#include "version.h"
 #include "bigintm.h"
 #include "mmalloc.h"
@@ -157 +156 @@
 " by: W. Decker, G.-M. Greuel, G. Pfister, H. Schoenemann     \\   %s\n"
 "FB Mathematik der Universitaet, D-67653 Kaiserslautern        \\\n"
-, PACKAGE_VERSION, feVersionId);
+, PACKAGE_VERSION, VERSION_DATE);
   if (feOptValue(FE_OPT_NO_SHELL)) Warn("running in restricted mode:"
     " shell invocation and links are disallowed");

configure.ac

@@ -1 +1 @@
 AC_INIT([singular],[3.1.3.sw])
+AC_DEFINE([VERSION_DATE],["Jun 2013"],[release date])
 
 _AC_SRCDIRS(["$ac_dir"])

m4/cpu-check.m4

@@ -14 +14 @@
 AC_MSG_RESULT($ac_cv_singcpuname)
 
-if test "$ac_cv_singuname" = ix86-Win; then
-  EXEC_EXT=".exe"
-  AC_DEFINE(SI_CPU_I386,1,"ix86 under Windows")
-  AC_SUBST(SI_CPU_I386)
-fi
-AC_SUBST(EXEC_EXT)
-if test "$ac_cv_singuname" = x86_64-Linux; then
-  AC_DEFINE(SI_CPU_X86_64,1,"ix86-64 under GNU/Linux")
-  AC_SUBST(SI_CPU_X86_64)
-fi
-if test "$ac_cv_singuname" = ix86-Linux; then
-  AC_DEFINE(SI_CPU_I386,1,"ix86 under GNU/Linux")
-  AC_SUBST(SI_CPU_I386)
-fi
-if test "$ac_cv_singuname" = IA64-Linux; then
-  AC_DEFINE(SI_CPU_IA64,1,"ia64 under GNU/Linux")
-  AC_SUBST(SI_CPU_IA64)
-fi
-if test "$ac_cv_singuname" = ppc-Linux; then
-  AC_DEFINE(SI_CPU_PPC,1,"PPC under GNU/Linux")
-  AC_SUBST(SI_CPU_PPC)
-fi
-if test "$ac_cv_singuname" = ppcMac-darwin; then
-  AC_DEFINE(SI_CPU_PPC,1,"PPC under MacOS")
-  AC_SUBST(SI_CPU_PPC)
-fi
-# test again with CPU names
 if test "$ac_cv_singcpuname" = i386; then
   AC_DEFINE(SI_CPU_I386,1,"i386")
@@ -69 +42 @@
 AC_MSG_CHECKING(uname for Singular)
 
-#ac_cv_singuname=`singuname.sh`
+#ac_cv_singuname=`./config.guess`
+ac_cv_singuname=`uname -m`-`uname -s`
 AC_MSG_RESULT($ac_cv_singuname)
-if test "$ac_cv_singuname" = unknown; then
-  AC_MSG_WARN(Unknown architecture: Check singuname.sh)
-  ac_cv_singuname="unknown"
-fi
 AC_DEFINE_UNQUOTED(S_UNAME, "$ac_cv_singuname", Singular\'s own uname\, believe it or not)