Merge-out from trunk in preparation for merge-back.eclipse

7 files changed, 62 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 282ed39a..da2b7fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+Wed Aug  4 15:03:50 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * templates/vc10.mpd:
+        * templates/vc10dll.mpt:
+        * templates/vc10exe.mpt:
+        * templates/vc10lib.mpt:
+        * templates/vc10libexe.mpt:
+
+          Default GenerateDebugInformation to "true", Release configurations
+          will override it to "false".  Use the value of the
+          GenerateDebugInformation variable in the template.
+
+Mon Aug  2 15:24:10 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * templates/vc10.mpd:
+        * templates/vc10filters.mpd:
+
+          Use <CustomBuild> instead of <CustomBuildStep> for custom actions
+          that apply to individual input files (as opposed to the custom
+          actions that apply to the project).
+
+Tue Jul 27 15:40:16 UTC 2010  Chris Cleeland  <cleeland@ociweb.com>
+
+        * templates/cdt6cproject.mpd: Added missing space between thread
+        flags and pic flags.
+
+Wed Jul 21 20:34:03 UTC 2010  Chris Cleeland  <cleeland@ociweb.com>
+
+        Merge out the following changes from the eclipse branch:
+
+        * templates/cdt6cproject.mpd:
+        * templates/cdt6dll.mpt:
+        * templates/cdt6platforms.mpt:
+
+          Initial work for supporting a cross-compile platform. Fix for RT
+          14228 related to the lack of -fPIC option.
+
+        * templates/cdt6cproject.mpd, templates/cdt6platforms.mpt:
+
+          Fixed issue where linker exe names could not be overridden.
+
+        * docs/html/CDT6.html:
+
+          Update documentation.
+
 Wed Jul 14 05:00:11 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
 
         * config/wix.mpb:
diff --git a/templates/vc10.mpd b/templates/vc10.mpd
index 48b8d275..b1b96f5c 100644
--- a/templates/vc10.mpd
+++ b/templates/vc10.mpd
@@ -383,7 +383,7 @@
       <SubSystem><%SubSystem%></SubSystem>
 <%endif%>
 <%if(GenerateDebugInformation)%>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation><%GenerateDebugInformation%></GenerateDebugInformation>
 <%endif%>
       <AdditionalDependencies><%foreach(reverse(libs))%><%libname_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>;<%endfor%><%foreach(reverse(lit_libs))%><%lit_lib%>.lib;<%endfor%><%foreach(reverse(pure_libs))%> <%pure_lib%>;<%endfor%>%(AdditionalDependencies)</AdditionalDependencies>
 <%if(exename || sharedname || staticname)%>
@@ -768,7 +768,7 @@
   <ItemGroup>
 <%foreach(custom_type->input_files)%>
 <%if(custom_type->input_file->output_files)%>
-    <CustomBuildStep Include="<%custom_type->input_file%>">
+    <CustomBuild Include="<%custom_type->input_file%>">
 <%foreach(configurations)%>
 <%foreach(platforms)%>
       <Command Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(custom_type->libpath)%>PATH=%PATH%;<%custom_type->libpath%>&#x0D;&#x0A;<%endif%><%if(flag_overrides(custom_type->input_file, gendir))%>if not exist <%flag_overrides(custom_type->input_file, gendir)%> mkdir <%flag_overrides(custom_type->input_file, gendir)%>&#x0D;&#x0A;<%endif%><%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%if(custom_type->output_option)%>&quot;<%custom_type->input_file%>&quot; <%custom_type->output_option%><%foreach(custom_type->input_file->output_files)%> &quot;<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>&quot;<%endfor%><%else%>&quot;<%custom_type->input_file%>&quot;<%endif%><%if(flag_overrides(custom_type->input_file, postcommand))%><%foreach(custom_type->input_file)%> &amp;&amp; <%flag_overrides(custom_type->input_file, postcommand)%><%endfor%><%else%><%if(custom_type->postcommand)%><%foreach(custom_type->input_file)%> &amp;&amp; <%custom_type->postcommand%><%endfor%><%endif%><%endif%><%if(pch_header)%><%if(custom_type->pch_postrule)%><%foreach(custom_type->input_file->source_output_files)%> &amp;&amp; echo #include &quot;<%pch_header%>&quot; &gt; temporary.src &amp;&amp; type &quot;<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>&quot; &gt;&gt; temporary.src &amp;&amp; move /y temporary.src &quot;<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>&quot;<%endfor%><%endif%><%endif%></Command>
@@ -787,7 +787,7 @@
 <%endif%>
 <%endfor%>
 <%endfor%>
