Changeset 156138 in git

Timestamp:

Aug 16, 2011, 7:36:36 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

6ea2f547817e1e86885f7f96f9c8d365f37e8161

Parents:

643b538e22eb5f58bfb7663b4801ca17c1bfb00a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-16 19:36:36+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:22+01:00

Message:

ADD: build test/testg out of test.cc and run them during 'make check'
ADD: libSingular*.a
ADD: Singular/Singular_g need corresp. testgh.o/.og and libSingular.a/_g.a
CHG: better makefile

Location:

Singular

Files:

• makefile (modified) (4 diffs)
• test.cc (modified) (3 diffs)

Singular/makefile

@@ -36 +36 @@
 ##
 LIBPOLYS_INCLUDES = -I.. -I../libpolys -I/opt/local/include
+
 LIBPOLYS_CFLAGS   = ${LIBPOLYS_INCLUDES}
+
 LIBPOLYS_LIBS     = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys -lcoeffs -lresources -lreporter -lmisc -lfactory -lomalloc -L/opt/local/lib -lntl -lgmp -ldl
+
 LIBPOLYS_LIBSG    = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g -lfactory -lomalloc_g  -L/opt/local/lib  -lntl -lgmp -ldl
 
@@ -126 +129 @@
    ssiLink.cc\
    subexpr.cc\
-   tesths.cc\
    utils.cc\
    walk.cc\
    walk_ip.cc\
    wrapper.cc
+
+#   tesths.cc
 
 #   pyobject.cc  pyobject_setup.cc
@@ -214 +218 @@
         ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
 
-OBJG= $(CXXSOURCES:.cc=.og) $(CSOURCES:.c=.og)
+OBJG= $(OBJS:.o=.og)
 
 OBJG := $(OBJG) $(STATIC_SOURCES:.cc=.og) 
 OBJP := $(OBJP) $(STATIC_SOURCES:.cc=.op) 
 
-all:    Singular
-
-Singular: ${OBJS}
-        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${OBJS} -o $@ -L. -L../kernel -lkernel ${LIBPOLYS_LIBS}
+all: libSingular_g.a libSingular.a Singularg Singular
+
+Singularg: tesths.og libSingular_g.a
+        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.og -o $@ -L. -lSingular_g -L../kernel -lkernel_g ${LIBPOLYS_LIBSG}
+
+Singular: tesths.o libSingular.a
+        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.o -o $@ -L. -lSingular -L../kernel -lkernel ${LIBPOLYS_LIBS}
 
 
@@ -384 +391 @@
         ./gentable1
         /bin/rm -f gentable1 gentable1.exe
+
+
+
+libSingular.a: ${OBJS}
+        -rm -f $@
+        ar cr $@ $^
+
+
+libSingular_g.a: ${OBJG}
+        -rm -f $@
+        ar cr $@ $^
+
+test: test.o libSingular.a
+        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} $< -o $@  -L. -lSingular -L../kernel -lkernel ${LIBPOLYS_LIBS}
+
+# My headers test
+check: test testg
+        ./test
+        ./testg
+
+testg: test.og libSingular_g.a
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o $@  -L. -lSingular_g -L../kernel -lkernel_g ${LIBPOLYS_LIBSG}

Singular/test.cc

