ChangeLogTag: Mon Feb 2 07:41:25 2004 Chad Elliott <elliott_c@ociweb.com>

11 files changed, 57 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index b8bf7f5da8f..b774dc6a8cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,29 +1,45 @@
+Mon Feb  2 07:41:25 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/README:
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+        * bin/MakeProjectCreator/templates/bor.mpd:
+        * bin/MakeProjectCreator/templates/em3vcp.mpd:
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+        * bin/MakeProjectCreator/templates/make.mpd:
+        * bin/MakeProjectCreator/templates/nmake.mpd:
+        * bin/MakeProjectCreator/templates/va4icc.mpd:
+        * bin/MakeProjectCreator/templates/vc6dsp.mpd:
+        * bin/MakeProjectCreator/templates/vc7.mpd:
+
+          Removed the ssl and defaultlibs keyword.  These were unncessary
+          and should have been removed long ago.
+
 Mon Feb  2 07:16:42 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* ace/OS_NS_unistd.h:
-	* ace/OS_NS_unistd.inl:
+        * ace/OS_NS_unistd.h:
+        * ace/OS_NS_unistd.inl:
 
-	  Changed the parameters to void * instead of char * since most of
-	  the platforms take a void *.
+          Changed the parameters to void * instead of char * since most of
+          the platforms take a void *.
 
 Mon Feb  2 06:56:32 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* ace/Makefile.ace:
+        * ace/Makefile.ace:
 
-	  Building applications which use ACE library fail because
-	  LynxOS's linker is unable to find dlopen() which is used in
-	  DLL_Manager.o and implemented in OS_NS_dlfcn.o. 
+          Building applications which use ACE library fail because
+          LynxOS's linker is unable to find dlopen() which is used in
+          DLL_Manager.o and implemented in OS_NS_dlfcn.o.
 
           To fix this, OS_NS_dlfcn.o must be placed after DLL_Manager.o
-	  when creating libACE.a with ar. Thanks to Olli Savia for the
-	  patch. 
-	  
+          when creating libACE.a with ar. Thanks to Olli Savia for the
+          patch.
+
 Sun Feb  1 19:09:54 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* ace/config-borland-common.h:
-	* ace/config-win32-borland.h:
-	  Kylix doesn't have swab, CBuilder has a non-const swab, CBuilderX
-	  has the normal swab
+        * ace/config-borland-common.h:
+        * ace/config-win32-borland.h:
+          Kylix doesn't have swab, CBuilder has a non-const swab, CBuilderX
+          has the normal swab
 
 Sun Feb  1 17:06:13 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -43,33 +59,33 @@ Sun Feb  1 15:15:44 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Feb  1 12:36:13 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* include/makeinclude/build_lib.bor:
-	  Added support for using the CBX ar with the -M commandline option
-	  to pass it a script. This fixes the too long commandline.
+        * include/makeinclude/build_lib.bor:
+          Added support for using the CBX ar with the -M commandline option
+          to pass it a script. This fixes the too long commandline.
 
 Sat Jan 31 11:01:33 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* ace/OS_NS_unistd.h:
-	* ace/OS_NS_unistd.inl:
+        * ace/OS_NS_unistd.h:
+        * ace/OS_NS_unistd.inl:
 
-	  Thanks to Olli Savia, we now have a ACE_OS::swab (). This calls
-	  the platform specific swab () function. There is a emulation
-	  which could be used on platforms that don't support ::swab
-	  (). The emulation can be used by defining ACE_LACKS_SWAB.
+          Thanks to Olli Savia, we now have a ACE_OS::swab (). This calls
+          the platform specific swab () function. There is a emulation
+          which could be used on platforms that don't support ::swab
+          (). The emulation can be used by defining ACE_LACKS_SWAB.
 
-	  I haven't added ACE_LACKS_SWAB in any config file. We will do it
-	  as and when things showup in our daily builds.
+          I haven't added ACE_LACKS_SWAB in any config file. We will do it
+          as and when things showup in our daily builds.
 
 Sat Jan 31 08:52:13 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* bin/MakeProjectCreator/config/smart_proxies.mpb:
