From f5dbea25dd816f16cce5e2dbbce75b16660d14b3 Mon Sep 17 00:00:00 2001
From: Philippose Rajan <philippose>
Date: Sun, 15 Feb 2009 20:25:44 +0000
Subject: [PATCH] * Streamlined the directory paths and build processes for the
 netgen Visual C++ builds for consistency and extendability. * Renamed the
 post-build script to allow for a similar script for nglib. * Changed the
 install folder from <Configuration>-inst to <Configuration>-bin.

---
 windows/netgen.vcproj                                | 12 ++++++++----
 windows/netgen_MSVC2005.vcproj                       | 12 ++++++++----
 .../{postBuild_Install.bat => postBuild_netgen.bat}  | 10 +++++++---
 3 files changed, 23 insertions(+), 11 deletions(-)
 rename windows/{postBuild_Install.bat => postBuild_netgen.bat} (78%)

diff --git a/windows/netgen.vcproj b/windows/netgen.vcproj
index 1af9e7cc..f0bed77e 100644
--- a/windows/netgen.vcproj
+++ b/windows/netgen.vcproj
@@ -21,6 +21,7 @@
 			OutputDirectory="Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
+			BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -93,7 +94,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Running POSTBUILD Script...."
-				CommandLine="$(ProjectDir)\postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)"
+				CommandLine="$(ProjectDir)\postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)"
 			/>
 		</Configuration>
 		<Configuration
@@ -101,6 +102,7 @@
 			OutputDirectory="Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
+			BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -178,7 +180,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Running POSTBUILD Script...."
-				CommandLine="$(ProjectDir)\postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)"
+				CommandLine="$(ProjectDir)\postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)"
 			/>
 		</Configuration>
 		<Configuration
@@ -186,6 +188,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -263,7 +266,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Running POSTBUILD Script...."
-				CommandLine="$(ProjectDir)\postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)"
+				CommandLine="$(ProjectDir)\postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)"
 			/>
 		</Configuration>
 		<Configuration
@@ -271,6 +274,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -343,7 +347,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Running POSTBUILD Script...."
-				CommandLine="$(ProjectDir)\postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)"
+				CommandLine="$(ProjectDir)\postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/windows/netgen_MSVC2005.vcproj b/windows/netgen_MSVC2005.vcproj
index b21d0123..92e9f492 100644
--- a/windows/netgen_MSVC2005.vcproj
+++ b/windows/netgen_MSVC2005.vcproj
@@ -20,6 +20,7 @@
 			OutputDirectory="Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
+			BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -94,7 +95,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Running POSTBUILD Script...."
-				CommandLine="$(ProjectDir)\postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)"
+				CommandLine="$(ProjectDir)\postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)"
 			/>
 		</Configuration>
 		<Configuration
@@ -102,6 +103,7 @@
 			OutputDirectory="Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
+			BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -181,7 +183,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Running POSTBUILD Script...."
-				CommandLine="$(ProjectDir)\postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)"
+				CommandLine="$(ProjectDir)\postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)"
 			/>
 		</Configuration>
 		<Configuration
@@ -189,6 +191,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -269,7 +272,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Running POSTBUILD Script...."
-				CommandLine="$(ProjectDir)\postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)"
+				CommandLine="$(ProjectDir)\postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)"
 			/>
 		</Configuration>
 		<Configuration
@@ -277,6 +280,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -351,7 +355,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Running POSTBUILD Script...."
-				CommandLine="$(ProjectDir)\postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)"
+				CommandLine="$(ProjectDir)\postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/windows/postBuild_Install.bat b/windows/postBuild_netgen.bat
similarity index 78%
rename from windows/postBuild_Install.bat
rename to windows/postBuild_netgen.bat
index 5923d2ca..bcd07c33 100644
--- a/windows/postBuild_Install.bat
+++ b/windows/postBuild_netgen.bat
@@ -6,8 +6,8 @@ REM ***
 REM *** Used to perform an "Install" of the generated executable 
 REM *** along with the required *.tcl files
 REM ***
-REM *** Call from Windows using:
-REM *** postBuild_Install.bat $(InputName) $(TargetFileName) $(OutDir) $(ProjectDir)
+REM *** Call from Visual C++ using:
+REM *** postBuild_netgen.bat $(ProjectName) $(TargetFileName) $(ConfigurationName) $(ProjectDir)
 REM *********************************************************************************
 if [%1]==[] goto BuildEventFailed
 set PROJ_NAME=%1
@@ -17,7 +17,7 @@ set PROJ_DIR=%4
 
 REM *** Change these Folders if required ***
 set NETGEN_TCLSRC=%PROJ_DIR%..\ng
-set INSTALL_FOLDER=%PROJ_DIR%%BUILD_TYPE%-inst
+set INSTALL_FOLDER=%PROJ_DIR%%BUILD_TYPE%-bin
 
 echo POSTBUILD Script for %PROJ_NAME% ........
 
@@ -34,6 +34,10 @@ if errorlevel 1 goto BuildEventFailed
 xcopy "%PROJ_DIR%%BUILD_TYPE%\%PROJ_EXEC%" "%INSTALL_FOLDER%" /i /d /y
 if errorlevel 1 goto BuildEventFailed
 
+REM *** Clean up the build directory by deleting the OBJ files ***
+REM echo Deleting the %PROJ_NAME% build folder %PROJ_DIR%%PROJ_NAME% ....
+REM rmdir %PROJ_DIR%%BUILD_TYPE% /s /q
+
 REM *** If there have been no errors so far, we are done ***
 goto BuildEventOK
 :BuildEventFailed