Changeset be65acb in tol for building/Linux/build.sh

Timestamp:

Feb 10, 2016, 10:36:23 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

db5a963

Parents:

2c66570

Message:

Refs #1880
Se usan la primera letra en mayúscula para las opciones Release y Debug.
Se incorpora un scripta para gestionar la versión de TOL en Linux.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7214 be4846ae-f051-483a-831f-b64e7d08527f

File:

• building/Linux/build.sh (modified) (4 diffs)

building/Linux/build.sh

@@ -2 +2 @@
 #************************************************************
 # La llamada al script recibe dos argumentos:
-#   ./build.sh [tol|toltcl|tolbase|rtol] [|release|debug]
+#   ./build.sh [tol|toltcl|tolbase|rtol] [|Release|Debug]
 #************************************************************
 # Durante el proceso se pregunta por cada una de las etapas.
@@ -8 +8 @@
 
 BUILD_DIR=$PWD/$(dirname $0)
+source $BUILD_DIR/current_version.sh
 
 if [ "$1" = "" ]; then
@@ -27 +28 @@
 
 if [ "$2" = "" ]; then
-  mode=release
+  mode=Release
 else
   mode=$2
 fi
-if !([ "$mode" = "release" ] || [ "$mode" = "debug" ]); then
-  echo "(!) Second argument should be: release, debug or should be avoided." 
+if !([ "$mode" = "Release" ] || [ "$mode" = "Debug" ]); then
+  echo "(!) Second argument should be: Release, Debug or should be avoided." 
   exit
 fi
 suffix=-$mode
-if [ "$mode" = "release" ]; then
+if [ "$mode" = "Release" ]; then
   suffix=
 fi
@@ -62 +63 @@
 if [ "$answer" = "y" ]; then
   if [ "$project" = "tol" ]; then 
-    cmake $PROJECT_DIR -DCMAKE_BUILD_TYPE=$mode -DCLAPACK_NAME=lapacke -DZIPARCHIVE_ROOT_DIR=/usr/local/ZipArchive$suffix -DZIPARCHIVE_AS_STATIC=TRUE -DCMAKE_INSTALL_PREFIX=/usr/local/tol3.2$suffix
+    cmake $PROJECT_DIR -DCMAKE_BUILD_TYPE=$mode -DCLAPACK_NAME=lapacke -DZIPARCHIVE_ROOT_DIR=/usr/local/ZipArchive$suffix -DZIPARCHIVE_AS_STATIC=TRUE -DCMAKE_INSTALL_PREFIX=/usr/local/tol$version$suffix
   else
-    cmake $PROJECT_DIR -DCMAKE_BUILD_TYPE=$mode -DTOL_PREFIX_PATH=/usr/local/tol3.2$suffix -DCMAKE_INSTALL_PREFIX=/usr/local/tol3.2$suffix
+    cmake $PROJECT_DIR -DCMAKE_BUILD_TYPE=$mode -DTOL_PREFIX_PATH=/usr/local/tol$version$suffix -DCMAKE_INSTALL_PREFIX=/usr/local/tol$version$suffix
   fi  
 fi