Changeset 4ff8483 in tol

Timestamp:

Dec 11, 2015, 10:42:16 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

8561735

Parents:

a965ab8

Message:

Refs #1880
Se añade el atributo ejecutable a los scripts de Linux.
Se revisan los scripts para dejar sólo dos carpetas: MinGW y Linux.

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

Location:

building

Files:

• Linux/build.sh (modified) (7 diffs, 1 prop)
• Linux/build_contrib.sh (modified) (1 prop)
• Linux/build_installer.sh (modified) (4 diffs, 1 prop)
• Linux/build_package.sh (modified) (7 diffs, 1 prop)
• Linux/produce_package.sh (modified) (1 prop)
• MinGW/build.bat (added)
• MinGW/build_installer.bat (added)
• MinGW/build_package.bat (added)
• MinGW/cmake_prepare.bat (added)
• MinGW/start.bat (added)

building/Linux/build.sh

@@ -1 +1 @@
 #!/bin/bash
-#*********************************************************
+#************************************************************
 # La llamada al script recibe dos argumentos:
 #   ./build.sh [tol|toltcl|tolbase|rtol] [|release|debug]
-#*********************************************************
+#************************************************************
 # Durante el proceso se pregunta por cada una de las etapas.
+#************************************************************
 
 BUILD_DIR=$PWD/$(dirname $0)
@@ -16 +17 @@
 if !([ "$project" = "tol" ] || [ "$project" = "toltcl" ] || [ "$project" = "tolbase" ] || [ "$project" = "rtol" ]); then
   echo "(!) First argument should be: tol, toltcl, tolbase or rtol."
-  echo -n "press enter to exit "
-  read answer
   exit
 fi
 
 PROJECT_DIR=$BUILD_DIR/../../$project
+if ![ -d "$PROJECT_DIR" ]; then 
+  echo "(!) Cannot find folder: $PROJECT_DIR"
+  exit
+fi
 
 if [ "$2" = "" ]; then
@@ -29 +32 @@
 fi
 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  
+  echo "(!) Second argument should be: release, debug or should be avoided." 
   exit
 fi
@@ -39 +40 @@
 fi
 
-CMAKE_DIR=~/CMake_Build/$project/$mode
-
 echo "----------------------------------------------------"
 echo " Building $project - $mode"
 echo "----------------------------------------------------"
 
+CMAKE_DIR=~/CMake_Build/$project/$mode
 if [ -d "$CMAKE_DIR" ]; then
   echo "/!\ There is already a built folder of $project."
@@ -50 +50 @@
   read answer
   if [ "$answer" = "y" ]; then
-    rm -r "$CMAKE_DIR"
+    rm -r -f "$CMAKE_DIR"
     mkdir -p "$CMAKE_DIR"
   fi
@@ -56 +56 @@
   mkdir -p "$CMAKE_DIR"
 fi
-
 cd $CMAKE_DIR
 
@@ -80 +79 @@
   sudo make install
 fi
-
-echo -n "press enter to exit "
-read answer

building/Linux/build_installer.sh

@@ -1 +1 @@
 #!/bin/bash
-#*********************************************************
+#************************************************************
 # La llamada al script no recibe argumentos:
 #   ./build_instaler.sh
-#*********************************************************
+#************************************************************
 # Durante el proceso se pregunta por cada una de las etapas.
+#************************************************************
 
 BUILD_DIR=$PWD/$(dirname $0)
 
 TRUNK_DIR=$BUILD_DIR/../..
+if ![ -d "$TRUNK_DIR" ]; then 
+  echo "(!) Cannot find folder: $TRUNK_DIR"
+  exit
+fi
 
-CMAKE_DIR=~/CMake_Build/installer
+mode=release
 
 echo "----------------------------------------------------"
@@ -16 +21 @@
 echo "----------------------------------------------------"
 
+CMAKE_DIR=~/CMake_Build/installer/$mode
 if [ -d "$CMAKE_DIR" ]; then
   echo "/!\ There is already a built folder of $package."
@@ -27 +33 @@
   mkdir -p "$CMAKE_DIR"
 fi
-
 cd $CMAKE_DIR
 
@@ -50 +55 @@
   cpack -G RPM
 fi
-
-echo -n "press enter to exit "
-read answer

building/Linux/build_package.sh

@@ -1 +1 @@
 #!/bin/bash
-#*********************************************************
+#************************************************************
 # La llamada al script recibe dos argumentos:
 #   ./build_package.sh [|<package_name>] [|release|debug]
-#*********************************************************
+#************************************************************
 # Durante el proceso se pregunta por cada una de las etapas.
+#************************************************************
 
 BUILD_DIR=$PWD/$(dirname $0)
@@ -16 +17 @@
 
 PACKAGE_DIR=$BUILD_DIR/../../../OfficialTolArchiveNetwork/$package
-
 if ![ -f "$PACKAGE_DIR/CMakeLists.txt" ]; then 
   if [ -d "$PACKAGE_DIR" ]; then 
@@ -23 +23 @@
     echo "(!) Cannot find the package $package."
   fi
-  echo -n "press enter to exit "
-  read answer
   exit
 fi
@@ -35 +33 @@
 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
@@ -44 +40 @@
 fi
 
-CMAKE_DIR=~/CMake_Build/package/$package/$mode
-
 echo "----------------------------------------------------"
 echo " Building package $package - $mode"
 echo "----------------------------------------------------"
 
+CMAKE_DIR=~/CMake_Build/packages/$package/$mode
 if [ -d "$CMAKE_DIR" ]; then
   echo "/!\ There is already a built folder of $package."
@@ -61 +56 @@
   mkdir -p "$CMAKE_DIR"
 fi
-
 cd $CMAKE_DIR
 
@@ -75 +69 @@
   make
 fi
-
-echo -n "press enter to continue "
-read answer