ChangeLogTag: Mon Jan 9 08:30:14 2006 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 35 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index f0dee597..0040d16a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan  9 08:30:14 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * templates/nmake.mpd:
+
+          Corrected a bug reported by Johnny Willemsen where object files
+          were not getting cleaned up if they contained a relative path with
+          ".." in the name.  In the process, I cleaned up the template a bit
+          which should allow this type to be generated slightly faster.
+
 Thu Jan  5 09:45:54 2006  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/Creator.pm:
@@ -271,14 +280,14 @@ Mon Dec  5 14:17:35 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 Tue Nov 29 10:11:14 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * config/boost_date_time.mpb
-        * config/boost_filesystem.mpb
-        * config/boost_prg_exec_monitor.mpb
-        * config/boost_regex.mpb
-        * config/boost_signals.mpb
-        * config/boost_test_exec_monitor.mpb
-        * config/boost_thread.mpb
-        * config/boost_unit_test_framework.mpb
+        * config/boost_date_time.mpb:
+        * config/boost_filesystem.mpb:
+        * config/boost_prg_exec_monitor.mpb:
+        * config/boost_regex.mpb:
+        * config/boost_signals.mpb:
+        * config/boost_test_exec_monitor.mpb:
+        * config/boost_thread.mpb:
+        * config/boost_unit_test_framework.mpb:
 
         Corrected a problem with my previous commit that broke boost
         on platforms other than gnuace and windows.  Thanks to Chad
@@ -287,8 +296,8 @@ Tue Nov 29 10:11:14 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 Mon Nov 21 15:23:40 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * config/boost_filesystem.mpb
-        * config/boost_regex.mpb
+        * config/boost_filesystem.mpb:
+        * config/boost_regex.mpb:
 
         Scoped the lit_libs directive inside of a gnuace specific
         block to take advantage of automatic library resolution provided
@@ -400,8 +409,8 @@ Mon Nov  7 13:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Fri Oct 28 14:58:59 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * config/global.features
-        * config/xerces.mpb
+        * config/global.features:
+        * config/xerces.mpb:
 
         Added a xerces feature to the xerces base project, similar to
         boost/zlib/zzip to allow disabling xerces specific projects.
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index 433bf66c..29a650de 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -128,7 +128,8 @@ REALCLEAN : CLEAN
     if not exist "$(INTDIR)\$(NULL)" mkdir "$(INTDIR)"
 
 CPP=<%cc("cl.exe")%>
-CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%><%optimize_flags("/O2")%><%else%><%debug_flags("/Ob0")%><%endif%> <%compile_flags%><%if(pdbc)%> /Fd"<%if(type_is_static)%><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%>$(INTDIR)/<%endif%>"<%endif%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(unicode)%>/D UNICODE /D _UNICODE <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%staticflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /FD /c
+CPP_COMMON=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%><%optimize_flags("/O2")%><%else%><%debug_flags("/Ob0")%><%endif%> <%compile_flags%><%if(pdbc)%> /Fd"<%if(type_is_static)%><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%>$(INTDIR)/<%endif%>"<%endif%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(unicode)%>/D UNICODE /D _UNICODE <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%staticflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+CPP_PROJ=$(CPP_COMMON) /Fo"<%fo_flag("$(INTDIR)\\\\")%>"
 
 <%if(!type_is_static)%>
 RSC=<%rc("rc.exe")%>
@@ -146,14 +147,14 @@ LINK32_FLAGS=/nologo /machine:<%machine("I386")%><%if(link_options)%> <%link_opt
 LINK32_OBJS= \
 <%if(!type_is_static)%>
 <%foreach(resource_files)%>
-	"$(INTDIR)\<%if(dirname(resource_file))%><%noextension(resource_file)%><%else%><%basenoextension(resource_file)%><%endif%>.res" \
+	"$(INTDIR)\<%noextension(resource_file)%>.res" \
 <%endfor%>
 <%endif%>
 <%if(pch_source)%>
-	"$(INTDIR)\<%if(dirname(pch_source))%><%noextension(pch_source)%><%else%><%basenoextension(pch_source)%><%endif%>.obj" \
+	"$(INTDIR)\<%noextension(pch_source)%>.obj" \
 <%endif%>
 <%foreach(source_files)%>
-	"$(INTDIR)\<%if(dirname(source_file))%><%noextension(source_file)%><%else%><%basenoextension(source_file)%><%endif%>.obj"<%fornotlast(" \\")%>
+	"$(INTDIR)\<%noextension(source_file)%>.obj"<%fornotlast(" \\")%>
 <%endfor%>
 
 "<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%libname_prefix%><%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%endif%><%if(type_is_static)%>$(OUTDIR)\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%><%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%>" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -172,6 +173,7 @@ __postbuild__:
 <%endfor%>
 
 CLEAN :
