|
 |
3c6a797 |
--- SConstruct.orig 2011-09-05 17:11:21.000000000 -0600
|
|
|
3c6a797 |
+++ SConstruct 2011-09-07 14:27:58.450940097 -0600
|
|
|
3c6a797 |
@@ -711,12 +711,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."""
|
|
|
3c6a797 |
@@ -750,7 +750,7 @@
|
|
|
3c6a797 |
slib = env.SharedLibrary
|
|
|
3c6a797 |
if env['SHLIBVERSIONING']:
|
|
|
3c6a797 |
slib = VersionatedSharedLibrary
|
|
|
00d7a93 |
-libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
|
|
|
00d7a93 |
+#libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
|
|
|
00d7a93 |
|
|
|
00d7a93 |
|
|
|
00d7a93 |
######################################################################
|
|
|
3c6a797 |
@@ -819,17 +819,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),
|
|
|
3c6a797 |
- [TestsPath('src', t + ".cc"), libpb, gb]+ libCudd,
|
|
|
3c6a797 |
+ [TestsPath('src', t + ".cc"), libpb, gb], #+ libCudd,
|
|
|
3c6a797 |
LIBS = env['LIBS'] + GD_LIBS,
|
|
|
3c6a797 |
CPPPATH=CPPPATH)
|
|
|
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
|
|
|
3c6a797 |
@@ -839,7 +839,7 @@
|
|
|
3c6a797 |
|
|
|
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"] )
|
|
|
3c6a797 |
@@ -850,7 +850,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"] )
|
|
|
3c6a797 |
@@ -932,7 +932,7 @@
|
|
|
3c6a797 |
DefaultBuild(env.Install(polybori_modules, f))
|
|
|
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="",
|
|
|
3c6a797 |
@@ -1093,7 +1093,7 @@
|
|
|
3c6a797 |
|
|
|
3c6a797 |
dylibs += libpbShared + libgbShared
|
|
|
3c6a797 |
|
|
|
00d7a93 |
-devellibs = [libpb,gb] + libCudd + libpbShared + libgbShared + libCuddShared
|
|
|
00d7a93 |
+devellibs = [libpb,gb] + libpbShared + libgbShared
|
|
|
3c6a797 |
stlibs += [libpb, gb]
|
|
|
00d7a93 |
|
|
|
3c6a797 |
readabledevellibs = pb_symlinks + gb_symlinks + SymlinkReadableLibname([libpb,
|
|
|
3c6a797 |
@@ -1116,7 +1116,7 @@
|
|
|
00d7a93 |
env.Install(DevelInstPath('include/polybori/groebner'),
|
|
|
00d7a93 |
glob(GBPath('src/*.h')))
|
|
|
3c6a797 |
# Install our own copy the cudd header to ensure correct (patched) version
|
|
|
3c6a797 |
- env.Install(DevelInstInclPath('cudd'), cudd_headers)
|
|
|
3c6a797 |
+ # env.Install(DevelInstInclPath('cudd'), cudd_headers)
|
|
|
6b88691 |
if not(external_m4ri):
|
|
|
3c6a797 |
env.Install(DevelInstInclPath('m4ri'), glob('M4RI/m4ri/*.h'))
|
|
|
6b88691 |
|