|
 |
55def1b |
--- SConstruct.orig 2011-04-27 05:00:31.000000000 -0600
|
|
|
55def1b |
+++ SConstruct 2011-05-23 16:04:42.723216338 -0600
|
|
|
55def1b |
@@ -527,12 +527,12 @@
|
|
 |
00d7a93 |
for file in glob(CuddPath(fname)):
|
|
|
00d7a93 |
cudd_resources.remove(file)
|
|
|
00d7a93 |
|
|
|
00d7a93 |
-cudd_shared = shared_object(cudd_resources)
|
|
|
00d7a93 |
+#cudd_shared = shared_object(cudd_resources)
|
|
|
00d7a93 |
|
|
|
00d7a93 |
-libCudd = env.StaticLibrary(CuddPath(cudd_name), cudd_resources)
|
|
|
00d7a93 |
-DefaultBuild(libCudd)
|
|
|
00d7a93 |
+#libCudd = env.StaticLibrary(CuddPath(cudd_name), cudd_resources)
|
|
|
00d7a93 |
+#DefaultBuild(libCudd)
|
|
|
00d7a93 |
|
|
|
00d7a93 |
-shared_resources += cudd_shared
|
|
|
00d7a93 |
+#shared_resources += cudd_shared
|
|
|
00d7a93 |
|
|
|
00d7a93 |
def SymlinkReadableLibname(files):
|
|
|
00d7a93 |
""" Generate symbolik link with more readable library name."""
|
|
|
55def1b |
@@ -569,7 +569,7 @@
|
|
|
00d7a93 |
# slib=env.LoadableModule
|
|
|
00d7a93 |
|
|
|
00d7a93 |
|
|
|
00d7a93 |
-libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
|
|
|
00d7a93 |
+#libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
|
|
|
00d7a93 |
|
|
|
00d7a93 |
|
|
|
00d7a93 |
######################################################################
|
|
|
55def1b |
@@ -633,17 +633,17 @@
|
|
|
6b88691 |
|
|
|
00d7a93 |
for t in tests_pb:
|
|
|
00d7a93 |
env.Program(TestsPath(t),
|
|
|
00d7a93 |
- [TestsPath('src', t + ".cc"), libpb] + libCudd,
|
|
|
00d7a93 |
+ [TestsPath('src', t + ".cc"), libpb], #+ libCudd,
|
|
|
00d7a93 |
CPPPATH=CPPPATH, LIBS = env['LIBS'] + pyconf.libs)
|
|
|
00d7a93 |
|
|
|
00d7a93 |
for t in tests_gb:
|
|
|
00d7a93 |
env.Program(TestsPath(t),
|
|
|
00d7a93 |
- [TestsPath('src', t + ".cc"), libpb, gb]+ libCudd,
|
|
|
00d7a93 |
+ [TestsPath('src', t + ".cc"), libpb, gb], #+ libCudd,
|
|
|
00d7a93 |
CPPPATH=CPPPATH)
|
|
|
00d7a93 |
|
|
|
6b88691 |
for t in ['booleenv_test']:
|
|
|
6b88691 |
env.Program(TestsPath(t),
|
|
|
6b88691 |
- [TestsPath('src', t + ".cc"), TestsPath('src', t + "_static.cc"), libpb]+ libCudd,
|
|
|
6b88691 |
+ [TestsPath('src', t + ".cc"), TestsPath('src', t + "_static.cc"), libpb], #+ libCudd,
|
|
|
6b88691 |
CPPPATH=CPPPATH)
|
|
|
6b88691 |
|
|
|
6b88691 |
testclasses = Split("""BooleEnv BooleSet BooleConstant BoolePolyRing
|
|
|
55def1b |
@@ -652,7 +652,7 @@
|
|
|
6b88691 |
testclasses] + [TestsPath('src', "unittests.cc")]
|
|
|
6b88691 |
|
|
|
6b88691 |
env.Program(TestsPath("unittests"),
|
|
|
6b88691 |
- testfiles + [libpb, gb] + libCudd,
|
|
|
6b88691 |
+ testfiles + [libpb, gb], #+ libCudd,
|
|
|
6b88691 |
CPPPATH=CPPPATH, LIBS = env['LIBS'] + ["boost_unit_test_framework"],
|
|
|
6b88691 |
CPPDEFINES = env['CPPDEFINES'] +
|
|
|
6b88691 |
["BOOST_TEST_DYN_LINK"] )
|
|
|
55def1b |
@@ -663,7 +663,7 @@
|
|
|
6b88691 |
testclassesorderings] + [TestsPath('src', "unittests_orderings.cc")]
|
|
|
6b88691 |
|
|
|
6b88691 |
env.Program(TestsPath("unittests_orderings"),
|
|
|
6b88691 |
- testfilesorderings + [libpb, gb] + libCudd,
|
|
|
6b88691 |
+ testfilesorderings + [libpb, gb], #+ libCudd,
|
|
|
6b88691 |
CPPPATH=CPPPATH, LIBS = env['LIBS'] + ["boost_unit_test_framework"],
|
|
|
6b88691 |
CPPDEFINES = env['CPPDEFINES'] +
|
|
|
6b88691 |
["BOOST_TEST_DYN_LINK"] )
|
|
|
55def1b |
@@ -731,7 +731,7 @@
|
|
|
00d7a93 |
|
|
|
00d7a93 |
|
|
|
00d7a93 |
|
|
|
00d7a93 |
- to_append_for_profile = [libpb, gb] + libCudd
|
|
|
00d7a93 |
+ to_append_for_profile = [libpb, gb] #+ libCudd
|
|
|
00d7a93 |
#to_append_for_profile=File('/lib/libutil.a')
|
|
|
00d7a93 |
env.Program(PyPBPath('profiled'), wrapper_files+to_append_for_profile,
|
|
|
00d7a93 |
LDMODULESUFFIX=".so",SHLIBPREFIX="",
|
|
|
55def1b |
@@ -890,7 +890,7 @@
|
|
|
00d7a93 |
env.AlwaysBuild(srcdistri)
|
|
|
00d7a93 |
env.Alias('distribute', srcdistri)
|
|
|
00d7a93 |
|
|
|
00d7a93 |
-devellibs = [libpb,gb] + libCudd + libpbShared + libgbShared + libCuddShared
|
|
|
00d7a93 |
+devellibs = [libpb,gb] + libpbShared + libgbShared
|
|
|
00d7a93 |
readabledevellibs = SymlinkReadableLibname(devellibs)
|
|
|
00d7a93 |
|
|
|
00d7a93 |
# Installation for development purposes
|
|
|
55def1b |
@@ -902,7 +902,7 @@
|
|
|
00d7a93 |
env.Install(DevelInstPath('include/polybori'), glob(PBPath('include/*.h')))
|
|
|
00d7a93 |
env.Install(DevelInstPath('include/polybori/groebner'),
|
|
|
00d7a93 |
glob(GBPath('src/*.h')))
|
|
|
00d7a93 |
- env.Install(DevelInstPath('include/cudd'), cudd_headers)
|
|
|
00d7a93 |
+ #env.Install(DevelInstPath('include/cudd'), cudd_headers)
|
|
|
6b88691 |
if not(external_m4ri):
|
|
|
6b88691 |
env.Install(DevelInstPath('include/m4ri'), glob('M4RI/*.h'))
|
|
|
6b88691 |
|