Changeset 44a092 in git

Timestamp:

Jul 9, 2010, 7:37:07 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

c8f738def037cddb1fcada51b7f0495df898cd6e

Parents:

12a9acc2c496b7057e0bb3db24043592a0fb05b1

Message:

tr 241/ par. build of Singular

git-svn-id: file:///usr/local/Singular/svn/trunk@12973 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• Makefile.in (modified) (1 diff)
• iparith.cc (modified) (3 diffs)
• tesths.cc (modified) (1 diff)

Singular/Makefile.in

@@ -417 +417 @@
 extra.o: feOpt.inc
 
-feOpt.inc feOptES.inc feOptTS.inc: feOpt.cc mod2.h
-        $(CXX) -DGENERATE_OPTION_INDEX -I../kernel feOpt.cc -o feOpt
+feOptTS.inc feOptES.inc feOpt.inc: feOpt.cc mod2.h
+        $(CXX) -DGENERATE_OPTION_INDEX -I../kernel feOpt.cc -o feOpt.xx && mv feOpt.xx feOpt
         ./feOpt
         /bin/rm -f feOpt feOpt.exe
-        $(CXX) -DGENERATE_OPTION_INDEX  -DESINGULAR -I../kernel feOpt.cc -o feOptES
+        $(CXX) -DGENERATE_OPTION_INDEX  -DESINGULAR -I../kernel feOpt.cc -o feOptES.xx && mv feOptES.xx feOptES
         ./feOptES
         rm -f feOptES feOptES.exe
-        $(CXX) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
+        $(CXX) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOptTS.xx && mv feOptTS.xx feOptTS
         ./feOptTS
         rm -f feOptTS feOptTS.exe

Singular/iparith.cc

@@ -7758 +7758 @@
 struct sValCmdTab dArithTab2[]={ {0,0}};
 #define JJTAB2LEN 0
+
+char *iparith_inc;
 void ttGen1()
 {
-  FILE *outfile = myfopen("iparith.xx","w");
+  iparith_inc=omStrDup("iparith.xxxxxx");
+  int pid=getpid();
+  iparith_inc[8]=(pid %10)+'0'; pid/=10;
+  iparith_inc[9]=(pid %10)+'0'; pid/=10;
+  iparith_inc[10]=(pid %10)+'0'; pid/=10;
+  iparith_inc[11]=(pid %10)+'0'; pid/=10;
+  iparith_inc[12]=(pid %10)+'0'; pid/=10;
+  iparith_inc[13]=(pid %10)+'0';
+  FILE *outfile = myfopen(iparith_inc,"w");
   int i,j,l1=0,l2=0;
   currRing=(ring)omAllocBin(sip_sring_bin);
@@ -7919 +7929 @@
 void ttGen2()
 {
-  FILE *outfile = myfopen("iparith.inc","a");
+  FILE *outfile = myfopen(iparith_inc,"a");
   fprintf(outfile,
   "/****************************************\n"
@@ -8054 +8064 @@
   int cmd_size = (sizeof(cmds)/sizeof(cmdnames))-1;
 
-  FILE *outfile = myfopen("iparith.inc","a");
+  FILE *outfile = myfopen(iparith_inc,"a");
   fprintf(outfile,
   "/****************************************\n"

Singular/tesths.cc

@@ -143 +143 @@
   extern void ttGen4();
   extern void mpsr_ttGen(); // For initialization of (CMD, MP_COP) tables
+  extern char *iparith_inc;
   mpsr_ttGen();
   ttGen4();
   ttGen1();
   ttGen2b();
-  rename("iparith.xx","iparith.inc");
+  rename(iparith_inc,"iparith.inc");
   rename("plural_cmd.xx","plural_cmd.inc");
   rename("mpsr_Tok.xx","mpsr_Tok.inc");