ChangeLogTag: Thu Mar 6 09:58:41 2003 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 120 insertions, 55 deletions

diff --git a/ChangeLog b/ChangeLog
index cd2c2502afa..576c9f6c742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Mar  6 09:58:41 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm:
+        * bin/MakeProjectCreator/templates/nmake.mpd:
+        * bin/MakeProjectCreator/templates/nmakedll.mpt:
+        * bin/MakeProjectCreator/templates/nmakeexe.mpt:
+
+          Added support for nmake on Win64.  To generate nmake files use the
+          following command line:
+
+          mwc.pl -type nmake -value_template platforms=Win64
+
 Thu Mar  6 08:06:35 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/Driver.pm:
@@ -9,30 +21,30 @@ Thu Mar  6 08:06:35 2003  Chad Elliott  <elliott_c@ociweb.com>
 
 Wed Mar  5 21:45:39 2003  Steve Huston  <shuston@riverace.com>
 
-	* ace/INET_Addr.cpp (get_port_number_from_name): Correct arg name
-	  for ACE_UNUSED_ARG. Suspected cut/paste error.
+        * ace/INET_Addr.cpp (get_port_number_from_name): Correct arg name
+          for ACE_UNUSED_ARG. Suspected cut/paste error.
 
-	* tests/ACE_Test.cpp: const_cast the pointers returned from
-	  ACE::execname() so they can be deleted on MSVC6.
+        * tests/ACE_Test.cpp: const_cast the pointers returned from
+          ACE::execname() so they can be deleted on MSVC6.
 
 Wed Mar  5 07:05:11 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
-	* ace/ace-dll.icc:
-	* ace/ace-lib.icc:
-	* ace/ace.icc:
-	* ace/ace_dll64.mak:
-	* ace/ace_lib64.mak:
+        * ace/ace-dll.icc:
+        * ace/ace-lib.icc:
+        * ace/ace.icc:
+        * ace/ace_dll64.mak:
+        * ace/ace_lib64.mak:
+
+        Added codeset registry files to more makefiles.
 
-	Added codeset registry files to more makefiles.
-	
 Wed Mar  5 06:32:40 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
-	* ace/Makefile.bor:
-	* ace/ace_dll.dsp:
-	* ace/ace_lib.dsp:
+        * ace/Makefile.bor:
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+
+        Added codeset registry files and fixed spelling error in Makefile.bor.
 
-	Added codeset registry files and fixed spelling error in Makefile.bor.
-	
 Wed Mar  5 06:10:48 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
        * ace/Makefile.bor:
@@ -41,14 +53,14 @@ Wed Mar  5 06:10:48 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
 Tue Mar 04 19:58:29 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ACEXML/common/FileCharStream.cpp (determine_encoding): Commented
-	  out the annoying debug information.  Users should get the
-	  encoding information from this->getEncoding(), instead of
-	  relying on the debug info.
+        * ACEXML/common/FileCharStream.cpp (determine_encoding): Commented
+          out the annoying debug information.  Users should get the
+          encoding information from this->getEncoding(), instead of
+          relying on the debug info.
 
-	* ACEXML/common/LocatorImpl.cpp (reset): Remember to reset string
-	  pointers to 0 after deleteing them.  Otherwise, a parser may
-	  crash if it is used to parse a second file.
+        * ACEXML/common/LocatorImpl.cpp (reset): Remember to reset string
+          pointers to 0 after deleteing them.  Otherwise, a parser may
+          crash if it is used to parse a second file.
 
 Tue Mar  4 17:39:31 2003  Steve Huston  <shuston@riverace.com>
 
@@ -107,15 +119,15 @@ Tue Mar  4 13:54:52 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
 Tue Jan 24 17:50:32 2003  Gonzalo Diethelm  <gonzalo.diethelm@aditiva.com>
 
