Changeset be65acb in tol for building/Linux


Ignore:
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

Location:
building/Linux
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • building/Linux/build.sh

    r2c66570 rbe65acb  
    22#************************************************************
    33# La llamada al script recibe dos argumentos:
    4 #   ./build.sh [tol|toltcl|tolbase|rtol] [|release|debug]
     4#   ./build.sh [tol|toltcl|tolbase|rtol] [|Release|Debug]
    55#************************************************************
    66# Durante el proceso se pregunta por cada una de las etapas.
    … …  
    88
    99BUILD_DIR=$PWD/$(dirname $0)
     10source $BUILD_DIR/current_version.sh
    1011
    1112if [ "$1" = "" ]; then
    … …  
    2728
    2829if [ "$2" = "" ]; then
    29   mode=release
     30  mode=Release
    3031else
    3132  mode=$2
    3233fi
    33 if !([ "$mode" = "release" ] || [ "$mode" = "debug" ]); then
    34   echo "(!) Second argument should be: release, debug or should be avoided."
     34if !([ "$mode" = "Release" ] || [ "$mode" = "Debug" ]); then
     35  echo "(!) Second argument should be: Release, Debug or should be avoided."
    3536  exit
    3637fi
    3738suffix=-$mode
    38 if [ "$mode" = "release" ]; then
     39if [ "$mode" = "Release" ]; then
    3940  suffix=
    4041fi
    … …  
    6263if [ "$answer" = "y" ]; then
    6364  if [ "$project" = "tol" ]; then
    64     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
     65    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
    6566  else
    66     cmake $PROJECT_DIR -DCMAKE_BUILD_TYPE=$mode -DTOL_PREFIX_PATH=/usr/local/tol3.2$suffix -DCMAKE_INSTALL_PREFIX=/usr/local/tol3.2$suffix
     67    cmake $PROJECT_DIR -DCMAKE_BUILD_TYPE=$mode -DTOL_PREFIX_PATH=/usr/local/tol$version$suffix -DCMAKE_INSTALL_PREFIX=/usr/local/tol$version$suffix
    6768  fi 
    6869fi

  • building/Linux/build_contrib.sh

    r2c66570 rbe65acb  
    22#*********************************************************
    33# La llamada al script recibe dos argumentos:
    4 #   ./build_contrib.sh [|<contrib_name>] [|release|debug]
     4#   ./build_contrib.sh [|<contrib_name>] [|Release|Debug]
    55#*********************************************************
    66# Durante el proceso se pregunta por cada una de las etapas.
    … …  
    2323
    2424if [ "$2" = "" ]; then
    25   mode=release
     25  mode=Release
    2626else
    2727  mode=$2
    2828fi
    29 if !([ "$mode" = "release" ] || [ "$mode" = "debug" ]); then
    30   echo "(!) Second argument should be: release, debug or should be avoided."
     29if !([ "$mode" = "Release" ] || [ "$mode" = "Debug" ]); then
     30  echo "(!) Second argument should be: Release, Debug or should be avoided."
    3131  exit
    3232fi
    3333suffix=-$mode
    34 if [ "$mode" = "release" ]; then
     34if [ "$mode" = "Release" ]; then
    3535  suffix=
    3636fi

  • building/Linux/build_installer.sh

    r2c66570 rbe65acb  
    88
    99BUILD_DIR=$PWD/$(dirname $0)
     10source $BUILD_DIR/current_version.sh
    1011
    11 TRUNK_DIR=$BUILD_DIR/../..
    12 if ! [ -d "$TRUNK_DIR" ]; then
    13   echo "(!) Cannot find folder: $TRUNK_DIR"
     12INSTALLER_DIR=$BUILD_DIR/../../installer
     13if ! [ -d "$INSTALLER_DIR" ]; then
     14  echo "(!) Cannot find folder: $INSTALLER_DIR"
    1415  exit
    1516fi
    1617
    17 mode=release
     18mode=Release
    1819
    1920echo "----------------------------------------------------"
    … …  
    3940if [ "$answer" = "y" ]
    4041then
    41   cmake $TRUNK_DIR -DTOL_RUNTIME_DIR=/usr/local/tol3.2 -DCMAKE_BUILD_TYPE=release
     42  cmake $INSTALLER_DIR -DTOL_RUNTIME_DIR=/usr/local/tol$version -DCMAKE_BUILD_TYPE=$mode
    4243fi
    4344

  • building/Linux/build_package.sh

    r2c66570 rbe65acb  
    22#************************************************************
    33# La llamada al script recibe dos argumentos:
    4 #   ./build_package.sh [|<package_name>] [|release|debug]
     4#   ./build_package.sh [|<package_name>] [|Release|Debug]
    55#************************************************************
    66# Durante el proceso se pregunta por cada una de las etapas.
    … …  
    88
    99BUILD_DIR=$PWD/$(dirname $0)
     10source $BUILD_DIR/current_version.sh
    1011
    1112if [ "$1" = "" ]; then
    … …  
    2728
    2829if [ "$2" = "" ]; then
    29   mode=release
     30  mode=Release
    3031else
    3132  mode=$2
    3233fi
    33 if !([ "$mode" = "release" ] || [ "$mode" = "debug" ]); then
    34   echo "(!) Second argument should be: release, debug or should be avoided."
     34if !([ "$mode" = "Release" ] || [ "$mode" = "Debug" ]); then
     35  echo "(!) Second argument should be: Release, Debug or should be avoided."
    3536  exit
    3637fi
    3738suffix=-$mode
    38 if [ "$mode" = "release" ]; then
     39if [ "$mode" = "Release" ]; then
    3940  suffix=
    4041fi
    … …  
    6162read answer
    6263if [ "$answer" = "y" ]; then
    63   cmake $PACKAGE_DIR -DTOL_PREFIX_PATH=/usr/local/tol3.2$suffix -DCMAKE_BUILD_TYPE=$mode
     64  cmake $PACKAGE_DIR -DTOL_PREFIX_PATH=/usr/local/tol$version$suffix -DCMAKE_BUILD_TYPE=$mode
    6465fi
    6566

  • building/Linux/produce_package.sh

    r2c66570 rbe65acb  
    88
    99BUILD_DIR=$PWD/$(dirname $0)
     10source $BUILD_DIR/current_version.sh
    1011
    1112if [ "$1" = "" ]; then
    … …  
    1718
    1819PACKAGE_DIR=$BUILD_DIR/../../../OfficialTolArchiveNetwork/$package
    19 
    2020if [ -d "$PACKAGE_DIR" ]; then
    2121  if [ -f "$PACKAGE_DIR/CMakeLists.txt" ]; then
    … …  
    4646read answer
    4747if [ "$answer" = "y" ]; then
    48   tolsh -c"Text Package=\"$package\"" ../produce_package.tol
     48  /usr/local/tol$version/bin/tolsh.sh -c"Text Package=\"$package\"" ../produce_package.tol
    4949fi
Note: See TracChangeset for help on using the changeset viewer.