diff --git a/support/jenkins/buildAllModuleCombination.py b/support/jenkins/buildAllModuleCombination.py index fbd3ec86c5..61acb95938 100644 --- a/support/jenkins/buildAllModuleCombination.py +++ b/support/jenkins/buildAllModuleCombination.py @@ -2,8 +2,8 @@ import os from subprocess import call from itertools import product, repeat -# To be called from the OpenSpace main folder -modules = os.listdir("modules") +# To be called from the build folder in the OpenSpace +modules = os.listdir("../modules") modules.remove("base") # Get 2**len(modules) combinatorical combinations of ON/OFF @@ -18,12 +18,12 @@ for s in settings: for m,s in zip(modules, s): cmd.append("-DOPENSPACE_MODULE_" + m.upper() + "=" + s) + cmd.append("..") cmds.append(cmd) # Build cmake and compile for c in cmds: print "CMake:" , cmd call(cmd) - call(["make", "clean"]) call(["make", "-j4"]) diff --git a/support/jenkins/buildAllModules.py b/support/jenkins/buildAllModules.py index 9fad2bad71..5d7250aabd 100644 --- a/support/jenkins/buildAllModules.py +++ b/support/jenkins/buildAllModules.py @@ -1,13 +1,13 @@ import os from subprocess import call -# To be called from the OpenSpace main folder -modules = os.listdir("modules") +# To be called from the build folder in the OpenSpace +modules = os.listdir("../modules") cmd = ["cmake"] cmd.append("-DGHOUL_USE_DEVIL=OFF") for m in modules: cmd.append("-DOPENSPACE_MODULE_" + m.upper() + "=ON") -cmd.append(".") +cmd.append("..") call(cmd) \ No newline at end of file