Changeset be65acb in tol for building/MinGW

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/MinGW

Files:

• build.bat (modified) (2 diffs)
• build_installer.bat (modified) (2 diffs)
• build_package.bat (modified) (2 diffs)

building/MinGW/build.bat

@@ -2 +2 @@
 rem ************************************************************
 rem  La llamada al script recibe dos argumentos:
-rem    build [tol|toltcl|tolbase|rtol] [|release|debug]
+rem    build [tol|toltcl|tolbase|rtol] [|Release|Debug]
 rem ************************************************************
 rem  Durante el proceso se pregunta por cada una de las etapas.
@@ -52 +52 @@
 
 set mode=%2
-if "!mode!"=="" set mode=release
-if "!mode!"=="release" goto mode_ok
-if "!mode!"=="debug" goto mode_ok
-echo.^(^^!^) Second argument should be: release, debug or should be avoided.
+if "!mode!"=="" set mode=Release
+if "!mode!"=="Release" goto mode_ok
+if "!mode!"=="Debug" goto mode_ok
+echo.^(^^!^) Second argument should be: Release, Debug or should be avoided.
 exit /b
 :mode_ok

building/MinGW/build_installer.bat

@@ -32 +32 @@
 )
 
-set TRUNK_DIR=!BUILD_DIR!\..\..
-if not exist "!TRUNK_DIR!" (
-  echo.^(^^!^) Cannot find folder: !TRUNK_DIR!
+set INSTALL_DIR=!BUILD_DIR!\..\..\installer
+if not exist "!INSTALL_DIR!" (
+  echo.^(^^!^) Cannot find folder: !INSTALL_DIR!
   exit /b
 )
 
-set mode=release
+set mode=Release
+
+echo.
+set /p answer="include tolbase? (y/n) "
+if "!answer!"=="y" (
+  set cmake_opt_tolbase=-DINCLUDE_TOLBASE=ON
+) else (
+  set cmake_opt_tolbase=-DINCLUDE_TOLBASE=OFF
+)
 
 echo.
@@ -59 +67 @@
 cd "!CMAKE_DIR!"
 
-rem set init_dir=%CD%
-rem set tolp_trunk=%tolp_root%\trunk
-rem echo.  tolp_trunk=%tolp_trunk%
-rem 
-rem set installer_dir=%tolp_trunk%\building\MinGW_32\installer%
-rem echo.  installer_dir=%installer_dir%
-rem 
-rem if exist "%installer_dir%" (
-rem   echo./!\ There is already a built folder of the installer
-rem   set is_built=y
-rem ) else (
-rem   set is_built=n
-rem )
-rem 
-rem echo.
-rem set /p cont="continue? (y/n) "
-rem if "%cont%"=="y" GOTO continue_ok
-rem exit /b
-rem :continue_ok
-
-rem echo.
-rem set /p cont="mkdir? (y/n) "
-rem if "%cont%"=="n" GOTO skip_mkdir
-rem cd "%tolp_trunk%"
-rem if "%is_built%"=="y" rmdir /S /Q "%installer_dir%"
-rem mkdir "%installer_dir%"
-rem :skip_mkdir
-rem 
-rem cd "%installer_dir%"
-
 echo.
 set /p answer="cmake? (y/n) "
 if "!answer!"=="y" (
   set TOL_RUNTIME=!USERPROFILE!\CMake_Build\tol\!mode!-!platform!\Runtime_Base
-  cmake -DTOL_RUNTIME_DIR=!TOL_RUNTIME! -DCMAKE_BUILD_TYPE=!mode! -G"CodeLite - MinGW Makefiles" "!TRUNK_DIR!"
+  cmake !cmake_opt_tolbase! -DTOL_PLATFORM=!platform! -DTOL_RUNTIME_DIR=!TOL_RUNTIME! -DCMAKE_BUILD_TYPE=!mode! -G"CodeLite - MinGW Makefiles" "!INSTALL_DIR!"
 )
 

building/MinGW/build_package.bat

@@ -2 +2 @@
 rem ************************************************************
 rem  La llamada al script recibe dos argumentos:
-rem    build_package [|<package_name>] [|release|debug]
+rem    build_package [|<package_name>] [|Release|Debug]
 rem ************************************************************
 rem  Durante el proceso se pregunta por cada una de las etapas.
@@ -49 +49 @@
 
 set mode=%2
-if "!mode!"=="" set mode=release
-if "!mode!"=="release" goto mode_ok
-if "!mode!"=="debug" goto mode_ok
-echo.^(^^!^) Second argument should be: release, debug or should be avoided.
+if "!mode!"=="" set mode=Release
+if "!mode!"=="Release" goto mode_ok
+if "!mode!"=="Debug" goto mode_ok
+echo.^(^^!^) Second argument should be: Release, Debug or should be avoided.
 exit /b
 :mode_ok