From 316aed6dfeec4a1aa91b1c6ce35b9bf184870aed Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 26 Mar 2011 22:26:51 +0000
Subject: [PATCH] tweak nightlies
---
utils/nightly/linux.crontab | 2 +-
utils/nightly/linux.sh | 3 ++-
utils/nightly/mac.crontab | 2 +-
utils/nightly/mac.sh | 3 ++-
utils/nightly/windows.bat | 2 +-
utils/nightly/windows.sh | 3 ++-
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/utils/nightly/linux.crontab b/utils/nightly/linux.crontab
index 77ab9cfd23..c2f3ad76c2 100644
--- a/utils/nightly/linux.crontab
+++ b/utils/nightly/linux.crontab
@@ -1,4 +1,4 @@
#
# this will launch a new build every night at 1h01
#
-1 1 * * * ${HOME}/src/gmsh/utils/nightly/linux.sh
+1 1 * * * ${HOME}/src/gmsh/utils/nightly/linux.sh -svn
diff --git a/utils/nightly/linux.sh b/utils/nightly/linux.sh
index 9e4cfc0bed..4941faf79b 100755
--- a/utils/nightly/linux.sh
+++ b/utils/nightly/linux.sh
@@ -1,5 +1,6 @@
#!/bin/sh
+EXTRA_VERSION=$1
GMSH=${HOME}/src/gmsh
LOG=${GMSH}/nightly.log
WEB_BIN=geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Linux
@@ -14,7 +15,7 @@ echo "BUILD BEGIN: `date`" > ${LOG}
cd ${GMSH} && svn update >> ${LOG} 2>&1
mkdir ${GMSH}/bin
cd ${GMSH}/bin && \
- ${CMAKE} -DGMSH_EXTRA_VERSION:string="-svn"\
+ ${CMAKE} -DGMSH_EXTRA_VERSION:string="${EXTRA_VERSION}"\
-DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
-DENABLE_NATIVE_FILE_CHOOSER:bool=FALSE\
-DENABLE_SWIG:bool=FALSE\
diff --git a/utils/nightly/mac.crontab b/utils/nightly/mac.crontab
index 814e58681e..2376c7c9b6 100644
--- a/utils/nightly/mac.crontab
+++ b/utils/nightly/mac.crontab
@@ -1,4 +1,4 @@
#
# this will launch a new build every night at 0h01
#
-1 0 * * * ${HOME}/src/gmsh/utils/nightly/mac.sh
+1 0 * * * ${HOME}/src/gmsh/utils/nightly/mac.sh -svn
diff --git a/utils/nightly/mac.sh b/utils/nightly/mac.sh
index 3b130e2361..d6f790db28 100755
--- a/utils/nightly/mac.sh
+++ b/utils/nightly/mac.sh
@@ -1,5 +1,6 @@
#!/bin/sh
+EXTRA_VERSION=$1
GMSH=${HOME}/src/gmsh
LOG=${GMSH}/nightly.log
WEB_BIN=geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/MacOSX
@@ -14,7 +15,7 @@ echo "BUILD BEGIN: `date`" > ${LOG}
cd ${GMSH} && svn update >> ${LOG} 2>&1
mkdir ${GMSH}/bin
cd ${GMSH}/bin &&\
- ${CMAKE} -DGMSH_EXTRA_VERSION:string="-svn"\
+ ${CMAKE} -DGMSH_EXTRA_VERSION:string="${EXTRA_VERSION}"\
-DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
-DENABLE_SWIG:bool=FALSE\
${GMSH} >> ${LOG} 2>&1
diff --git a/utils/nightly/windows.bat b/utils/nightly/windows.bat
index bd44b546e6..1096b2f387 100755
--- a/utils/nightly/windows.bat
+++ b/utils/nightly/windows.bat
@@ -3,4 +3,4 @@
C:
chdir C:\cygwin\bin
-bash --login C:\cygwin\home\Administrator\src\gmsh\utils\nightly\windows.sh
+bash --login C:\cygwin\home\Administrator\src\gmsh\utils\nightly\windows.sh -svn
diff --git a/utils/nightly/windows.sh b/utils/nightly/windows.sh
index a5e1856ea9..1aaee942b1 100755
--- a/utils/nightly/windows.sh
+++ b/utils/nightly/windows.sh
@@ -1,5 +1,6 @@
#!/bin/sh
+EXTRA_VERSION=$1
GMSH=${HOME}/src/gmsh
LOG=${GMSH}/nightly.log
WEB_BIN=geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows
@@ -14,7 +15,7 @@ echo "BUILD BEGIN: `date`" > ${LOG}
cd ${GMSH} && svn update >> ${LOG} 2>&1
mkdir ${GMSH}/bin
cd ${GMSH}/bin && \
- ${CMAKE} -DGMSH_EXTRA_VERSION:string="-svn"\
+ ${CMAKE} -DGMSH_EXTRA_VERSION:string="${EXTRA_VERSION}"\
-DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
-DCMAKE_CXX_FLAGS:string="-mno-cygwin"\
-DCMAKE_C_FLAGS:string="-mno-cygwin"\
--
GitLab