-	* ace/INET_Addr.cpp:
-  	  Method string_to_addr() now uses ACE_OS_String::strtol() instead
- 	  of the ugly hack using ACE_OS::strspn() and ACE_OS::atoi().  The
- 	  two set() methods that receive a const char port_name[] now try
- 	  first to parse that port_name as a simple number (like "901"),
- 	  and if that fails they try to resolve the port name as a
- 	  service.  In order to implement this, I added a static helper
- 	  function called get_port_number_from_name() (sorry for the awful
- 	  name).
+        * ace/INET_Addr.cpp:
+          Method string_to_addr() now uses ACE_OS_String::strtol() instead
+          of the ugly hack using ACE_OS::strspn() and ACE_OS::atoi().  The
+          two set() methods that receive a const char port_name[] now try
+          first to parse that port_name as a simple number (like "901"),
+          and if that fails they try to resolve the port name as a
+          service.  In order to implement this, I added a static helper
+          function called get_port_number_from_name() (sorry for the awful
+          name).
 
 Tue Mar  4 12:53:06 2003  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm
index c76b2d85723..e36fd39711b 100644
--- a/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm
@@ -89,11 +89,24 @@ sub write_comps {
   my($pjs)      = $self->get_project_info();
   my(@list)     = $self->sort_dependencies($projects, $pjs);
   my($crlf)     = $self->crlf();
-
+  my($default)  = 'Win32 Debug';
+
+  ## Determine the default configuration
+  foreach my $project (keys %$pjs) {
+    my($name, $deps, $pguid, @cfgs) = @{$pjs->{$project}};
+    @cfgs = sort @cfgs;
+    if (defined $cfgs[0]) {
+      $default = $cfgs[0];
+      $default =~ s/(.*)\|(.*)/$2 $1/;
+      last;
+    }
+  }
+  
+  ## Print out the content
   print $fh '!IF "$(CFG)" == ""' . $crlf .
-            'CFG=Win32 Debug' . $crlf .
+            'CFG=' . $default . $crlf .
             '!MESSAGE No configuration specified. ' .
-            'Defaulting to Win32 Debug.' . $crlf .
+            'Defaulting to ' . $default . '.' . $crlf .
             '!ENDIF' . $crlf . $crlf .
             'ALL:' . $crlf;
   $self->write_project_targets($fh, 'CFG="$(CFG)"', \@list);
diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd
index f82943a32e8..b6dd5dd188b 100644
--- a/bin/MakeProjectCreator/templates/nmake.mpd
+++ b/bin/MakeProjectCreator/templates/nmake.mpd
@@ -1,20 +1,26 @@
 # Microsoft Developer Studio Generated NMAKE File
-!IF "$(CFG)" == ""
-CFG=<%default_platform("Win32")%> <%default_configuration("Debug")%>
-!MESSAGE No configuration specified. Defaulting to <%platform("Win32")%> <%default_configuration%>.
+<%foreach(platforms)%>
+!<%fornotfirst("ELSE")%>IF "$(CFG)" == ""
+CFG=<%platform%> <%default_configuration%>
+!MESSAGE No configuration specified. Defaulting to <%platform%> <%default_configuration%>.
+<%endfor%>
 !ENDIF 
 
-!IF <%foreach(configurations)%>"$(CFG)" != "<%platform%> <%configuration%>"<%fornotlast(" && ")%><%endfor%>
+!IF <%foreach(platforms)%><%foreach(configurations)%>"$(CFG)" != "<%platform%> <%configuration%>"<%fornotlast(" && ")%><%endfor%><%endfor%>
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
+<%foreach(platforms)%>
 !MESSAGE NMAKE /f "<%project_file%>" CFG="<%platform%> <%default_configuration%>"
+<%endfor%>
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
+<%foreach(platforms)%>
 <%foreach(configurations)%>
-!MESSAGE "<%platform%> <%configuration%>" (based on "<%platform_long("Win32 (x86)")%> <%type_description("Dynamic-Lynk Library")%>")
+!MESSAGE "<%platform%> <%configuration%>" (based on "<%platform%> (<%machine_description%>) <%type_description("Dynamic-Lynk Library")%>")
+<%endfor%>
 <%endfor%>
 !MESSAGE 
 !ERROR An invalid configuration is specified.
@@ -26,6 +32,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
@@ -78,7 +85,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo <%compile_flags("/MD /W3 /GX /O2 /Ob2")%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%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%><%compile_flags("/MD /W3 /GX /O2 /Ob2")%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%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) @<<
@@ -112,7 +119,7 @@ CPP_PROJ=/nologo <%compile_flags("/MD /W3 /GX /O2 /Ob2")%> <%foreach(includes)%>
 
 RSC=rc.exe
 <%foreach(resource_files)%>
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\<%basenoextension(resource_file)%>.res"<%foreach(defines)%> /d <%define%>=1<%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%>
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\<%basenoextension(resource_file)%>.res"<%foreach(defines cpu_defines)%> /d <%define%>=1<%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%>
 <%endfor%>
 BSC32=bscmake.exe
 <%if(sharedname)%>
