From 272aceee91d113890224641025fc0f88f949e027 Mon Sep 17 00:00:00 2001 From: David Cock Date: Mon, 20 Oct 2014 15:41:41 +1100 Subject: [PATCH 1/4] Switched submodules to HTTPS github URLs --- .gitmodules | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitmodules b/.gitmodules index e55fd04..42646ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,42 +1,42 @@ [submodule "lib/code-widget"] path = lib/code-widget - url = git@github.com:termite2/code-widget.git + url = https://github.com/termite2/code-widget.git [submodule "lib/haskell_cudd"] path = lib/haskell_cudd - url = git@github.com:termite2/haskell_cudd.git + url = https://github.com/termite2/haskell_cudd.git [submodule "lib/debug"] path = lib/debug - url = git@github.com:termite2/debug.git + url = https://github.com/termite2/debug.git [submodule "lib/synthesis"] path = lib/synthesis - url = git@github.com:termite2/synthesis.git + url = https://github.com/termite2/synthesis.git [submodule "lib/util"] path = lib/util - url = git@github.com:termite2/util.git + url = https://github.com/termite2/util.git [submodule "lib/tsl"] path = lib/tsl - url = git@github.com:termite2/tsl.git + url = https://github.com/termite2/tsl.git [submodule "lib/graph-draw"] path = lib/graph-draw - url = git@github.com:termite2/graph-draw.git + url = https://github.com/termite2/graph-draw.git [submodule "lib/hast"] path = lib/hast - url = git@github.com:termite2/hast.git + url = https://github.com/termite2/hast.git [submodule "lib/bv"] path = lib/bv - url = git@github.com:termite2/bv.git + url = https://github.com/termite2/bv.git [submodule "tools/termite-app"] path = tools/termite-app - url = git@github.com:termite2/termite-app.git + url = https://github.com/termite2/termite-app.git [submodule "tools/bdd"] path = tools/bdd - url = git@github.com:termite2/bdd.git + url = https://github.com/termite2/bdd.git [submodule "lib/bdd"] path = lib/bdd - url = git@github.com:termite2/bdd.git + url = https://github.com/termite2/bdd.git [submodule "lib/cudd"] path = lib/cudd - url = git@github.com:termite2/cudd.git + url = https://github.com/termite2/cudd.git [submodule "specs"] path = specs - url = git@github.com:termite2/specs.git + url = https://github.com/termite2/specs.git From 778b33574e116325292817f51d64d8b7d86d710e Mon Sep 17 00:00:00 2001 From: David Cock Date: Thu, 23 Oct 2014 17:44:45 +1100 Subject: [PATCH 2/4] Standalone termite binary Building CUDD as a native Haskell package lets us avoid dynamic lib dependencies. --- .gitmodules | 3 --- build.sh | 12 +----------- lib/cudd | 2 +- lib/haskell_cudd | 1 - setup.sh | 3 +-- 5 files changed, 3 insertions(+), 18 deletions(-) delete mode 160000 lib/haskell_cudd diff --git a/.gitmodules b/.gitmodules index 42646ae..76f188c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "lib/code-widget"] path = lib/code-widget url = https://github.com/termite2/code-widget.git -[submodule "lib/haskell_cudd"] - path = lib/haskell_cudd - url = https://github.com/termite2/haskell_cudd.git [submodule "lib/debug"] path = lib/debug url = https://github.com/termite2/debug.git diff --git a/build.sh b/build.sh index 8052f96..5b0166b 100755 --- a/build.sh +++ b/build.sh @@ -1,13 +1,3 @@ #!/bin/bash -pushd lib/cudd - -if [ "`getconf LONG_BIT`" == "64" ]; - then make -f Makefile.64bit libso - else make -f Makefile.32bit libso -fi - -popd - -LD_LIBRARY_PATH=`pwd`/lib/cudd/libso cabal install termite --extra-include-dirs=`pwd`/lib/cudd/include --extra-lib-dirs=`pwd`/lib/cudd/libso --bindir=`pwd`/bin - +cabal install termite --bindir=`pwd`/bin diff --git a/lib/cudd b/lib/cudd index 244caaa..ac29414 160000 --- a/lib/cudd +++ b/lib/cudd @@ -1 +1 @@ -Subproject commit 244caaaa7a0fcb3367039c44cb6ac5bbe3b928f2 +Subproject commit ac2941477013fb14fabbf95f699376b96471163e diff --git a/lib/haskell_cudd b/lib/haskell_cudd deleted file mode 160000 index 234b560..0000000 --- a/lib/haskell_cudd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 234b56073c7676039cf45777a64308a032619d24 diff --git a/setup.sh b/setup.sh index 0f84fea..deec097 100755 --- a/setup.sh +++ b/setup.sh @@ -5,8 +5,7 @@ git submodule update cabal sandbox init cabal update -cabal sandbox add-source lib/bdd lib/bv lib/code-widget lib/debug lib/graph-draw lib/haskell_cudd lib/hast lib/synthesis lib/tsl lib/util tools/termite-app +cabal sandbox add-source lib/bdd lib/bv lib/code-widget lib/debug lib/graph-draw lib/cudd lib/hast lib/synthesis lib/tsl lib/util tools/termite-app cabal install c2hs cabal install gtk2hs-buildtools - From 506f5ee1a4b690cc9eea47b8cacadce2b4164146 Mon Sep 17 00:00:00 2001 From: David Cock Date: Thu, 23 Oct 2014 17:58:01 +1100 Subject: [PATCH 3/4] Switched cudd to my github branch --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 76f188c..2008c13 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,7 +33,7 @@ url = https://github.com/termite2/bdd.git [submodule "lib/cudd"] path = lib/cudd - url = https://github.com/termite2/cudd.git + url = https://github.com/davidcock/cudd.git [submodule "specs"] path = specs url = https://github.com/termite2/specs.git From bcd3720f5058de99f3760d4135ea48022fe4542d Mon Sep 17 00:00:00 2001 From: David Cock Date: Fri, 24 Oct 2014 13:06:36 +1100 Subject: [PATCH 4/4] Updated cudd version --- lib/cudd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cudd b/lib/cudd index ac29414..40d6fbc 160000 --- a/lib/cudd +++ b/lib/cudd @@ -1 +1 @@ -Subproject commit ac2941477013fb14fabbf95f699376b96471163e +Subproject commit 40d6fbcf82cb5bfc1eb3fa4e5c12ff7cb7d1c4d5