From c24a59deffcda5498ff73003d58130592f142c25 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Wed, 30 Dec 2009 23:07:15 +0000
Subject: [PATCH] Added a few files for the windows debug compile, which now
 uses _d libraries.

---
 win32/vc9/clib/clib.vcproj         |  1 +
 win32/vc9/ctmatlab/buildmlab_d.cmd |  3 +++
 win32/vc9/ctmatlab/ctmatlab.vcproj |  3 ++-
 win32/vc9/ctmatlab/runmlab.cmd     |  4 ++++
 win32/vc9/ctpython/ctpython.vcproj |  4 ++--
 win32/vc9/ctpython/runpython_d.cmd |  8 ++++++++
 win32/vc9/oneD/docopy.cmd          |  5 ++++-
 win32/vc9/oneD/oneD.vcproj         | 11 +++++++++++
 win32/vc9/thermo/docopy.cmd        |  2 +-
 win32/vc9/thermo/thermo.vcproj     |  2 +-
 win32/vc9/transport/docopy.cmd     |  4 +++-
 win32/vc9/zeroD/docopy.cmd         |  4 ++--
 12 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100755 win32/vc9/ctmatlab/buildmlab_d.cmd
 create mode 100755 win32/vc9/ctpython/runpython_d.cmd

diff --git a/win32/vc9/clib/clib.vcproj b/win32/vc9/clib/clib.vcproj
index 62eb9a97b..fa7698465 100755
--- a/win32/vc9/clib/clib.vcproj
+++ b/win32/vc9/clib/clib.vcproj
@@ -71,6 +71,7 @@
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 			/>
diff --git a/win32/vc9/ctmatlab/buildmlab_d.cmd b/win32/vc9/ctmatlab/buildmlab_d.cmd
new file mode 100755
index 000000000..3919da07a
--- /dev/null
+++ b/win32/vc9/ctmatlab/buildmlab_d.cmd
@@ -0,0 +1,3 @@
+cd ..\..\..\Cantera\matlab
+%PYTHON_CMD% setup_winmatlab_d.py build
+
diff --git a/win32/vc9/ctmatlab/ctmatlab.vcproj b/win32/vc9/ctmatlab/ctmatlab.vcproj
index 0467cb072..f89669137 100755
--- a/win32/vc9/ctmatlab/ctmatlab.vcproj
+++ b/win32/vc9/ctmatlab/ctmatlab.vcproj
@@ -27,7 +27,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cmd /c buildmlab.cmd"
+				Description="running a python script to create the matlab build environment"
+				CommandLine="cmd /c buildmlab_d.cmd"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/win32/vc9/ctmatlab/runmlab.cmd b/win32/vc9/ctmatlab/runmlab.cmd
index 0ed302e73..d2b774ba2 100755
--- a/win32/vc9/ctmatlab/runmlab.cmd
+++ b/win32/vc9/ctmatlab/runmlab.cmd
@@ -1,3 +1,7 @@
 cd ..\..\..\Cantera\matlab
 "%MATLAB_CMD%" -nodisplay -nosplash -nojvm -r setup
+
 echo 'ok' > status
+
+more 
+
diff --git a/win32/vc9/ctpython/ctpython.vcproj b/win32/vc9/ctpython/ctpython.vcproj
index 8180924e4..9215c0e44 100755
--- a/win32/vc9/ctpython/ctpython.vcproj
+++ b/win32/vc9/ctpython/ctpython.vcproj
@@ -27,8 +27,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="run runpython.cmd"
-				CommandLine="cmd /c runpython.cmd"
+				Description="run runpython_d.cmd"
+				CommandLine="cmd /c runpython_d.cmd"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/win32/vc9/ctpython/runpython_d.cmd b/win32/vc9/ctpython/runpython_d.cmd
new file mode 100755
index 000000000..a10deeddf
--- /dev/null
+++ b/win32/vc9/ctpython/runpython_d.cmd
@@ -0,0 +1,8 @@
+cd ..\..\..\Cantera\python
+%PYTHON_CMD% winsetup.py build
+copy ..\..\build\lib\i686-pc-win32\clib_d.dll build\lib.win32-2.6\Cantera
+copy ..\..\build\lib\i686-pc-win32\clib_d.exp build\lib.win32-2.6\Cantera
+copy ..\..\build\lib\i686-pc-win32\clib_d.lib build\lib.win32-2.6\Cantera
+%PYTHON_CMD% winsetup_d.py bdist_wininst
+%PYTHON_CMD% winsetup_d.py install
+echo 'ok' > status
diff --git a/win32/vc9/oneD/docopy.cmd b/win32/vc9/oneD/docopy.cmd
index b97b5ebd9..399accdd6 100755
--- a/win32/vc9/oneD/docopy.cmd
+++ b/win32/vc9/oneD/docopy.cmd
@@ -4,6 +4,7 @@ if not exist build\include\cantera\kernel mkdir build\include\cantera\kernel
 
 cd Cantera\src\oneD
 