@@ -146,26 +153,28 @@ LINK32_OBJS= \
 
 <%endfor%>
 !ENDIF
+<%endfor%>
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("<%noextension(project_file)%>.dep")
 !INCLUDE "<%noextension(project_file)%>.dep"
 !ELSE 
-!MESSAGE Warning: cannot find "<%dependency_file%>"
+!MESSAGE Warning: cannot find "<%noextension(project_file)%>.dep"
 !ENDIF 
 !ENDIF 
 
 
-!IF <%foreach(configurations)%>"$(CFG)" == "<%platform%> <%configuration%>" <%fornotlast("|| ")%><%endfor%>
+!IF <%foreach(platforms)%><%foreach(configurations)%>"$(CFG)" == "<%platform%> <%configuration%>" <%fornotlast("|| ")%><%endfor%><%endfor%>
 <%if(pch_source)%>
 <%if(pch_header)%>
 SOURCE=.\<%pch_source%>
 
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
-CPP_SWITCHES=/nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%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%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%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) @<<
@@ -173,6 +182,7 @@ CPP_SWITCHES=/nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%e
 <<
 
 <%endfor%>
+<%endfor%>
 !ENDIF
 
 <%endif%>
@@ -192,6 +202,7 @@ SOURCE=.\<%template_file%>
 <%foreach(idl_files)%>
 SOURCE=.\<%idl_file%>
 
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
@@ -220,6 +231,7 @@ OutDir=.
 
 <%endfor%>
 !ENDIF
+<%endfor%>
 
 <%endfor%>
 <%foreach(resource_files)%>
diff --git a/bin/MakeProjectCreator/templates/nmakedll.mpt b/bin/MakeProjectCreator/templates/nmakedll.mpt
index 3697f0ff94a..27af39ff54a 100644
--- a/bin/MakeProjectCreator/templates/nmakedll.mpt
+++ b/bin/MakeProjectCreator/templates/nmakedll.mpt
@@ -1,6 +1,20 @@
-configurations = Release Debug "Static Release" "Static Debug"
-common_defines = WIN32 _WINDOWS
-pch_defines    = ACE_USING_PCH
+configurations        = Release Debug "Static Release" "Static Debug"
+platforms             = Win32
+default_configuration = Debug
+common_defines        = WIN32 _WINDOWS
+pch_defines           = ACE_USING_PCH
+
+Win32 {
+  machine_description = x86
+  machine             = I386
+}
+
+Win64 {
+  machine_description = IA64
+  machine             = IA64
+  cpu_defines         = WIN64
+  add_compile         = /Wp64
+}
 
 Release {
   type_code             = 0x0102
diff --git a/bin/MakeProjectCreator/templates/nmakeexe.mpt b/bin/MakeProjectCreator/templates/nmakeexe.mpt
index 209ac434783..c2e60f11fdb 100644
--- a/bin/MakeProjectCreator/templates/nmakeexe.mpt
+++ b/bin/MakeProjectCreator/templates/nmakeexe.mpt
@@ -1,10 +1,24 @@
-type_description = "Console Application"
-type_code        = 0x0103
-configurations   = Release Debug "Static Release" "Static Debug"
-type_is_binary   = 1
-common_defines   = WIN32 _CONSOLE
-subsystem        = console
-pch_defines      = ACE_USING_PCH
+type_description      = "Console Application"
+type_code             = 0x0103
+configurations        = Release Debug "Static Release" "Static Debug"
+platforms             = Win32
+default_configuration = Debug
+type_is_binary        = 1
+common_defines        = WIN32 _CONSOLE
+subsystem             = console
+pch_defines           = ACE_USING_PCH
+
+Win32 {
+  machine_description = x86
+  machine             = I386
+}
+
+Win64 {
+  machine_description = IA64
+  machine             = IA64
+  cpu_defines         = WIN64
+  add_compile         = /Wp64
+}
 
 Release {
   use_debug_libraries   = 0