Changeset cb0e67b in git


Ignore:
Timestamp:
May 2, 1997, 9:44:48 AM (27 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '82fc009ea2b0098c1a4896c841bb70860976bdfc')
Children:
e50385bea471e6433628f35a413b3595e7fb5ff7
Parents:
4b35a9008ee2cec61ef2193763b534f1c072bf19
Message:
* hannes: changed VERSION to SINGULAR_VERSION etc.


git-svn-id: file:///usr/local/Singular/svn/trunk@222 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.in

    r4b35a90 rcb0e67b  
    1010## versions
    1111##
    12 MAJOR_VERSION   = @MAJOR_VERSION@
    13 MINOR_VERSION   = @MINOR_VERSION@
    14 DIST_NAME       = Singular-${MAJOR_VERSION}.${MINOR_VERSION}
     12SINGULAR_MAJOR_VERSION  = @SINGULAR_MAJOR_VERSION@
     13SINGULAR_MINOR_VERSION  = @SINGULAR_MINOR_VERSION@
     14DIST_NAME       = Singular-${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}
    1515CONFIGURE_INPUT = @ac_configure_args@
    1616
     
    161161
    162162version.h: ${SOURCES} ${HEADERS} Makefile.in mod2.h.in configure.in
    163         echo "#define VERSION_ID " `date '+%y%m%d%H'` >version.h
     163        echo "#define SINGULAR_VERSION_ID " `date '+%y%m%d%H'` >version.h
    164164
    165165mod2.h: config.status config.cache mod2.h.in Makefile.in
  • Singular/cntrlc.cc

    r4b35a90 rcb0e67b  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: cntrlc.cc,v 1.9 1997-04-25 18:35:06 obachman Exp $ */
     4/* $Id: cntrlc.cc,v 1.10 1997-05-02 07:44:47 Singular Exp $ */
    55/*
    66* ABSTRACT - interupt handling
     
    101101void sigsegv_handler(int sig, sigcontext s)
    102102{
    103   fprintf(stderr,"Singular : signal %d (v: %d/%d):\n",sig,VERSION,VERSION_ID);
     103  fprintf(stderr,"Singular : signal %d (v: %d/%d):\n",sig,SINGULAR_VERSION,SINGULAR_VERSION_ID);
    104104  if (sig!=SIGINT)
    105105  {
  • Singular/configure.in

    r4b35a90 rcb0e67b  
    66dnl set the version here
    77dnl
    8 MAJOR_VERSION=1
    9 MINOR_VERSION=0
    10 SUB_VERSION=0
     8SINGULAR_MAJOR_VERSION=1
     9SINGULAR_MINOR_VERSION=0
     10SINGULAR_SUB_VERSION=0
    1111VERSION_DATE="April 1997"
    12 AC_SUBST(MAJOR_VERSION)
    13 AC_SUBST(MINOR_VERSION)
    14 AC_SUBST(SUB_VERSION)
    15 AC_DEFINE_UNQUOTED(MAJOR_VERSION, ${MAJOR_VERSION})
    16 AC_DEFINE_UNQUOTED(MINOR_VERSION, ${MINOR_VERSION})
    17 AC_DEFINE_UNQUOTED(S_VERSION1, "version: ${MAJOR_VERSION}.${MINOR_VERSION}.${SUB_VERSION}")
     12AC_SUBST(SINGULAR_MAJOR_VERSION)
     13AC_SUBST(SINGULAR_MINOR_VERSION)
     14AC_SUBST(SINGULAR_SUB_VERSION)
     15AC_DEFINE_UNQUOTED(SINGULAR_MAJOR_VERSION, ${SINGULAR_MAJOR_VERSION})
     16AC_DEFINE_UNQUOTED(SINGULAR_MINOR_VERSION, ${SINGULAR_MINOR_VERSION})
     17AC_DEFINE_UNQUOTED(S_VERSION1, "version: ${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}")
    1818AC_DEFINE_UNQUOTED(S_VERSION2, "${VERSION_DATE}")
    1919
     
    7272if test "x$includedir" = '${prefix}/include'; then
    7373  if test "x$prefix" = xNONE; then
    74     CPPFLAGS="-L${ac_default_prefix}/include ${CPPFLAGS}"
    75   else
    76     CPPFLAGS="-L${prefix}/include ${CPPFLAGS}"
    77   fi
    78 else
    79   CPPFLAGS="-L${includedir} ${CPPFLAGS}"
     74    CPPFLAGS="-I${ac_default_prefix}/include ${CPPFLAGS}"
     75  else
     76    CPPFLAGS="-I${prefix}/include ${CPPFLAGS}"
     77  fi
     78else
     79  CPPFLAGS="-I${includedir} ${CPPFLAGS}"
    8080fi
    8181
  • Singular/extra.cc

    r4b35a90 rcb0e67b  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.10 1997-04-25 18:52:24 Singular Exp $ */
     4/* $Id: extra.cc,v 1.11 1997-05-02 07:44:48 Singular Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
     
    8181    {
    8282      res->rtyp=INT_CMD;
    83       res->data=(void *)VERSION;
     83      res->data=(void *)SINGULAR_VERSION;
    8484      return FALSE;
    8585    }
     
    119119      if (h->next==NULL)
    120120      {
    121         res->rtyp=STRING_CMD;
    122         char *s=mstrdup(""
     121        char with_str[]=""
    123122        #ifdef DRING
    124123          "DRING "
     
    151150          "SRING "
    152151        #endif
    153         );
     152        ;
     153        res->rtyp=STRING_CMD;
     154        char *s=mstrdup(with_str);
    154155        s[strlen(s)-1]='\0';
    155156        res->data=(void *)s;
  • Singular/mod2.h.in

    r4b35a90 rcb0e67b  
    6565#define SIZEOF_VOIDP 4
    6666/* Define major version of Singular -- should be set in configure.in!!!*/
    67 #define MAJOR_VERSION 0
     67#define SINGULAR_MAJOR_VERSION 0
    6868/* Define minor version of Singular -- should be set in configure.in!!! */
    69 #define MINOR_VERSION 0
     69#define SINGULAR_MINOR_VERSION 0
    7070/* Define sub version of Singular -- should be set in configure.in!!! */
    71 #define SUB_VERSION 0
     71#define SINGULAR_SUB_VERSION 0
    7272/* Define version as a string */
    7373#define S_VERSION1 ""
     
    118118#endif
    119119
    120 #define VERSION (MAJOR_VERSION*1000 + MINOR_VERSION*100 + SUB_VERSION)
     120#define SINGULAR_VERSION (SINGULAR_MAJOR_VERSION*1000 + SINGULAR_MINOR_VERSION*100 + SINGULAR_SUB_VERSION)
    121121#ifdef DRING
    122122#define SDRING
  • Singular/tesths.cc

    r4b35a90 rcb0e67b  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: tesths.cc,v 1.10 1997-04-28 19:25:50 obachman Exp $ */
     4/* $Id: tesths.cc,v 1.11 1997-05-02 07:44:46 Singular Exp $ */
    55
    66/*
     
    121121              printf("Singular %s  %s  (%d)  %s %s\n",
    122122                     S_VERSION1,S_VERSION2,
    123                      VERSION_ID,__DATE__,__TIME__);
     123                     SINGULAR_VERSION_ID,__DATE__,__TIME__);
    124124              printf("with ");
    125125#ifdef HAVE_FACTORY
     
    225225"contributions: O.Bachmann,W.Decker,H.Grassmann,B.Martin,M.Messollen,W.Neumann,\n"
    226226"W.Pohl,T.Siebert,R.Stobbe                 e-mail: singular@mathematik.uni-kl.de\n");
    227     printf("%s  %s  (%d)",S_VERSION1,S_VERSION2, VERSION_ID);
     227    printf("%s  %s  (%d)",S_VERSION1,S_VERSION2, SINGULAR_VERSION_ID);
    228228    printf("\n\nPlease note:  EVERY COMMAND MUST END WITH A SEMICOLON \";"
    229229           "\"\n(e.g. help; help command; help General syntax; help ring; quit;)\n\n");
Note: See TracChangeset for help on using the changeset viewer.