+	-@del /f/q $(LINK32_OBJS)
 	-@del /f/s/q "$(INTDIR)"
 
 <%if(install)%>
@@ -221,8 +223,7 @@ CLEAN :
 <%marker(macros)%>
 <%foreach(platforms)%>
 !IF <%foreach(configurations)%>"$(CFG)" == "<%platform%> <%configuration%>" <%fornotlast("|| ")%><%endfor%>
-<%if(pch_source)%>
-<%if(pch_header)%>
+<%if(pch_source && pch_header)%>
 SOURCE="<%pch_source%>"
 
 <%foreach(configurations)%>
@@ -230,42 +231,27 @@ SOURCE="<%pch_source%>"
 
 CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%><%optimize_flags%><%else%><%debug_flags%><%endif%> <%compile_flags%><%if(pdbc)%> /Fd"<%if(type_is_static)%><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%>$(INTDIR)/<%endif%>"<%endif%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(unicode)%>/D UNICODE /D _UNICODE <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%staticflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/FD /c
 
-<%if(dirname(pch_source))%>
 "$(INTDIR)\<%noextension(pch_source)%>.obj" "$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)"
+<%if(dirname(pch_source))%>
         @if not exist "$(INTDIR)\<%dirname(pch_source)%>\$(NULL)" mkdir "$(INTDIR)\<%dirname(pch_source)%>"
+<%endif%>
 	$(CPP) @<<
   $(CPP_SWITCHES) /Fo"$(INTDIR)\<%noextension(pch_source)%>.obj" $(SOURCE)
 <<
-<%else%>
-"$(INTDIR)\<%basenoextension(pch_source)%>.obj" "$(INTDIR)\<%basenoextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) /Fo"<%fo_flag%>" $(SOURCE)
-<<
-<%endif%>
 
 <%endfor%>
 !ENDIF
 
 <%endif%>
-<%endif%>
 <%if(exename || sharedname || staticname)%>
 <%foreach(source_files)%>
 SOURCE="<%source_file%>"
-<%if(dirname(source_file))%>
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
 "$(INTDIR)\<%noextension(source_file)%>.obj" : $(SOURCE) "$(INTDIR)"
-        @if not exist "$(INTDIR)\<%dirname(source_file)%>\$(NULL)" mkdir "$(INTDIR)\<%dirname(source_file)%>"
-	$(CPP) @<<
-	/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%><%optimize_flags%><%else%><%debug_flags%><%endif%> <%compile_flags%><%if(pdbc)%> /Fd"<%if(type_is_static)%><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%>$(INTDIR)/<%endif%>"<%endif%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(unicode)%>/D UNICODE /D _UNICODE <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%staticflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/FD /c /Fo"$(INTDIR)\<%noextension(source_file)%>.obj" $(SOURCE)
-<<
-<%endfor%>
-!ENDIF
-<%else%>
-"$(INTDIR)\<%basenoextension(source_file)%>.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
+<%if(dirname(source_file))%>
+	@if not exist "$(INTDIR)\<%dirname(source_file)%>\$(NULL)" mkdir "$(INTDIR)\<%dirname(source_file)%>"
 <%endif%>
+	$(CPP) $(CPP_COMMON) /Fo"$(INTDIR)\<%noextension(source_file)%>.obj" $(SOURCE)
 
 <%endfor%>
 <%endif%>
@@ -315,11 +301,11 @@ InputPath=<%custom_type->input_file%>
 <%foreach(resource_files)%>
 SOURCE="<%resource_file%>"
 
-"$(INTDIR)\<%if(dirname(resource_file))%><%noextension(resource_file)%><%else%><%basenoextension(resource_file)%><%endif%>.res" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\<%noextension(resource_file)%>.res" : $(SOURCE) "$(INTDIR)"
 <%if(dirname(resource_file))%>
 	@if not exist "$(INTDIR)\<%dirname(resource_file)%>\$(NULL)" mkdir "$(INTDIR)\<%dirname(resource_file)%>"
 <%endif%>
-	$(RSC) /l 0x409 /fo"$(INTDIR)\<%if(dirname(resource_file))%><%noextension(resource_file)%><%else%><%basenoextension(resource_file)%><%endif%>.res"<%foreach(defines cpu_defines macros)%> /d <%define%><%endfor%><%if(unicode)%> /d UNICODE /d _UNICODE<%endif%><%foreach(includes)%> /i "<%include%>"<%endfor%> $(SOURCE)
+	$(RSC) /l 0x409 /fo"$(INTDIR)\<%noextension(resource_file)%>.res"<%foreach(defines cpu_defines macros)%> /d <%define%><%endfor%><%if(unicode)%> /d UNICODE /d _UNICODE<%endif%><%foreach(includes)%> /i "<%include%>"<%endfor%> $(SOURCE)
 
 
 <%endfor%>