From 7ced095b5d7f4616668a719836e358eb0b89f153 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 9 Jun 2014 11:57:56 +0000
Subject: [PATCH] simpler
---
utils/nightly/gmsh_linux.ctest | 2 +-
utils/nightly/gmsh_linux64.ctest | 3 ++-
utils/nightly/gmsh_linux64_coverage.ctest | 2 +-
utils/nightly/gmsh_linux64_dynamic_nightly.ctest | 10 ----------
utils/nightly/gmsh_linux64_nightly.cron | 2 --
utils/nightly/gmsh_linux64_nightly.ctest | 7 +++++++
utils/nightly/gmsh_mac.ctest | 3 ++-
utils/nightly/gmsh_mac_dynamic_nightly.ctest | 10 ----------
utils/nightly/gmsh_mac_nightly.ctest | 4 ++++
utils/nightly/gmsh_mac_nightly.sh | 1 -
utils/nightly/gmsh_msvc.ctest | 2 +-
utils/nightly/gmsh_win.ctest | 2 +-
utils/nightly/gmsh_win64.ctest | 3 ++-
utils/nightly/gmsh_win64_dynamic_nightly.ctest | 10 ----------
utils/nightly/gmsh_win64_nightly.bat | 2 --
utils/nightly/gmsh_win64_nightly.ctest | 4 ++++
16 files changed, 25 insertions(+), 42 deletions(-)
delete mode 100644 utils/nightly/gmsh_linux64_dynamic_nightly.ctest
delete mode 100644 utils/nightly/gmsh_mac_dynamic_nightly.ctest
delete mode 100644 utils/nightly/gmsh_win64_dynamic_nightly.ctest
diff --git a/utils/nightly/gmsh_linux.ctest b/utils/nightly/gmsh_linux.ctest
index ee1d642989..77bc6d120b 100644
--- a/utils/nightly/gmsh_linux.ctest
+++ b/utils/nightly/gmsh_linux.ctest
@@ -4,7 +4,6 @@
# bugs and problems to the public mailing list <gmsh@geuz.org>.
set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Linux")
@@ -15,6 +14,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
#################################################################################
set(CTEST_BUILD_NAME "Linux32")
+set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local")
set(OPT "${OPT} -DENABLE_NATIVE_FILE_CHOOSER:bool=FALSE")
diff --git a/utils/nightly/gmsh_linux64.ctest b/utils/nightly/gmsh_linux64.ctest
index 3c3654058f..877684b629 100644
--- a/utils/nightly/gmsh_linux64.ctest
+++ b/utils/nightly/gmsh_linux64.ctest
@@ -4,7 +4,6 @@
# bugs and problems to the public mailing list <gmsh@geuz.org>.
set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Linux")
@@ -16,8 +15,10 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
#################################################################################
if(BUILD_DYNAMIC)
set(CTEST_BUILD_NAME "Linux64-dynamic")
+ set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_dynamic")
else(BUILD_DYNAMIC)
set(CTEST_BUILD_NAME "Linux64")
+ set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
endif(BUILD_DYNAMIC)
set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local")
diff --git a/utils/nightly/gmsh_linux64_coverage.ctest b/utils/nightly/gmsh_linux64_coverage.ctest
index 644ccc8cf4..c6b65ac6be 100644
--- a/utils/nightly/gmsh_linux64_coverage.ctest
+++ b/utils/nightly/gmsh_linux64_coverage.ctest
@@ -4,7 +4,6 @@
# bugs and problems to the public mailing list <gmsh@geuz.org>.
set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_coverage")
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(WITH_TEST TRUE) # run the tests?
@@ -13,6 +12,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
#################################################################################
set(CTEST_BUILD_NAME "Linux64-Coverage")
+set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_coverage")
set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
set(OPT "${OPT} -DENABLE_FLTK=0")
#set(OPT "${OPT} -DENABLE_NETGEN=0 -DENABLE_DINTEGRATION=0")
diff --git a/utils/nightly/gmsh_linux64_dynamic_nightly.ctest b/utils/nightly/gmsh_linux64_dynamic_nightly.ctest
deleted file mode 100644
index e05715aaf4..0000000000
--- a/utils/nightly/gmsh_linux64_dynamic_nightly.ctest
+++ /dev/null
@@ -1,10 +0,0 @@
-# Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
-#
-# See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
-
-set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-dynamic-svn")
-set(BUILD_DYNAMIC true)
-include(gmsh_linux64.ctest)
diff --git a/utils/nightly/gmsh_linux64_nightly.cron b/utils/nightly/gmsh_linux64_nightly.cron
index afc0a9c09c..dd7473be1e 100644
--- a/utils/nightly/gmsh_linux64_nightly.cron
+++ b/utils/nightly/gmsh_linux64_nightly.cron
@@ -2,5 +2,3 @@
# this will launch a new build every night at 1h01
#
1 1 * * * cd ${HOME}/src/gmsh/utils/nightly && /usr/bin/ctest -S gmsh_linux64_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1
-1 2 * * * cd ${HOME}/src/gmsh/utils/nightly && /usr/bin/ctest -S gmsh_linux64_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&1
-1 3 * * * cd ${HOME}/src/gmsh/utils/nightly && /usr/bin/ctest -S gmsh_linux64_coverage.ctest -VV > ${HOME}/src/gmsh/nightly_coverage.log 2>&1
diff --git a/utils/nightly/gmsh_linux64_nightly.ctest b/utils/nightly/gmsh_linux64_nightly.ctest
index 647dd30a81..8a92ad6ff2 100644
--- a/utils/nightly/gmsh_linux64_nightly.ctest
+++ b/utils/nightly/gmsh_linux64_nightly.ctest
@@ -7,3 +7,10 @@ set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
set(CDASH_MODEL "Nightly")
set(EXTRA_VERSION "-svn")
include(gmsh_linux64.ctest)
+
+set(EXTRA_VERSION "-dynamic-svn")
+set(BUILD_DYNAMIC true)
+include(gmsh_linux64.ctest)
+
+set(EXTRA_VERSION "-coverage-svn")
+include(gmsh_linux64_coverage.ctest)
diff --git a/utils/nightly/gmsh_mac.ctest b/utils/nightly/gmsh_mac.ctest
index 7d9db85f51..7279e8f436 100644
--- a/utils/nightly/gmsh_mac.ctest
+++ b/utils/nightly/gmsh_mac.ctest
@@ -4,7 +4,6 @@
# bugs and problems to the public mailing list <gmsh@geuz.org>.
set(CTEST_CMAKE_COMMAND "/usr/local/bin/cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/MacOSX")
@@ -16,8 +15,10 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
#################################################################################
if(BUILD_DYNAMIC)
set(CTEST_BUILD_NAME "MacOSX64-dynamic")
+ set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_dynamic")
else(BUILD_DYNAMIC)
set(CTEST_BUILD_NAME "MacOSX64")
+ set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
endif(BUILD_DYNAMIC)
set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local")
diff --git a/utils/nightly/gmsh_mac_dynamic_nightly.ctest b/utils/nightly/gmsh_mac_dynamic_nightly.ctest
deleted file mode 100644
index efb6530cd9..0000000000
--- a/utils/nightly/gmsh_mac_dynamic_nightly.ctest
+++ /dev/null
@@ -1,10 +0,0 @@
-# Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
-#
-# See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
-
-set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-dynamic-svn")
-set(BUILD_DYNAMIC true)
-include(gmsh_mac.ctest)
diff --git a/utils/nightly/gmsh_mac_nightly.ctest b/utils/nightly/gmsh_mac_nightly.ctest
index 18910e6404..b49988ac97 100644
--- a/utils/nightly/gmsh_mac_nightly.ctest
+++ b/utils/nightly/gmsh_mac_nightly.ctest
@@ -7,3 +7,7 @@ set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
set(CDASH_MODEL "Nightly")
set(EXTRA_VERSION "-svn")
include(gmsh_mac.ctest)
+
+set(EXTRA_VERSION "-dynamic-svn")
+set(BUILD_DYNAMIC true)
+include(gmsh_mac.ctest)
diff --git a/utils/nightly/gmsh_mac_nightly.sh b/utils/nightly/gmsh_mac_nightly.sh
index 6c6bc3f9f8..032f0b9dd6 100755
--- a/utils/nightly/gmsh_mac_nightly.sh
+++ b/utils/nightly/gmsh_mac_nightly.sh
@@ -5,4 +5,3 @@
# * launchctl load ~/Library/LaunchAgents/org.geuz.gmsh.nightly.plist
cd ${HOME}/src/gmsh/utils/nightly && /usr/local/bin/ctest -S gmsh_mac_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1
-cd ${HOME}/src/gmsh/utils/nightly && /usr/local/bin/ctest -S gmsh_mac_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&1
diff --git a/utils/nightly/gmsh_msvc.ctest b/utils/nightly/gmsh_msvc.ctest
index cda303e8d4..a7ca84799b 100644
--- a/utils/nightly/gmsh_msvc.ctest
+++ b/utils/nightly/gmsh_msvc.ctest
@@ -4,7 +4,6 @@
# bugs and problems to the public mailing list <gmsh@geuz.org>.
set(CTEST_CMAKE_COMMAND "C:/Program Files (x86)/CMake 2.8/bin/cmake.exe")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_msvc")
set(CTEST_CMAKE_GENERATOR "Visual Studio 11")
set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows")
@@ -15,6 +14,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
#################################################################################
set(CTEST_BUILD_NAME "Win64-msvc-mkl")
+set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_msvc")
set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
set(OPT "${OPT} -DENABLE_FLTK=0")
set(CTEST_BUILD_OPTIONS "${OPT}")
diff --git a/utils/nightly/gmsh_win.ctest b/utils/nightly/gmsh_win.ctest
index b6dc1eeb33..504b7204d6 100644
--- a/utils/nightly/gmsh_win.ctest
+++ b/utils/nightly/gmsh_win.ctest
@@ -4,7 +4,6 @@
# bugs and problems to the public mailing list <gmsh@geuz.org>.
set(CTEST_CMAKE_COMMAND "cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows")
@@ -24,6 +23,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
#################################################################################
set(CTEST_BUILD_NAME "Win32")
+set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local;/usr/i686-w64-mingw32/sys-root/mingw")
set(OPT "${OPT} -DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc.exe")
diff --git a/utils/nightly/gmsh_win64.ctest b/utils/nightly/gmsh_win64.ctest
index 86c684fa7f..fef6748d53 100644
--- a/utils/nightly/gmsh_win64.ctest
+++ b/utils/nightly/gmsh_win64.ctest
@@ -4,7 +4,6 @@
# bugs and problems to the public mailing list <gmsh@geuz.org>.
set(CTEST_CMAKE_COMMAND "cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows")
@@ -16,8 +15,10 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
#################################################################################
if(BUILD_DYNAMIC)
set(CTEST_BUILD_NAME "Win64-dynamic")
+ set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_dynamic")
else(BUILD_DYNAMIC)
set(CTEST_BUILD_NAME "Win64")
+ set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
endif(BUILD_DYNAMIC)
set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local;/usr/x86_64-w64-mingw32/sys-root/mingw")
diff --git a/utils/nightly/gmsh_win64_dynamic_nightly.ctest b/utils/nightly/gmsh_win64_dynamic_nightly.ctest
deleted file mode 100644
index 147a06b296..0000000000
--- a/utils/nightly/gmsh_win64_dynamic_nightly.ctest
+++ /dev/null
@@ -1,10 +0,0 @@
-# Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
-#
-# See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
-
-set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-dynamic-svn")
-set(BUILD_DYNAMIC true)
-include(gmsh_win64.ctest)
diff --git a/utils/nightly/gmsh_win64_nightly.bat b/utils/nightly/gmsh_win64_nightly.bat
index 6e780c6b40..c7fd8ca455 100755
--- a/utils/nightly/gmsh_win64_nightly.bat
+++ b/utils/nightly/gmsh_win64_nightly.bat
@@ -5,6 +5,4 @@ chdir C:\cygwin\bin
bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1"
-bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&1"
-
bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && /cygdrive/c/Program\ Files\ \(x86\)/CMake\ 2.8/bin/ctest.exe -S gmsh_msvc.ctest -VV > ${HOME}/src/gmsh/nightly_msvc.log 2>&1"
diff --git a/utils/nightly/gmsh_win64_nightly.ctest b/utils/nightly/gmsh_win64_nightly.ctest
index 7a4207f5ad..14ed8d107d 100644
--- a/utils/nightly/gmsh_win64_nightly.ctest
+++ b/utils/nightly/gmsh_win64_nightly.ctest
@@ -7,3 +7,7 @@ set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
set(CDASH_MODEL "Nightly")
set(EXTRA_VERSION "-svn")
include(gmsh_win64.ctest)
+
+set(EXTRA_VERSION "-dynamic-svn")
+set(BUILD_DYNAMIC true)
+include(gmsh_win64.ctest)
--
GitLab