-	  Removed requires smart_proxies, there is no need for this and
-	  only prevents the smart_proxies tests from compiling
+        * bin/MakeProjectCreator/config/smart_proxies.mpb:
+          Removed requires smart_proxies, there is no need for this and
+          only prevents the smart_proxies tests from compiling
 
 Fri Jan 30 19:33:49 UTC 2004  Craig Rodrigues  <crodrigu@bbn.com>
 
-	* include/makeinclude/platform_linux.GNU: Allow user to override
-	  OCFLAGS in platform_macros.GNU file.
+        * include/makeinclude/platform_linux.GNU: Allow user to override
+          OCFLAGS in platform_macros.GNU file.
 
 Fri Jan 30 10:30:26 2004  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/bin/MakeProjectCreator/README b/bin/MakeProjectCreator/README
index b0ec782fccb..c083cc6639c 100644
--- a/bin/MakeProjectCreator/README
+++ b/bin/MakeProjectCreator/README
@@ -108,14 +108,11 @@ libout		Specifies where the dynamic and static libraries will be placed
 install		Specifies where executables will be installed
 pch_header	Specifies the precompiled header file name
 pch_source	Specifies the precompiled source file name
-ssl             Specifies that the project will use ssl
-tao		Specifies that the project will use TAO
 version         Specifies the version number for the library or executable
 macros          These values will be passed as macros to the compiler.
 libpaths	Specifies 1 or more locations to find libraries
 includes	Specifies 1 or more locations to find include files
 libs		Specifies 1 or more libraries to link into the exe or library
