diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rwxr-xr-x | clone_build_tree.pl | 1 | ||||
| -rw-r--r-- | templates/vc8.mpd | 18 | ||||
| -rw-r--r-- | templates/vc8dll.mpt | 4 |
4 files changed, 30 insertions, 9 deletions
@@ -1,3 +1,19 @@ +Tue May 17 08:46:33 2005 Chad Elliott <elliott_c@ociweb.com> + + * clone_build_tree.pl: + + Avoid linking patch reject files. + + * templates/vc8.mpd: + + 1) Added vcprojecttype default similar to vc7.mpd. + 2) Changed all occurrances of Optimization to optimize. + 3) Added the 'dependencies' settings as was done for vc7.mpd. + + * templates/vc8dll.mpt: + + Changed all occurrances of Optimization to optimize. + Tue May 17 06:48:59 2005 Chad Elliott <elliott_c@ociweb.com> * modules/VC7ProjectCreator.pm: diff --git a/clone_build_tree.pl b/clone_build_tree.pl index bf0baa04..fc6b7e98 100755 --- a/clone_build_tree.pl +++ b/clone_build_tree.pl @@ -62,6 +62,7 @@ sub findCallback { if ($matches) { $matches &&= (! -l $_ && ! /^core\z/s && + ! /^.*\.rej\z/s && ! /^.*\.state\z/s && ! /^.*\.so\z/s && ! /^.*\.[oa]\z/s && diff --git a/templates/vc8.mpd b/templates/vc8.mpd index 77f774d9..57ac77be 100644 --- a/templates/vc8.mpd +++ b/templates/vc8.mpd @@ -1,6 +1,6 @@ <?xml version="<%xml_version("1.0")%>" encoding="<%encoding("Windows-1252")%>"?> <VisualStudioProject - ProjectType="Visual C++" + ProjectType="<%vcprojecttype("Visual C++")%>" Version="<%vcversion%>" Name="<%project_name%>" ProjectGUID="{<%guid%>}" @@ -85,13 +85,13 @@ <%if(StringPooling)%> StringPooling="<%StringPooling%>" <%endif%> -<%if(!Optimization)%> +<%if(!optimize)%> MinimalRebuild="<%MinimalRebuild("true")%>" <%endif%> <%if(ExceptionHandling)%> ExceptionHandling="<%ExceptionHandling("2")%>" <%endif%> -<%if(!Optimization)%> +<%if(!optimize)%> BasicRuntimeChecks="<%BasicRuntimeChecks("3")%>" <%endif%> <%if(SmallerTypeCheck)%> @@ -179,7 +179,7 @@ WarnAsError="<%WarnAsError%>" <%endif%> Detect64BitPortabilityProblems="<%Detect64BitPortabilityProblems("true")%>" -<%if(!Optimization)%> +<%if(!optimize)%> DebugInformationFormat="<%debug_format("3")%>"/> <%endif%> <%if(CallingConvention)%> @@ -386,7 +386,7 @@ <%if(Driver)%> Driver="<%Driver%>" <%endif%> -<%if(Optimization)%> +<%if(optimize)%> OptimizeReferences="<%OptimizeReferences("2")%>" EnableCOMDATFolding="<%EnableCOMDATFolding("2")%>" <%endif%> @@ -597,10 +597,14 @@ Description="Invoking <%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> on <%custom_type->input_file%>" CommandLine="<%if(custom_type->libpath)%>PATH=%PATH%;<%custom_type->libpath%>
<%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)%>
<%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%> "<%custom_type->input_file%>"<%if(custom_type->output_option)%> <%custom_type->output_option%> "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_files)%><%else%><%custom_type->input_file->output_files%><%endif%>"<%endif%><%if(flag_overrides(custom_type->input_file, postcommand))%><%foreach(custom_type->input_file->output_files)%>
<%flag_overrides(custom_type->input_file, postcommand)%><%endfor%><%else%><%if(custom_type->postcommand)%><%foreach(custom_type->input_file->output_files)%>
<%custom_type->postcommand%><%endfor%><%endif%><%endif%><%if(pch_header)%><%if(custom_type->pch_postrule)%><%foreach(custom_type->input_file->source_output_files)%>
echo #include "<%pch_header%>" > temporary.src
type "<%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%>" >> temporary.src
move /y temporary.src "<%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%>"<%endfor%><%endif%><%endif%>" <%if(flag_overrides(custom_type->input_file, dependent))%> - AdditionalDependencies="<%flag_overrides(custom_type->input_file, dependent)%>.exe" + AdditionalDependencies="<%flag_overrides(custom_type->input_file, dependent)%>.exe<%foreach(custom_type->input_file->dependencies)%>;<%custom_type->input_file->dependencie%><%endfor%>" <%else%> <%if(custom_type->dependent)%> - AdditionalDependencies="<%custom_type->dependent%>.exe" + AdditionalDependencies="<%custom_type->dependent%>.exe<%foreach(custom_type->input_file->dependencies)%>;<%custom_type->input_file->dependencie%><%endfor%>" +<%else%> +<%if(custom_type->input_file->dependencies)%> + AdditionalDependencies="<%foreach(custom_type->input_file->dependencies)%><%custom_type->input_file->dependencie%><%fornotlast(";")%><%endfor%>" +<%endif%> <%endif%> <%endif%> Outputs="<%foreach(custom_type->input_file->output_files)%><%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%><%fornotlast(";")%><%endfor%>"/> diff --git a/templates/vc8dll.mpt b/templates/vc8dll.mpt index 3c4deb84..1ec9a17d 100644 --- a/templates/vc8dll.mpt +++ b/templates/vc8dll.mpt @@ -13,7 +13,7 @@ MinimalRebuild = false Release { LinkIncremental = 1 - Optimization = 2 + optimize = 2 defines = NDEBUG output_dir = Release intermediate_dir = Release @@ -30,7 +30,7 @@ Debug { MFC Release { LinkIncremental = 1 - Optimization = 2 + optimize = 2 defines = NDEBUG output_dir = MFC_Release intermediate_dir = MFC_Release |