ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 05:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

* Name the default installation folder based on the following pattern for both Netgen and Nglib:

Browse Source 
- netgen-inst<NoOCC/OCC>_<Win32/x64>
   - nglib-inst<NoOCC/OCC>_<Win32/x64>

* This change simplifies Visual C++ Batch Builds and Nullsoft Installer Scripts
This commit is contained in:
Philippose Rajan 2010-03-21 21:00:17 +00:00
parent 00d8c320ff
commit 026ae6b625
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
windows/postBuild_netgen.bat
View File

@ -20,12 +20,17 @@ set LIB_NAME=%~6
REM *** Change these Folders if required *** REM *** Change these Folders if required ***
REM Check if the environment variable NETGENDIR exists, REM Check if the environment variable NETGENDIR exists,
REM and use it as the installation folder REM and use it as the installation folder
set W_WO_OCC=%BUILD_TYPE:~-4,3%
if defined NETGENDIR ( if defined NETGENDIR (
echo Environment variable NETGENDIR found: %NETGENDIR% echo Environment variable NETGENDIR found: %NETGENDIR%
set INSTALL_FOLDER=%NETGENDIR%\.. set INSTALL_FOLDER=%NETGENDIR%\..
) else ( ) else (
echo Environment variable NETGENDIR not found.... using default location!!! echo Environment variable NETGENDIR not found.... using default location!!!
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-inst_%BUILD_ARCH% if /i "%W_WO_OCC%" == "OCC" (
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-instOCC_%BUILD_ARCH%
) else (
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-instNoOCC_%BUILD_ARCH%
)
) )
set NETGEN_TCLSRC=%PROJ_DIR%..\ng set NETGEN_TCLSRC=%PROJ_DIR%..\ng

7
windows/postBuild_nglib.bat
View File

@ -19,12 +19,17 @@ set PROJ_DIR=%~5
REM *** Change these Folders if required *** REM *** Change these Folders if required ***
REM Check if the environment variable NETGENDIR exists, REM Check if the environment variable NETGENDIR exists,
REM and use it as the installation folder REM and use it as the installation folder
set W_WO_OCC=%BUILD_TYPE:~-4,3%
if defined NETGENDIR ( if defined NETGENDIR (
echo Environment variable NETGENDIR found: %NETGENDIR% echo Environment variable NETGENDIR found: %NETGENDIR%
set INSTALL_FOLDER=%NETGENDIR%\.. set INSTALL_FOLDER=%NETGENDIR%\..
) else ( ) else (
echo Environment variable NETGENDIR not found.... using default location!!! echo Environment variable NETGENDIR not found.... using default location!!!
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-inst_%BUILD_ARCH% if /i "%W_WO_OCC%" == "OCC" (
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-instOCC_%BUILD_ARCH%
) else (
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-instNoOCC_%BUILD_ARCH%
)
) )
set NGLIB_LIBINC=%PROJ_DIR%..\nglib set NGLIB_LIBINC=%PROJ_DIR%..\nglib