ChangeLogTag: Wed Sep 10 11:48:31 2003 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 42 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e5087ca666..b95213dbfb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Wed Sep 10 11:48:31 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/TemplateParser.pm:
+
+          Allow files with spaces to be processed correctly.
+
+        * bin/MakeProjectCreator/templates/em3vcp.mpd:
+        * bin/MakeProjectCreator/templates/vc6dsp.mpd:
+
+          Added support for files with spaces (vc7 already supported them).
+
+        * bin/MakeProjectCreator/templates/nmake.mpd:
+
+          Fixed a warning about the /Ob option.
+
 Wed Sep 10 10:21:16 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/WorkspaceCreator.pm:
diff --git a/bin/MakeProjectCreator/modules/TemplateParser.pm b/bin/MakeProjectCreator/modules/TemplateParser.pm
index f4cf2ac3d5b..042c368f18c 100644
--- a/bin/MakeProjectCreator/modules/TemplateParser.pm
+++ b/bin/MakeProjectCreator/modules/TemplateParser.pm
@@ -861,7 +861,7 @@ sub collect_data {
   foreach my $key (keys %{$prjc->{'valid_components'}}) {
     my(@list) = $prjc->get_component_list($key);
     if (defined $list[0]) {
-      $self->{'values'}->{$key} = "@list";
+      $self->{'values'}->{$key} = \@list;
     }
   }
 
@@ -887,7 +887,8 @@ sub is_only_keyword {
   my($line) = shift;
 
   ## Does the line contain only a keyword?
-  if ($line =~ /^<%(.*)%>$/) {
+  ## Checking for spaces allows nesting in the template.
+  if ($line =~ /^\s*<%(.*)%>$/) {
     my($part) = $1;
     if ($part !~ /%>/) {
       $part =~ s/\(.*//;
diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd
index 987b19612b9..3692486f852 100644
--- a/bin/MakeProjectCreator/templates/em3vcp.mpd
+++ b/bin/MakeProjectCreator/templates/em3vcp.mpd
@@ -61,7 +61,7 @@ LINK32=link.exe -lib
 RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
 CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
+# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
@@ -98,7 +98,7 @@ LIB32=link.exe -lib
 <%if(pch_header)%>
 # Begin Source File
 
-SOURCE=.\<%pch_source%>
+SOURCE=".\<%pch_source%>"
 # ADD CPP /Yc"<%pch_header%>"
 # End Source File
 <%endif%>
@@ -106,7 +106,7 @@ SOURCE=.\<%pch_source%>
 <%foreach(source_files)%>
 # Begin Source File
 
-SOURCE=.\<%source_file%>
+SOURCE=".\<%source_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -117,13 +117,13 @@ SOURCE=.\<%source_file%>
 <%if(pch_header)%>
 # Begin Source File
 
-SOURCE=.\<%pch_header%>
+SOURCE=".\<%pch_header%>"
 # End Source File
 <%endif%>
 <%foreach(header_files)%>
 # Begin Source File
 
-SOURCE=.\<%header_file%>
+SOURCE=".\<%header_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -135,7 +135,7 @@ SOURCE=.\<%header_file%>
 <%foreach(inline_files)%>
 # Begin Source File
 
-SOURCE=.\<%inline_file%>
+SOURCE=".\<%inline_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -147,7 +147,7 @@ SOURCE=.\<%inline_file%>
 <%foreach(template_files)%>
 # Begin Source File
 
-SOURCE=.\<%template_file%>
+SOURCE=".\<%template_file%>"
 # PROP Exclude_From_Build 1
 # End Source File
 <%endfor%>
@@ -160,7 +160,7 @@ SOURCE=.\<%template_file%>
 <%foreach(documentation_files)%>
 # Begin Source File
 
-SOURCE=.\<%documentation_file%>
+SOURCE=".\<%documentation_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -172,7 +172,7 @@ SOURCE=.\<%documentation_file%>
 <%foreach(resource_files)%>
 # Begin Source File
 
-SOURCE=.\<%resource_file%>
+SOURCE=".\<%resource_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -184,7 +184,7 @@ SOURCE=.\<%resource_file%>
 <%foreach(idl_files)%>
 # Begin Source File
 
-SOURCE=.\<%idl_file%>
+SOURCE=".\<%idl_file%>"
 
 <%foreach(platform_longs)%>
 <%foreach(configurations)%>
@@ -236,7 +236,7 @@ BuildCmds= \
 <%if(custom_type->input_file->output_files)%>
 # Begin Source File
 
-SOURCE=.\<%custom_type->input_file%>
+SOURCE=".\<%custom_type->input_file%>"
 
 <%foreach(platform_longs)%>
 <%foreach(configurations)%>
diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd
index 084b9cf9d7e..0b1463a3e95 100644
--- a/bin/MakeProjectCreator/templates/nmake.mpd
+++ b/bin/MakeProjectCreator/templates/nmake.mpd
@@ -110,7 +110,7 @@ REALCLEAN : CLEAN
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%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"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
+CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%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"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -199,7 +199,7 @@ SOURCE=.\<%pch_source%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
-CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
+CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
 
 "$(INTDIR)\<%basenoextension(pch_source)%>.obj"	"$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd
index 703e1ba31a0..8cd762d42d3 100644
--- a/bin/MakeProjectCreator/templates/vc6dsp.mpd
+++ b/bin/MakeProjectCreator/templates/vc6dsp.mpd
@@ -52,7 +52,7 @@ RSC=rc.exe
 <%if(type_is_static)%>
 LINK32=link.exe -lib
 <%endif%>
-# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
@@ -86,7 +86,7 @@ LIB32=link.exe -lib
 <%if(pch_header)%>
 # Begin Source File
 
-SOURCE=.\<%pch_source%>
+SOURCE=".\<%pch_source%>"
 # ADD CPP /Yc"<%pch_header%>"
 # End Source File
 <%endif%>
@@ -94,7 +94,7 @@ SOURCE=.\<%pch_source%>
 <%foreach(source_files)%>
 # Begin Source File
 
-SOURCE=.\<%source_file%>
+SOURCE=".\<%source_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -105,13 +105,13 @@ SOURCE=.\<%source_file%>
 <%if(pch_header)%>
 # Begin Source File
 
-SOURCE=.\<%pch_header%>
+SOURCE=".\<%pch_header%>"
 # End Source File
 <%endif%>
 <%foreach(header_files)%>
 # Begin Source File
 
-SOURCE=.\<%header_file%>
+SOURCE=".\<%header_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -123,7 +123,7 @@ SOURCE=.\<%header_file%>
 <%foreach(inline_files)%>
 # Begin Source File
 
-SOURCE=.\<%inline_file%>
+SOURCE=".\<%inline_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -135,7 +135,7 @@ SOURCE=.\<%inline_file%>
 <%foreach(template_files)%>
 # Begin Source File
 
-SOURCE=.\<%template_file%>
+SOURCE=".\<%template_file%>"
 # PROP Exclude_From_Build 1
 # End Source File
 <%endfor%>
@@ -148,7 +148,7 @@ SOURCE=.\<%template_file%>
 <%foreach(documentation_files)%>
 # Begin Source File
 
-SOURCE=.\<%documentation_file%>
+SOURCE=".\<%documentation_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -160,7 +160,7 @@ SOURCE=.\<%documentation_file%>
 <%foreach(resource_files)%>
 # Begin Source File
 
-SOURCE=.\<%resource_file%>
+SOURCE=".\<%resource_file%>"
 # End Source File
 <%endfor%>
 # End Group
@@ -172,7 +172,7 @@ SOURCE=.\<%resource_file%>
 <%foreach(idl_files)%>
 # Begin Source File
 
-SOURCE=.\<%idl_file%>
+SOURCE=".\<%idl_file%>"
 
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
@@ -222,7 +222,7 @@ BuildCmds= \
 <%if(custom_type->input_file->output_files)%>
 # Begin Source File
 
-SOURCE=.\<%custom_type->input_file%>
+SOURCE=".\<%custom_type->input_file%>"
 
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"