-defaultlibs	Specifies 1 or more default libraries to link in
 after           Specifies that this project must be built after 1 or more
                 project names listed.
 dynamicflags	Specifies preprocessor flags needed for dynamic libraries
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index b9e3d669e7f..bb04cbe0649 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -42,13 +42,11 @@ my(%validNames) = ('exename'         => 1,
                    'libpaths'        => 1,
                    'install'         => 1,
                    'includes'        => 1,
-                   'defaultlibs'     => 0,
                    'after'           => 1,
                    'libs'            => 0,
                    'lit_libs'        => 0,
                    'pch_header'      => 1,
                    'pch_source'      => 1,
-                   'ssl'             => 1,
                    'dllout'          => 1,
                    'libout'          => 1,
                    'dynamicflags'    => 1,
diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd
index 0ae1ba015b0..909e806e9db 100644
--- a/bin/MakeProjectCreator/templates/bor.mpd
+++ b/bin/MakeProjectCreator/templates/bor.mpd
@@ -27,13 +27,13 @@ LFLAGS = \
 	-j"<%libpath%>\$(CONFIG_SUBDIR)" <%fornotlast(" \\")%>
 <%endfor%>
 <%endif%>
-<%if(libs || lit_libs || defaultlibs)%>
+<%if(libs || lit_libs)%>
 
 LIBFILES = \
 <%foreach(lit_libs)%>
 	<%lit_lib%>.lib \
 <%endfor%>
-<%foreach(libs defaultlibs)%>
+<%foreach(libs)%>
 	<%lib%>$(LIB_DECORATOR).lib<%fornotlast(" \\")%>
 <%endfor%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd
index f75b839e4e8..953d885854f 100644
--- a/bin/MakeProjectCreator/templates/em3vcp.mpd
+++ b/bin/MakeProjectCreator/templates/em3vcp.mpd
@@ -69,7 +69,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%stack%><%if(type_is_dynamic)%> /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.exe<%endif%>"
+# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%stack%><%if(type_is_dynamic)%> /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index cd095330a54..6420f4d4897 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -73,10 +73,10 @@ RESOURCES += \
 #----------------------------------------------------------------------------
 <%marker(macros)%>
 <%if(exename)%>
-LDLIBS =<%foreach(libs)%> -l<%lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(defaultlibs)%> -l<%defaultlib%><%endfor%>
+LDLIBS =<%foreach(libs)%> -l<%lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%>
 <%else%>
 <%if(sharedname)%>
-ACE_SHLIBS =<%foreach(libs)%> -l<%lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(defaultlibs)%> -l<%defaultlib%><%endfor%>
+ACE_SHLIBS =<%foreach(libs)%> -l<%lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%>
 <%endif%>
 <%endif%>
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd
index 245e7f289c0..7e9f7f34781 100644
--- a/bin/MakeProjectCreator/templates/make.mpd
+++ b/bin/MakeProjectCreator/templates/make.mpd
@@ -62,7 +62,7 @@ ARFLAGS       = <%arflags%>
 SRC           =<%foreach(source_files)%> <%source_file%><%endfor%>
 OBJS          =<%foreach(source_files)%> <%noextension(source_file)%>.o<%endfor%>
 LDFLAGS       =<%if(libpaths)%><%foreach(libpaths)%> -L<%libpath%><%endfor%><%endif%><%foreach(configurations)%><%if(linkflags)%> <%linkflags%><%endif%><%endfor%>
-LDLIBS        =<%if(libs)%><%foreach(libs)%> -l<%lib%><%endfor%><%endif%><%if(defaultlibs)%><%foreach(defaultlibs)%> -l<%defaultlib%><%endfor%><%endif%><%if(lit_libs)%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%endif%><%foreach(platforms)%> <%ldlibs%><%endfor%>
+LDLIBS        =<%foreach(libs lit_libs)%> -l<%lib%><%endfor%><%foreach(platforms)%> <%ldlibs%><%endfor%>
 LINK.cc       = $(LD) $(LDFLAGS)
 COMPILE.cc    = $(CXX) $(CCFLAGS) $(CPPFLAGS)  -c
 RM            = rm -f
diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd
index 05c8693c65f..61998883c39 100644
--- a/bin/MakeProjectCreator/templates/nmake.mpd
+++ b/bin/MakeProjectCreator/templates/nmake.mpd
@@ -145,7 +145,7 @@ BSC32_SBRS= \
 
 <%if(type_is_binary)%>
 LINK32=link.exe
-LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
+LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
 <%endif%>
 <%if(type_is_static)%>
 LINK32=link.exe -lib
diff --git a/bin/MakeProjectCreator/templates/va4icc.mpd b/bin/MakeProjectCreator/templates/va4icc.mpd
index 60c8560752e..bf69ffe2d2b 100644
--- a/bin/MakeProjectCreator/templates/va4icc.mpd
+++ b/bin/MakeProjectCreator/templates/va4icc.mpd
@@ -122,7 +122,7 @@ option
 <%endif%>
 
                        // Libraries needed during linking
-<%foreach(libs defaultlibs lit_libs)%>
+<%foreach(libs lit_libs)%>
                        source type (lib) "lib<%lib%>.a"
 <%endfor%>
 
diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd
index cc9e1abbc10..ff891f767cc 100644
--- a/bin/MakeProjectCreator/templates/vc6dsp.mpd
+++ b/bin/MakeProjectCreator/templates/vc6dsp.mpd
@@ -61,7 +61,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb"<%endif%><%endif%><%endif%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%>"
+# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb"<%endif%><%endif%><%endif%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/vc7.mpd b/bin/MakeProjectCreator/templates/vc7.mpd
index ed02fca0166..3254bc75c36 100644
--- a/bin/MakeProjectCreator/templates/vc7.mpd
+++ b/bin/MakeProjectCreator/templates/vc7.mpd
@@ -65,7 +65,7 @@
 <%else%>
 				Name="VCLinkerTool"
 <%if(type_is_binary)%>
-				AdditionalDependencies="<%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%>"
+				AdditionalDependencies="<%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%>"
 <%endif%>
 <%if(exename || sharedname || staticname)%>
 				OutputFile="$(OutDir)/<%if(type_is_dynamic)%><%sharedname%><%lib_modifier%>.dll<%else%><%exename%>.exe<%endif%>"