@@ +1 @@
+#include <misc/auxiliary.h>
+
+#ifdef HAVE_FACTORY
+#include <factory/factory.h> // :(
+#endif
+
+#include <omalloc/omalloc.h>
+
+#include <misc/intvec.h>
+#include <misc/int64vec.h>
+#include <misc/mylimits.h>
+#include <misc/options.h>
+
+#include <reporter/reporter.h>
+
+#include <resources/feFopen.h>
+#include <resources/feResource.h>
+
+#include <coeffs/coeffs.h>
+
+#include <coeffs/si_gmp.h>
+
+#include <polys/kbuckets.h>
+#include <polys/matpol.h>
+#include <polys/mod_raw.h>
+#include <polys/prCopy.h>
+#include <polys/sbuckets.h>
+#include <polys/simpleideals.h>
+#include <polys/weight.h>
+
+#include <polys/monomials/maps.h>
+#include <polys/monomials/monomials.h>
+#include <polys/monomials/p_polys.h>
+#include <polys/monomials/ring.h>
+
+#include <polys/nc/nc.h>
+#include <polys/nc/ncSACache.h>
+#include <polys/nc/ncSAFormula.h>
+#include <polys/nc/ncSAMult.h>
+#include <polys/nc/sca.h>
+#include <polys/nc/summator.h>
+
+
+#include <polys/templates/p_MemAdd.h>
+#include <polys/templates/p_Procs.h>
+
+#include <polys/operations/pShallowCopyDelete.h>
+
+#include <polys/clapsing.h>
+
+
+#ifdef HAVE_FACTORY
+int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!!
+#endif
+
+
+#include <coeffs/numbers.h>
+#include <polys/polys.h>
+
+
+#include <kernel/mod2.h>
+
+#include <kernel/structs.h>
+
+
+// HEADERS:
+#include <kernel/hutil.h>
+//#include "idrec.h" // moved to Singular
+#include <kernel/stairc.h>
+#include <kernel/ideals.h>
+#include <kernel/syz.h>
+#include <kernel/fast_maps.h>
+#include <kernel/febase.h>
+#include <kernel/walkProc.h>
+#include <kernel/walkMain.h>
+#include <kernel/walkSupport.h>
+#include <kernel/khstd.h>
+/// #include <kernel/sparsmat.h> // TODO: install polys/this!
+//+
+
+#include <kernel/fglm.h>
+#include <kernel/kstd1.h>
+#include <kernel/fglmgauss.h>
+#include <kernel/fglmvec.h>
+#include <kernel/kstdfac.h>
+#include <kernel/kmatrix.h>
+#include <kernel/GMPrat.h>
+#include <kernel/multicnt.h>
+#include <kernel/npolygon.h>
+#include <kernel/semic.h>
+#include <kernel/spectrum.h>
+#include <kernel/splist.h>
+#include <kernel/multicnt.h>
+#include <kernel/eigenval.h>
+#include <kernel/units.h>
+#include <kernel/fegetopt.h>
+#include <kernel/ratgring.h>
+#include <kernel/shiftgb.h>
+#include <kernel/mmalloc.h>
+#include <kernel/gfan.h>
+
+#include <kernel/kutil.h>
+
+// #include <kernel/dbm_sl.h> // TODO: needs si_link// already moved to Singular/!
+
+// #include "CCRing.h" // Too old!
+#include <kernel/digitech.h>
+#include <kernel/eigenval.h>
+#include <kernel/fast_maps.h>
+#include <kernel/fast_mult.h>
+#include <kernel/febase.h>
+#include <kernel/fegetopt.h>
+
+#include <kernel/fglmgauss.h>
+#include <kernel/fglm.h>
+#include <kernel/fglmvec.h>
+
+////////#include "F5cData.h"
+#include <kernel/f5c.h>
+#include <kernel/f5data.h>
+#include <kernel/f5gb.h>
+#include <kernel/f5lists.h>
+////////#include <kernel/F5cLists.h>
+
+#include <kernel/gfan.h>
+
+
+#include <kernel/GMPrat.h>
+
+// #include "htmlhelp.h" // For Windows // 
+#include <kernel/hutil.h>
+// #include <kernel/Ideal.h> // Too old?
+
+
+#include <kernel/ideals.h>
+
+#include <kernel/kmatrix.h>
+#include <kernel/kstd1.h>
+#include <kernel/kstdfac.h>
+#include <kernel/khstd.h>
+
+#include <kernel/linearAlgebra.h>
+
+
+
+// #include "lplist.h" // Too old!
+#include <kernel/mmalloc.h>
+#include <kernel/multicnt.h>
+#include <kernel/npolygon.h>
+// #include <kernel/Number.h> // Too old?
+#include <kernel/page.h>
+// #include <kernel/Poly.h> // Too old?
+// #include <kernel/PowerSeries.h> // Too old?
+
+#include <kernel/preimage.h>
+
+#include <kernel/nc.h>
+
+#include <kernel/ratgring.h>
+#include <kernel/ringgb.h>
+#include <kernel/semic.h>
+#include <kernel/shiftgb.h>
+
+#include <kernel/spectrum.h>
+#include <kernel/splist.h>
+#include <kernel/stairc.h>
+#include <kernel/structs.h>
+#include <kernel/syz.h>
+// #include <kernel/testpoly.h> // Too old?
+
+#include <kernel/tgbgauss.h>
+#include <kernel/tgb.h>
+
+#include <kernel/timer.h>
+
+#include <kernel/units.h>
+#include <kernel/walkMain.h>
+#include <kernel/walkProc.h>
+#include <kernel/walkSupport.h>
+
+
+// #include <polys/clapconv.h> // due to factory? :(
+// #include <kernel/tgb_internal.h> // :(
+// #include <kernel/F4.h> // uses tgb_internal // :(
+// #include <kernel/IIntvec.h> // :(
+
+
+
 // headers in Singular/
 #include "attrib.h"
@@ -57 +245 @@
 
 // Source files in Singular/
-
+/*
 #include "attrib.cc"
 #include "bbcone.cc"
@@ -125 +313 @@
 #include "walk_ip.cc"
 #include "wrapper.cc"
+*/
+
+int main( int, char *argv[] ) 
+{
+  feInitResources(argv[0]);
+
+  StringSetS("ressources in use (as reported by feStringAppendResources(0):\n");
+  feStringAppendResources(0);
+  PrintS(StringAppendS("\n"));
+   
+  return 0;
+}
+