Changeset be65acb in tol


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
Files:
1 added
8 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

  • building/MinGW/build.bat

    r2c66570 rbe65acb  
    22rem ************************************************************
    33rem  La llamada al script recibe dos argumentos:
    4 rem    build [tol|toltcl|tolbase|rtol] [|release|debug]
     4rem    build [tol|toltcl|tolbase|rtol] [|Release|Debug]
    55rem ************************************************************
    66rem  Durante el proceso se pregunta por cada una de las etapas.
    … …  
    5252
    5353set mode=%2
    54 if "!mode!"=="" set mode=release
    55 if "!mode!"=="release" goto mode_ok
    56 if "!mode!"=="debug" goto mode_ok
    57 echo.^(^^!^) Second argument should be: release, debug or should be avoided.
     54if "!mode!"=="" set mode=Release
     55if "!mode!"=="Release" goto mode_ok
     56if "!mode!"=="Debug" goto mode_ok
     57echo.^(^^!^) Second argument should be: Release, Debug or should be avoided.
    5858exit /b
    5959:mode_ok

  • building/MinGW/build_installer.bat

    r2c66570 rbe65acb  
    3232)
    3333
    34 set TRUNK_DIR=!BUILD_DIR!\..\..
    35 if not exist "!TRUNK_DIR!" (
    36   echo.^(^^!^) Cannot find folder: !TRUNK_DIR!
     34set INSTALL_DIR=!BUILD_DIR!\..\..\installer
     35if not exist "!INSTALL_DIR!" (
     36  echo.^(^^!^) Cannot find folder: !INSTALL_DIR!
    3737  exit /b
    3838)
    3939
    40 set mode=release
     40set mode=Release
     41
     42echo.
     43set /p answer="include tolbase? (y/n) "
     44if "!answer!"=="y" (
     45  set cmake_opt_tolbase=-DINCLUDE_TOLBASE=ON
     46) else (
     47  set cmake_opt_tolbase=-DINCLUDE_TOLBASE=OFF
     48)
    4149
    4250echo.
    … …  
    5967cd "!CMAKE_DIR!"
    6068
    61 rem set init_dir=%CD%
    62 rem set tolp_trunk=%tolp_root%\trunk
    63 rem echo.  tolp_trunk=%tolp_trunk%
    64 rem
    65 rem set installer_dir=%tolp_trunk%\building\MinGW_32\installer%
    66 rem echo.  installer_dir=%installer_dir%
    67 rem
    68 rem if exist "%installer_dir%" (
    69 rem   echo./!\ There is already a built folder of the installer
    70 rem   set is_built=y
    71 rem ) else (
    72 rem   set is_built=n
    73 rem )
    74 rem
    75 rem echo.
    76 rem set /p cont="continue? (y/n) "
    77 rem if "%cont%"=="y" GOTO continue_ok
    78 rem exit /b
    79 rem :continue_ok
    80 
    81 rem echo.
    82 rem set /p cont="mkdir? (y/n) "
    83 rem if "%cont%"=="n" GOTO skip_mkdir
    84 rem cd "%tolp_trunk%"
    85 rem if "%is_built%"=="y" rmdir /S /Q "%installer_dir%"
    86 rem mkdir "%installer_dir%"
    87 rem :skip_mkdir
    88 rem
    89 rem cd "%installer_dir%"
    90 
    9169echo.
    9270set /p answer="cmake? (y/n) "
    9371if "!answer!"=="y" (
    9472  set TOL_RUNTIME=!USERPROFILE!\CMake_Build\tol\!mode!-!platform!\Runtime_Base
    95   cmake -DTOL_RUNTIME_DIR=!TOL_RUNTIME! -DCMAKE_BUILD_TYPE=!mode! -G"CodeLite - MinGW Makefiles" "!TRUNK_DIR!"
     73  cmake !cmake_opt_tolbase! -DTOL_PLATFORM=!platform! -DTOL_RUNTIME_DIR=!TOL_RUNTIME! -DCMAKE_BUILD_TYPE=!mode! -G"CodeLite - MinGW Makefiles" "!INSTALL_DIR!"
    9674)
    9775

  • building/MinGW/build_package.bat

    r2c66570 rbe65acb  
    22rem ************************************************************
    33rem  La llamada al script recibe dos argumentos:
    4 rem    build_package [|<package_name>] [|release|debug]
     4rem    build_package [|<package_name>] [|Release|Debug]
    55rem ************************************************************
    66rem  Durante el proceso se pregunta por cada una de las etapas.
    … …  
    4949
    5050set mode=%2
    51 if "!mode!"=="" set mode=release
    52 if "!mode!"=="release" goto mode_ok
    53 if "!mode!"=="debug" goto mode_ok
    54 echo.^(^^!^) Second argument should be: release, debug or should be avoided.
     51if "!mode!"=="" set mode=Release
     52if "!mode!"=="Release" goto mode_ok
     53if "!mode!"=="Debug" goto mode_ok
     54echo.^(^^!^) Second argument should be: Release, Debug or should be avoided.
    5555exit /b
    5656:mode_ok
Note: See TracChangeset for help on using the changeset viewer.