up

bundle_onelab.sh

@@ -21,11 +21,11 @@ documentation." > /tmp/README.txt
 
 GMSH=git
 GETDP=git
-OPTLAB=1.0.0
+CONVEKS=git
 
 #GMSH=4.0.1
 #GETDP=3.0.1
-#OPTLAB=1.0.0
+#CONVEKS=1.0.0
 
 TUTO_GETDP=`cat bundle_tutorials_getdp.txt`
 TUTO_CPP=`cat bundle_tutorials_cpp.txt`
@@ -62,8 +62,8 @@ for m in ${TUTO_CPP}; do
   unzip -q -o ${m}.zip -d /tmp/tutorials/c++
   rm -f ${m}.zip
 done
-git clone https://gitlab.onelab.info/optlab/tutorials /tmp/tutorials/optlab
-rm -rf /tmp/tutorials/optlab/.git
+git clone https://gitlab.onelab.info/conveks/tutorials /tmp/tutorials/conveks
+rm -rf /tmp/tutorials/conveks/.git
 
 if [ $# -lt 1 ] || [ $1 == "source" ]; then
   rm -rf onelab-source*
@@ -99,20 +99,20 @@ if [ $# -lt 1 ] || [ $1 == "win64" ]; then
   mkdir onelab-Windows64
   curl -O https://gmsh.info/bin/Windows/gmsh-${GMSH}-Windows64.zip
   curl -O https://getdp.info/bin/Windows/getdp-${GETDP}-Windows64c.zip
-  curl -O https://onelab.info/optlab/bin/optlab-${OPTLAB}-Windows64.zip
+  curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-Windows64.zip
   mv gmsh-${GMSH}-Windows64.zip /tmp
   mv getdp-${GETDP}-Windows64c.zip /tmp
-  mv optlab-${OPTLAB}-Windows64.zip /tmp
+  mv conveks-${CONVEKS}-Windows64.zip /tmp
   unzip -q -o /tmp/gmsh-${GMSH}-Windows64.zip -d /tmp
   unzip -q -o /tmp/getdp-${GETDP}-Windows64c.zip -d /tmp
-  unzip -q -o /tmp/optlab-${OPTLAB}-Windows64.zip -d /tmp
+  unzip -q -o /tmp/conveks-${CONVEKS}-Windows64.zip -d /tmp
   cp /tmp/README.txt onelab-Windows64
   perl -pi -e 's/\n/\r\n/' onelab-Windows64/README.txt
   mv /tmp/gmsh-*${GMSH}-Windows64/gmsh.exe onelab-Windows64
   mv /tmp/gmsh-*${GMSH}-Windows64/onelab.py onelab-Windows64
   mv /tmp/getdp-*${GETDP}-Windows64/getdp.exe onelab-Windows64
-  mv /tmp/optlab-*${OPTLAB}-Windows64/lib/optlab.py onelab-Windows64
-  mv /tmp/optlab-*${OPTLAB}-Windows64/lib/optlab*.dll onelab-Windows64
+  mv /tmp/conveks-*${CONVEKS}-Windows64/lib/conveks.py onelab-Windows64
+  mv /tmp/conveks-*${CONVEKS}-Windows64/lib/conveks*.dll onelab-Windows64
   mv /tmp/gmsh-*${GMSH}-Windows64/LICENSE.txt onelab-Windows64/LICENSE.txt
   echo "\n\n" >> onelab-Windows64/LICENSE.txt
   cat /tmp/getdp-*${GETDP}-Windows64/LICENSE.txt >> onelab-Windows64/LICENSE.txt
@@ -125,7 +125,7 @@ if [ $# -lt 1 ] || [ $1 == "win64" ]; then
   cp -R /tmp/getdp-*${GETDP}-Windows64/templates onelab-Windows64/
   rm -rf /tmp/gmsh-*
   rm -rf /tmp/getdp-*
-  rm -rf /tmp/optlab-*
+  rm -rf /tmp/conveks-*
   zip -r onelab-Windows64.zip onelab-Windows64
   rm -rf onelab-Windows64
   scp onelab-Windows64.zip geuzaine@onelab.info:/onelab_files/
@@ -136,20 +136,20 @@ if [ $# -lt 1 ] || [ $1 == "win32" ]; then
   mkdir onelab-Windows32
   curl -O https://gmsh.info/bin/Windows/gmsh-${GMSH}-Windows32.zip
   curl -O https://getdp.info/bin/Windows/getdp-${GETDP}-Windows32c.zip
-  curl -O https://onelab.info/optlab/bin/optlab-${OPTLAB}-Windows32.zip
+  curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-Windows32.zip
   mv gmsh-${GMSH}-Windows32.zip /tmp
   mv getdp-${GETDP}-Windows32c.zip /tmp
-  mv optlab-${OPTLAB}-Windows32.zip /tmp
+  mv conveks-${CONVEKS}-Windows32.zip /tmp
   unzip -q -o /tmp/gmsh-${GMSH}-Windows32.zip -d /tmp
   unzip -q -o /tmp/getdp-${GETDP}-Windows32c.zip -d /tmp
-  unzip -q -o /tmp/optlab-${OPTLAB}-Windows32.zip -d /tmp
+  unzip -q -o /tmp/conveks-${CONVEKS}-Windows32.zip -d /tmp
   cp /tmp/README.txt onelab-Windows32
   perl -pi -e 's/\n/\r\n/' onelab-Windows32/README.txt
   mv /tmp/gmsh-*${GMSH}-Windows32/gmsh.exe onelab-Windows32
   mv /tmp/gmsh-*${GMSH}-Windows32/onelab.py onelab-Windows32
   mv /tmp/getdp-*${GETDP}-Windows32/getdp.exe onelab-Windows32
-  mv /tmp/optlab-*${OPTLAB}-Windows32/lib/optlab.py onelab-Windows32
-  mv /tmp/optlab-*${OPTLAB}-Windows32/lib/optlab*.dll onelab-Windows32
+  mv /tmp/conveks-*${CONVEKS}-Windows32/lib/conveks.py onelab-Windows32
+  mv /tmp/conveks-*${CONVEKS}-Windows32/lib/conveks*.dll onelab-Windows32
   mv /tmp/gmsh-*${GMSH}-Windows32/LICENSE.txt onelab-Windows32/LICENSE.txt
   echo "\n\n" >> onelab-Windows32/LICENSE.txt
   cat /tmp/getdp-*${GETDP}-Windows32/LICENSE.txt >> onelab-Windows32/LICENSE.txt
@@ -162,7 +162,7 @@ if [ $# -lt 1 ] || [ $1 == "win32" ]; then
   cp -R /tmp/getdp-*${GETDP}-Windows32/templates onelab-Windows32/
   rm -rf /tmp/gmsh-*
   rm -rf /tmp/getdp-*
-  rm -rf /tmp/optlab-*
+  rm -rf /tmp/conveks-*
   zip -r onelab-Windows32.zip onelab-Windows32
   rm -rf onelab-Windows32
   scp onelab-Windows32.zip geuzaine@onelab.info:/onelab_files/
@@ -173,19 +173,19 @@ if [ $# -lt 1 ] || [ $1 == "linux64" ]; then
   mkdir onelab-Linux64
   curl -O https://gmsh.info/bin/Linux/gmsh-${GMSH}-Linux64.tgz
   curl -O https://getdp.info/bin/Linux/getdp-${GETDP}-Linux64c.tgz
-  curl -O https://onelab.info/optlab/bin/optlab-${OPTLAB}-Linux64.zip
+  curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-Linux64.zip
   mv gmsh-${GMSH}-Linux64.tgz /tmp
   mv getdp-${GETDP}-Linux64c.tgz /tmp
-  mv optlab-${OPTLAB}-Linux64.zip /tmp
+  mv conveks-${CONVEKS}-Linux64.zip /tmp
   tar zxvf /tmp/gmsh-${GMSH}-Linux64.tgz -C /tmp
   tar zxvf /tmp/getdp-${GETDP}-Linux64c.tgz -C /tmp
-  unzip -q -o /tmp/optlab-${OPTLAB}-Linux64.zip -d /tmp
+  unzip -q -o /tmp/conveks-${CONVEKS}-Linux64.zip -d /tmp
   cp /tmp/README.txt onelab-Linux64
   mv /tmp/gmsh-*${GMSH}-Linux64/bin/gmsh onelab-Linux64
   mv /tmp/gmsh-*${GMSH}-Linux64/bin/onelab.py onelab-Linux64
   mv /tmp/getdp-*${GETDP}-Linux64/bin/getdp onelab-Linux64
-  mv /tmp/optlab-*${OPTLAB}-Linux64/lib/optlab.py onelab-Linux64
-  cp /tmp/optlab-*${OPTLAB}-Linux64/lib/liboptlab*.so onelab-Linux64
+  mv /tmp/conveks-*${CONVEKS}-Linux64/lib/conveks.py onelab-Linux64
+  cp /tmp/conveks-*${CONVEKS}-Linux64/lib/libconveks*.so onelab-Linux64
   mv /tmp/gmsh-*${GMSH}-Linux64/share/doc/gmsh/LICENSE.txt onelab-Linux64/LICENSE.txt
   echo "\n\n" >> onelab-Linux64/LICENSE.txt
   cat /tmp/getdp-*${GETDP}-Linux64/share/doc/getdp/LICENSE.txt >> onelab-Linux64/LICENSE.txt
@@ -198,7 +198,7 @@ if [ $# -lt 1 ] || [ $1 == "linux64" ]; then
   cp -R /tmp/getdp-*${GETDP}-Linux64/share/doc/getdp/templates onelab-Linux64
   rm -rf /tmp/gmsh-*
   rm -rf /tmp/getdp-*
-  rm -rf /tmp/optlab-*
+  rm -rf /tmp/conveks-*
   zip -r onelab-Linux64.zip onelab-Linux64
   rm -rf onelab-Linux64
   scp onelab-Linux64.zip geuzaine@onelab.info:/onelab_files/
@@ -209,19 +209,19 @@ if [ $# -lt 1 ] || [ $1 == "linux32" ]; then
   mkdir onelab-Linux32
   curl -O https://gmsh.info/bin/Linux/gmsh-${GMSH}-Linux32.tgz
   curl -O https://getdp.info/bin/Linux/getdp-${GETDP}-Linux32c.tgz
-  curl -O https://onelab.info/optlab/bin/optlab-${OPTLAB}-Linux32.zip
+  curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-Linux32.zip
   mv gmsh-${GMSH}-Linux32.tgz /tmp
   mv getdp-${GETDP}-Linux32c.tgz /tmp
-  mv optlab-${OPTLAB}-Linux32.zip /tmp
+  mv conveks-${CONVEKS}-Linux32.zip /tmp
   tar zxvf /tmp/gmsh-${GMSH}-Linux32.tgz -C /tmp
   tar zxvf /tmp/getdp-${GETDP}-Linux32c.tgz -C /tmp
-  unzip -q -o /tmp/optlab-${OPTLAB}-Linux32.zip -d /tmp
+  unzip -q -o /tmp/conveks-${CONVEKS}-Linux32.zip -d /tmp
   cp /tmp/README.txt onelab-Linux32
   mv /tmp/gmsh-*${GMSH}-Linux32/bin/gmsh onelab-Linux32
   mv /tmp/gmsh-*${GMSH}-Linux32/bin/onelab.py onelab-Linux32
   mv /tmp/getdp-*${GETDP}-Linux32/bin/getdp onelab-Linux32
-  mv /tmp/optlab-*${OPTLAB}-Linux32/lib/optlab.py onelab-Linux32
-  cp /tmp/optlab-*${OPTLAB}-Linux32/lib/liboptlab*.so onelab-Linux32
+  mv /tmp/conveks-*${CONVEKS}-Linux32/lib/conveks.py onelab-Linux32
+  cp /tmp/conveks-*${CONVEKS}-Linux32/lib/libconveks*.so onelab-Linux32
   mv /tmp/gmsh-*${GMSH}-Linux32/share/doc/gmsh/LICENSE.txt onelab-Linux32/LICENSE.txt
   echo "\n\n" >> onelab-Linux32/LICENSE.txt
   cat /tmp/getdp-*${GETDP}-Linux32/share/doc/getdp/LICENSE.txt >> onelab-Linux32/LICENSE.txt
@@ -234,7 +234,7 @@ if [ $# -lt 1 ] || [ $1 == "linux32" ]; then
   cp -R /tmp/getdp-*${GETDP}-Linux32/share/doc/getdp/templates onelab-Linux32
   rm -rf /tmp/gmsh-*
   rm -rf /tmp/getdp-*
-  rm -rf /tmp/optlab-*
+  rm -rf /tmp/conveks-*
   zip -r onelab-Linux32.zip onelab-Linux32
   rm -rf onelab-Linux32
   scp onelab-Linux32.zip geuzaine@onelab.info:/onelab_files/
@@ -245,19 +245,19 @@ if [ $# -lt 1 ] || [ $1 == "mac" ]; then
   mkdir onelab-MacOSX
   curl -O https://gmsh.info/bin/MacOSX/gmsh-${GMSH}-MacOSX.dmg
   curl -O https://getdp.info/bin/MacOSX/getdp-${GETDP}-MacOSXc.tgz
-  curl -O https://onelab.info/optlab/bin/optlab-${OPTLAB}-MacOSX.zip
+  curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-MacOSX.zip
   mv gmsh-${GMSH}-MacOSX.dmg /tmp
   mv getdp-${GETDP}-MacOSXc.tgz /tmp
-  mv optlab-${OPTLAB}-MacOSX.zip /tmp
+  mv conveks-${CONVEKS}-MacOSX.zip /tmp
   hdiutil convert /tmp/gmsh-${GMSH}-MacOSX.dmg -format UDTO -o /tmp/gmsh-tmp.cdr
   hdiutil attach -nobrowse -noverify -noautoopen -mountpoint gmsh_mount /tmp/gmsh-tmp.cdr
   tar zxvf /tmp/getdp-${GETDP}-MacOSXc.tgz -C /tmp
-  unzip -q -o /tmp/optlab-${OPTLAB}-MacOSX.zip -d /tmp
+  unzip -q -o /tmp/conveks-${CONVEKS}-MacOSX.zip -d /tmp
   cp /tmp/README.txt onelab-MacOSX
   cp -R gmsh_mount/Gmsh.app onelab-MacOSX/
   mv /tmp/getdp-*${GETDP}-MacOSX/bin/getdp onelab-MacOSX/Gmsh.app/Contents/MacOS/
-  mv /tmp/optlab-*${OPTLAB}-MacOSX/lib/optlab.py onelab-MacOSX/Gmsh.app/Contents/MacOS/
-  cp /tmp/optlab-*${OPTLAB}-MacOSX/lib/liboptlab*.dylib onelab-MacOSX/Gmsh.app/Contents/MacOS/
+  mv /tmp/conveks-*${CONVEKS}-MacOSX/lib/conveks.py onelab-MacOSX/Gmsh.app/Contents/MacOS/
+  cp /tmp/conveks-*${CONVEKS}-MacOSX/lib/libconveks*.dylib onelab-MacOSX/Gmsh.app/Contents/MacOS/
   security unlock-keychain -p "FIXME" ${HOME}/Library/Keychains/login.keychain
   codesign -v --force --deep --sign "Developer ID Application: Christophe Geuzaine" onelab-MacOSX/Gmsh.app
   cp gmsh_mount/LICENSE.txt onelab-MacOSX/LICENSE.txt
@@ -273,7 +273,7 @@ if [ $# -lt 1 ] || [ $1 == "mac" ]; then
   hdiutil eject gmsh_mount
   rm -rf /tmp/gmsh-*
   rm -rf /tmp/getdp-*
-  rm -rf /tmp/optlab-*
+  rm -rf /tmp/conveks-*
   # cannot use zip file: it destroys the signature for onelab.py
   hdiutil create -srcfolder onelab-MacOSX onelab-MacOSX.dmg
   codesign -v --sign "Developer ID Application: Christophe Geuzaine" onelab-MacOSX.dmg