From 13baf4eeb4e64e154ca9bb96b63198c2bcf28f69 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Tue, 15 Jun 2021 17:29:34 +1000 Subject: [PATCH] Use same binary for restart and normal run --- .gitmodules | 10 +--------- install.sh | 2 +- software/chuffed | 2 +- software/chuffed_on_restart | 1 - software/gecode | 2 +- software/gecode_on_restart | 1 - 6 files changed, 4 insertions(+), 14 deletions(-) delete mode 160000 software/chuffed_on_restart delete mode 160000 software/gecode_on_restart diff --git a/.gitmodules b/.gitmodules index 62a3cbc..678c8db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "software/gecode_on_restart"] - path = software/gecode_on_restart - url = git@github.com:Dekker1/gecode.git - branch = feature/on_restart [submodule "software/gecode_on_record"] path = software/gecode_on_record url = git@github.com:Dekker1/gecode.git @@ -13,12 +9,8 @@ [submodule "software/gecode"] path = software/gecode url = git@github.com:Dekker1/gecode.git - branch = develop + branch = feature/on_restart [submodule "software/chuffed"] path = software/chuffed url = git@github.com:Dekker1/chuffed.git - branch = develop -[submodule "software/chuffed_on_restart"] - path = software/chuffed_on_restart - url = git@github.com:Dekker1/chuffed.git branch = feature/on_restart diff --git a/install.sh b/install.sh index 799c08a..2b6e3db 100755 --- a/install.sh +++ b/install.sh @@ -8,7 +8,7 @@ module load flex mkdir -p software/{build,install} # Build Chuffed -for dir in "chuffed" "chuffed_on_restart" "gecode" "gecode_on_record" "gecode_on_replay" "gecode_on_restart" +for dir in "chuffed" "gecode" "gecode_on_record" "gecode_on_replay" do cmake -S software/${dir} -B software/build/${dir} -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=`pwd`/software/install/${dir} cmake --build software/build/${dir} --config Release --target install diff --git a/software/chuffed b/software/chuffed index e04bedd..4b88dae 160000 --- a/software/chuffed +++ b/software/chuffed @@ -1 +1 @@ -Subproject commit e04bedd06c3eee88f318372a8a1ed35c954ba9d4 +Subproject commit 4b88dae8a6c50f327e876ddcccde5bda0b01c4dc diff --git a/software/chuffed_on_restart b/software/chuffed_on_restart deleted file mode 160000 index 4b88dae..0000000 --- a/software/chuffed_on_restart +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b88dae8a6c50f327e876ddcccde5bda0b01c4dc diff --git a/software/gecode b/software/gecode index bbefcea..313e876 160000 --- a/software/gecode +++ b/software/gecode @@ -1 +1 @@ -Subproject commit bbefcea214fec798a0f5acc442581984555acd21 +Subproject commit 313e87646da4fc2752a70e83df16d993121a8e40 diff --git a/software/gecode_on_restart b/software/gecode_on_restart deleted file mode 160000 index 313e876..0000000 --- a/software/gecode_on_restart +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 313e87646da4fc2752a70e83df16d993121a8e40