Changeset 2a0a3cd in tol

Timestamp:

Dec 15, 2015, 10:23:27 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

ada6d64

Parents:

f70f6bc

Message:

Refs #1880
Revisiones de los scripts

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

Location:

building

Files:

• Linux/build.sh (modified) (2 diffs)
• Linux/build_contrib.sh (modified) (3 diffs)
• Linux/build_installer.sh (modified) (1 diff)
• Linux/build_package.sh (modified) (1 diff)
• Linux/produce_package.sh (modified) (3 diffs)
• MinGW/produce_package.bat (added)

building/Linux/build.sh

@@ -21 +21 @@
 
 PROJECT_DIR=$BUILD_DIR/../../$project
-if ![ -d "$PROJECT_DIR" ]; then 
+if ! [ -d "$PROJECT_DIR" ]; then 
   echo "(!) Cannot find folder: $PROJECT_DIR"
   exit
@@ -62 +62 @@
 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/tol3.2$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

building/Linux/build_contrib.sh

@@ -19 +19 @@
 if ! [ -d "$CONTRIB_DIR" ]; then 
   echo "(!) Cannot find the contrib $contrib."
-  echo -n "press enter to exit "
-  read answer
   exit
 fi
@@ -31 +29 @@
 if !([ "$mode" = "release" ] || [ "$mode" = "debug" ]); then
   echo "(!) Second argument should be: release, debug or should be avoided."
-  echo -n "press enter to exit "
-  read answer  
   exit
 fi
@@ -78 +74 @@
   sudo make install
 fi
-
-echo -n "press enter to continue "
-read answer

building/Linux/build_installer.sh

@@ -10 +10 @@
 
 TRUNK_DIR=$BUILD_DIR/../..
-if ![ -d "$TRUNK_DIR" ]; then 
+if ! [ -d "$TRUNK_DIR" ]; then 
   echo "(!) Cannot find folder: $TRUNK_DIR"
   exit

building/Linux/build_package.sh

@@ -17 +17 @@
 
 PACKAGE_DIR=$BUILD_DIR/../../../OfficialTolArchiveNetwork/$package
-if ![ -f "$PACKAGE_DIR/CMakeLists.txt" ]; then 
+if ! [ -f "$PACKAGE_DIR/CMakeLists.txt" ]; then 
   if [ -d "$PACKAGE_DIR" ]; then 
     echo "(!) Cannot find the CMakeLists.txt"

building/Linux/produce_package.sh

@@ -1 +1 @@
 #!/bin/bash
-#*********************************************************
+#************************************************************
 # La llamada al script recibe un argumento:
 #   ./produce_package.sh [|<package_name>]
-#*********************************************************
+#************************************************************
 # Durante el proceso se pregunta por cada una de las etapas.
+#************************************************************
 
 BUILD_DIR=$PWD/$(dirname $0)
@@ -35 +36 @@
     fi
   else
-    echo "The package '$package' does not containt binary files."
+    echo "/!\ The package $package has not a CMakeLists.txt."
   fi
 else
   echo "(!) Cannot find the package $package."
-  echo -n "press enter to exit "
-  read answer
   exit
 fi
@@ -49 +48 @@
   tolsh -c"Text Package=\"$package\"" ../produce_package.tol
 fi
-
-echo -n "press enter to continue "
-read answer