From 026ae6b625185139758824103cf8004a328c2af5 Mon Sep 17 00:00:00 2001 From: Philippose Rajan Date: Sun, 21 Mar 2010 21:00:17 +0000 Subject: [PATCH] * Name the default installation folder based on the following pattern for both Netgen and Nglib: - netgen-inst_ - nglib-inst_ * This change simplifies Visual C++ Batch Builds and Nullsoft Installer Scripts --- windows/postBuild_netgen.bat | 7 ++++++- windows/postBuild_nglib.bat | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/windows/postBuild_netgen.bat b/windows/postBuild_netgen.bat index 2aa85945..b795cbdf 100644 --- a/windows/postBuild_netgen.bat +++ b/windows/postBuild_netgen.bat @@ -20,12 +20,17 @@ set LIB_NAME=%~6 REM *** Change these Folders if required *** REM Check if the environment variable NETGENDIR exists, REM and use it as the installation folder +set W_WO_OCC=%BUILD_TYPE:~-4,3% if defined NETGENDIR ( echo Environment variable NETGENDIR found: %NETGENDIR% set INSTALL_FOLDER=%NETGENDIR%\.. ) else ( 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 diff --git a/windows/postBuild_nglib.bat b/windows/postBuild_nglib.bat index ed5c0009..67cdd3ee 100644 --- a/windows/postBuild_nglib.bat +++ b/windows/postBuild_nglib.bat @@ -19,12 +19,17 @@ set PROJ_DIR=%~5 REM *** Change these Folders if required *** REM Check if the environment variable NETGENDIR exists, REM and use it as the installation folder +set W_WO_OCC=%BUILD_TYPE:~-4,3% if defined NETGENDIR ( echo Environment variable NETGENDIR found: %NETGENDIR% set INSTALL_FOLDER=%NETGENDIR%\.. ) else ( 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