ChangeLogTag: Mon Oct 10 07:02:30 2005 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 43 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 414cff17..453bb35c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,36 +1,52 @@
+Mon Oct 10 07:02:30 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/TemplateParser.pm:
+
+          Fixed a bug where mixed case template variables within a foreach
+          context were not being evaluated case insensitively.  This made it
+          appear that these variables were not being set.
+
+        * templates/vc8.mpd:
+
+          Moved an endif to the correct location pertaining to precompiled
+          headers.  Too much was being included within an if which depended
+          upon the pch_header setting.
+
+          Thanks to Thomas Rothfuss for reporting both of these bugs.
+
 Fri Oct  7 13:50:49 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* modules/AutomakeWorkspaceCreator.pm:
+        * modules/AutomakeWorkspaceCreator.pm:
 
-	  Change the way RCS/CVS Id is emitted so it's the same as how it
-	  is expanded in souces checked out with -kk option.  This allows
-	  us to regenerate ACE and TAO's Makefile.am files and only see
-	  the "real" differences.
+          Change the way RCS/CVS Id is emitted so it's the same as how it
+          is expanded in souces checked out with -kk option.  This allows
+          us to regenerate ACE and TAO's Makefile.am files and only see
+          the "real" differences.
 
 Fri Oct  7 09:33:41 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* templates/automake.mpd:
+        * templates/automake.mpd:
 
-	  Add support for custom file dependents.
+          Add support for custom file dependents.
 
 Thu Oct  6 17:52:41 2005  Steve Huston  <shuston@riverace.com>
 
-	* templates/vc8.mpd:
-	* templates/vc8dll.mpt:
-	* templates/vc8exe.mpt:
-	* templates/vc8lib.mpt:
-	* templates/vc8libexe.mpt:
-	* templates/vc8platforms.mpt (new file):
-	  Added support for building Windows CE/Mobile from Visual Studio 2005.
-	  By default, only the regular desktop Win32 configurations will be
-	  generated, as before. The CE/mobile platform names can be specified
-	  using -value_templates platforms="....". The possible platform
-	  names are listed in vc8platforms.mpt.
-
-	  To avoid overwriting outputs when building multiple platforms in
-	  the same ACE_wrappers directory, a platform can supply an
-	  output_subdir setting (see vc8platforms.mpt). If specified, vc8.mpd
-	  will use this in the Intermediate/OutputDirectory entries.
+        * templates/vc8.mpd:
+        * templates/vc8dll.mpt:
+        * templates/vc8exe.mpt:
+        * templates/vc8lib.mpt:
+        * templates/vc8libexe.mpt:
+        * templates/vc8platforms.mpt (new file):
+          Added support for building Windows CE/Mobile from Visual Studio 2005.
+          By default, only the regular desktop Win32 configurations will be
+          generated, as before. The CE/mobile platform names can be specified
+          using -value_templates platforms="....". The possible platform
+          names are listed in vc8platforms.mpt.
+
+          To avoid overwriting outputs when building multiple platforms in
+          the same ACE_wrappers directory, a platform can supply an
+          output_subdir setting (see vc8platforms.mpt). If specified, vc8.mpd
+          will use this in the Intermediate/OutputDirectory entries.
 
 Tue Oct  4 06:35:13 2005  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index 1f57e6d1..be79ba21 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -232,6 +232,9 @@ sub get_value {
   my($sname)   = undef;
   my($adjust)  = 1;
 
+  ## $name should always be all lower-case
+  $name = lc($name);
+
   ## First, check the temporary scope (set inside a foreach)
   if ($counter >= 0) {
     ## Find the outer most scope for our variable name
diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index 2cb2c68b..dc06973d 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -151,15 +151,12 @@
 				OpenMP="<%OpenMP%>"
 <%endif%>
 <%if(pch_header)%>
-<%if(pch_source)%>
-				UsePrecompiledHeader="2"
-<%else%>
 				UsePrecompiledHeader="2"
-<%endif%>
 				PrecompiledHeaderThrough="<%pch_header%>"
 <%if(PrecompiledHeaderFile)%>
 				PrecompiledHeaderFile="<%PrecompiledHeaderFile%>"
 <%endif%>
+<%endif%>
 <%if(ExpandAttributedSource)%>
 				ExpandAttributedSource="<%ExpandAttributedSource%>"
 <%endif%>
@@ -191,7 +188,6 @@
 <%if(BrowseInformationFile)%>
 				BrowseInformationFile="<%BrowseInformationFile%>"
 <%endif%>
-<%endif%>
 				WarningLevel="<%warning_level("3")%>"
 <%if(WarnAsError)%>
 				WarnAsError="<%WarnAsError%>"