+echo on
 copy Domain1D.h  ..\..\..\build\include\cantera\kernel
 copy Inlet1D.h  ..\..\..\build\include\cantera\kernel
 copy MultiJac.h  ..\..\..\build\include\cantera\kernel
@@ -12,8 +13,10 @@ copy OneDim.h  ..\..\..\build\include\cantera\kernel
 copy refine.h  ..\..\..\build\include\cantera\kernel
 copy Resid1D.h  ..\..\..\build\include\cantera\kernel
 copy Sim1D.h  ..\..\..\build\include\cantera\kernel
+copy Solid1D.h  ..\..\..\build\include\cantera\kernel
 copy StFlow.h  ..\..\..\build\include\cantera\kernel
 copy Surf1D.h  ..\..\..\build\include\cantera\kernel
+echo off
 
 cd ..\..\..\win32\vc9\oneD
-echo 'ok' > status
+echo 'ok'  > status.tmp
diff --git a/win32/vc9/oneD/oneD.vcproj b/win32/vc9/oneD/oneD.vcproj
index cb3be2e93..4b33cc0f9 100755
--- a/win32/vc9/oneD/oneD.vcproj
+++ b/win32/vc9/oneD/oneD.vcproj
@@ -29,6 +29,7 @@
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				Outputs="status"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -80,6 +81,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="copying include files to the cantera kernel directory"
+				CommandLine="cmd /c docopy.cmd &gt; docopy.out  &#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -143,6 +146,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="copying include files to the cantera/kernel directory"
+				CommandLine="cmd /c docopy.cmd &gt; status&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -209,6 +214,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="copying include files to the cantera/kernel directory"
+				CommandLine="cmd /c docopy.cmd &gt; status&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -308,6 +315,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath=".\status"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/win32/vc9/thermo/docopy.cmd b/win32/vc9/thermo/docopy.cmd
index d869b9611..ac58dfa5b 100755
--- a/win32/vc9/thermo/docopy.cmd
+++ b/win32/vc9/thermo/docopy.cmd
@@ -73,4 +73,4 @@ copy WaterSSTP.h          ..\..\..\build\include\cantera\kernel
 
 cd ..\..\..\win32\vc9\thermo
 echo off
-echo 'ok'
+echo 'ok' > status.tmp
diff --git a/win32/vc9/thermo/thermo.vcproj b/win32/vc9/thermo/thermo.vcproj
index bd434fd0a..844cb1086 100755
--- a/win32/vc9/thermo/thermo.vcproj
+++ b/win32/vc9/thermo/thermo.vcproj
@@ -79,7 +79,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copying include files to cantera/kernel directory"
-				CommandLine="cmd  /c docopy.cmd &gt;status&#x0D;&#x0A;"
+				CommandLine="cmd  /c docopy.cmd &gt; docopy.out &#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
diff --git a/win32/vc9/transport/docopy.cmd b/win32/vc9/transport/docopy.cmd
index 2f2f243e0..c2f621c2d 100755
--- a/win32/vc9/transport/docopy.cmd
+++ b/win32/vc9/transport/docopy.cmd
@@ -1,3 +1,4 @@
+echo on
 cd ..\..\..\
 
 if not exist build\include\cantera\kernel mkdir build\include\cantera\kernel
@@ -19,4 +20,5 @@ copy TransportFactory.h    ..\..\..\build\include\cantera\kernel
 copy TransportParams.h    ..\..\..\build\include\cantera\kernel
 
 cd ..\..\..\win32\vc9\transp~1
-echo 'ok' > status
+echo off
+echo 'ok'  > status
diff --git a/win32/vc9/zeroD/docopy.cmd b/win32/vc9/zeroD/docopy.cmd
index 25bd85161..71e78dcf7 100755
--- a/win32/vc9/zeroD/docopy.cmd
+++ b/win32/vc9/zeroD/docopy.cmd
@@ -1,4 +1,4 @@
-# echo on
+REM echo on
 cd ..\..\..\
 
 if not exist build\include\cantera\kernel mkdir build\include\cantera\kernel
@@ -18,5 +18,5 @@ copy Reservoir.h ..\..\..\build\include\cantera\kernel
 copy Wall.h ..\..\..\build\include\cantera\kernel
 
 cd ..\..\..\win32\vc9\zeroD
-# echo off
+REM echo off
 echo 'ok'