-    </CustomBuildStep>
+    </CustomBuild>
 <%else%>
     <None Include="<%custom_type->input_file%>">
 <%foreach(configurations)%>
@@ -811,14 +811,14 @@
 <%if(documentation_files)%>
   <ItemGroup>
 <%foreach(documentation_files)%>
-    <CustomBuildStep Include="<%documentation_file%>">
+    <CustomBuild Include="<%documentation_file%>">
       <FileType>Document</FileType>
 <%foreach(configurations)%>
 <%foreach(platforms)%>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'">true</ExcludedFromBuild>
 <%endfor%>
 <%endfor%>
-    </CustomBuildStep>
+    </CustomBuild>
 <%endfor%>
   </ItemGroup>
 <%endif%>
@@ -832,4 +832,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/templates/vc10dll.mpt b/templates/vc10dll.mpt
index e6fe1543..39597b02 100644
--- a/templates/vc10dll.mpt
+++ b/templates/vc10dll.mpt
@@ -8,6 +8,7 @@ configurations     = Debug Release
 common_defines     = WIN32 _WINDOWS _CRT_NONSTDC_NO_WARNINGS
 ConfigurationType  = 2
 MinimalRebuild     = false
+GenerateDebugInformation = true
 
 conditional_include "vc8platforms"
 
diff --git a/templates/vc10exe.mpt b/templates/vc10exe.mpt
index 58fad9a0..8f551293 100644
--- a/templates/vc10exe.mpt
+++ b/templates/vc10exe.mpt
@@ -9,6 +9,7 @@ common_defines     = WIN32 _CONSOLE _CRT_NONSTDC_NO_WARNINGS
 ConfigurationType  = 1
 SubSystem          = Console
 MinimalRebuild     = false
+GenerateDebugInformation = true
 
 conditional_include "vc8platforms"
 
diff --git a/templates/vc10filters.mpd b/templates/vc10filters.mpd
index 89ccef4b..2d7e8c61 100644
--- a/templates/vc10filters.mpd
+++ b/templates/vc10filters.mpd
@@ -149,9 +149,9 @@
   <ItemGroup>
 <%foreach(custom_type->input_files)%>
 <%if(custom_type->input_file->output_files)%>
-    <CustomBuildStep Include="<%custom_type->input_file%>">
+    <CustomBuild Include="<%custom_type->input_file%>">
       <Filter><%ucw(custom_type)%></Filter>
-    </CustomBuildStep>
+    </CustomBuild>
 <%else%>
     <None Include="<%custom_type->input_file%>">
       <Filter><%ucw(custom_type)%></Filter>
@@ -204,16 +204,16 @@
 <%if(grouped_documentation_files)%>
 <%foreach(sort(grouped_documentation_files))%>
 <%foreach(grouped_documentation_file->files)%>
-    <CustomBuildStep Include="<%grouped_documentation_file->file%>">
+    <CustomBuild Include="<%grouped_documentation_file->file%>">
       <Filter><%grouped_documentation_file%></Filter>
-    </CustomBuildStep>
+    </CustomBuild>
 <%endfor%>
 <%endfor%>
 <%else%>
 <%foreach(documentation_files)%>
-    <CustomBuildStep Include="<%documentation_file%>">
+    <CustomBuild Include="<%documentation_file%>">
       <Filter>Documentation</Filter>
-    </CustomBuildStep>
+    </CustomBuild>
 <%endfor%>
 <%endif%>
   </ItemGroup>
@@ -237,4 +237,4 @@
 <%endif%>
   </ItemGroup>
 <%endif%>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/templates/vc10lib.mpt b/templates/vc10lib.mpt
index a6ee4f60..ff187bf0 100644
--- a/templates/vc10lib.mpt
+++ b/templates/vc10lib.mpt
@@ -8,6 +8,7 @@ configurations     = Debug Release
 common_defines     = WIN32 _WINDOWS _CRT_NONSTDC_NO_WARNINGS
 ConfigurationType  = 4
 MinimalRebuild     = false
+GenerateDebugInformation = true
 
 conditional_include "vc10platforms"
 
diff --git a/templates/vc10libexe.mpt b/templates/vc10libexe.mpt
index d82855a4..d44a120a 100644
--- a/templates/vc10libexe.mpt
+++ b/templates/vc10libexe.mpt
@@ -9,6 +9,7 @@ common_defines     = WIN32 _CONSOLE _CRT_NONSTDC_NO_WARNINGS
 ConfigurationType  = 1
 SubSystem          = Console
 MinimalRebuild     = false
+GenerateDebugInformation = true
 
 conditional_include "vc10platforms"