ChangeLogTag: Tue May 17 12:40:35 2005 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 28 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index e58c7028..82e7e28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue May 17 12:40:35 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/WinProjectBase.pm:
+
+          Check for paths with drive letters during dirname validation.
+
+        * templates/em3vcp.mpd:
+        * templates/vc6dsp.mpd:
+
+          Brought over the duplicate_index changes from vc7.mpd.
+
 Tue May 17 11:47:45 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/ProjectCreator.pm:
diff --git a/modules/WinProjectBase.pm b/modules/WinProjectBase.pm
index ab15c386..d35f9343 100644
--- a/modules/WinProjectBase.pm
+++ b/modules/WinProjectBase.pm
@@ -23,7 +23,7 @@ sub validated_directory {
   ## $(...) could contain a drive letter and Windows can not
   ## make a directory that resembles a drive letter.  So, we have
   ## to exclude those directories with $(...).
-  if ($dir =~ /\$\([^\)]+\)/ || $dir =~ /\.\.\\/) {
+  if ($dir =~ /\$\([^\)]+\)/ || $dir =~ /\.\.\\/ || $dir =~ /^[A-Z]:/i) {
     return '.';
   }
   else {
diff --git a/templates/em3.mpd b/templates/em3.mpd
index 97638abe..512147b6 100644
--- a/templates/em3.mpd
+++ b/templates/em3.mpd
@@ -119,11 +119,11 @@ SOURCE="<%pch_source%>"
 # Begin Source File
 
 SOURCE="<%grouped_source_file->file%>"
-<%if(dirname(grouped_source_file->file))%>
+<%if(duplicate_index(grouped_source_file->file))%>
 <%foreach(platforms)%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(grouped_source_file->file)%>.obj"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%basenoextension(grouped_source_file->file)%><%duplicate_index(grouped_source_file->file)%>.obj"
 <%endfor%>
 !ENDIF
 <%endfor%>
@@ -137,11 +137,11 @@ SOURCE="<%grouped_source_file->file%>"
 # Begin Source File
 
 SOURCE="<%source_file%>"
-<%if(dirname(source_file))%>
+<%if(duplicate_index(source_file))%>
 <%foreach(platforms)%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(source_file)%>.obj"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%basenoextension(source_file)%><%duplicate_index(source_file)%>.obj"
 <%endfor%>
 !ENDIF
 <%endfor%>
diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd
index 97638abe..512147b6 100644
--- a/templates/em3vcp.mpd
+++ b/templates/em3vcp.mpd
@@ -119,11 +119,11 @@ SOURCE="<%pch_source%>"
 # Begin Source File
 
 SOURCE="<%grouped_source_file->file%>"
-<%if(dirname(grouped_source_file->file))%>
+<%if(duplicate_index(grouped_source_file->file))%>
 <%foreach(platforms)%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(grouped_source_file->file)%>.obj"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%basenoextension(grouped_source_file->file)%><%duplicate_index(grouped_source_file->file)%>.obj"
 <%endfor%>
 !ENDIF
 <%endfor%>
@@ -137,11 +137,11 @@ SOURCE="<%grouped_source_file->file%>"
 # Begin Source File
 
 SOURCE="<%source_file%>"
-<%if(dirname(source_file))%>
+<%if(duplicate_index(source_file))%>
 <%foreach(platforms)%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(source_file)%>.obj"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%basenoextension(source_file)%><%duplicate_index(source_file)%>.obj"
 <%endfor%>
 !ENDIF
 <%endfor%>
diff --git a/templates/vc6.mpd b/templates/vc6.mpd
index 08352c1c..fe2fd68a 100644
--- a/templates/vc6.mpd
+++ b/templates/vc6.mpd
@@ -110,10 +110,10 @@ SOURCE="<%pch_source%>"
 # Begin Source File
 
 SOURCE="<%grouped_source_file->file%>"
-<%if(dirname(grouped_source_file->file))%>
+<%if(duplicate_index(grouped_source_file->file))%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(grouped_source_file->file)%>.obj"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%basenoextension(grouped_source_file->file)%><%duplicate_index(grouped_source_file->file)%>.obj"
 <%endfor%>
 !ENDIF
 <%endif%>
@@ -126,10 +126,10 @@ SOURCE="<%grouped_source_file->file%>"
 # Begin Source File
 
 SOURCE="<%source_file%>"
-<%if(dirname(source_file))%>
+<%if(duplicate_index(source_file))%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(source_file)%>.obj"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%basenoextension(source_file)%><%duplicate_index(source_file)%>.obj"
 <%endfor%>
 !ENDIF
 <%endif%>
diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd
index 08352c1c..fe2fd68a 100644
--- a/templates/vc6dsp.mpd
+++ b/templates/vc6dsp.mpd
@@ -110,10 +110,10 @@ SOURCE="<%pch_source%>"
 # Begin Source File
 
 SOURCE="<%grouped_source_file->file%>"
-<%if(dirname(grouped_source_file->file))%>
+<%if(duplicate_index(grouped_source_file->file))%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(grouped_source_file->file)%>.obj"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%basenoextension(grouped_source_file->file)%><%duplicate_index(grouped_source_file->file)%>.obj"
 <%endfor%>
 !ENDIF
 <%endif%>
@@ -126,10 +126,10 @@ SOURCE="<%grouped_source_file->file%>"
 # Begin Source File
 
 SOURCE="<%source_file%>"
-<%if(dirname(source_file))%>
+<%if(duplicate_index(source_file))%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(source_file)%>.obj"
+# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%basenoextension(source_file)%><%duplicate_index(source_file)%>.obj"
 <%endfor%>
 !ENDIF
 <%endif%>