Wed Jun 25 17:00:00 2003 Justin Michel <michel_j@ociweb.com>

14 files changed, 31 insertions, 26 deletions

diff --git a/bin/MakeProjectCreator/config/ciao_client.mpb b/bin/MakeProjectCreator/config/ciao_client.mpb
index a95040bd18a..77b53e3ddbd 100644
--- a/bin/MakeProjectCreator/config/ciao_client.mpb
+++ b/bin/MakeProjectCreator/config/ciao_client.mpb
@@ -1,8 +1,7 @@
-project : taolib_with_idl {
-  after += CIAO_Client
-  idlflags += -I$(CIAO_ROOT) -I$(TAO_ROOT)/CIAO/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs
-  idlflags +=  -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
-  libs       += TAO TAO_IFR_Client TAO_Valuetype TAO_Security CIAO_Client
-  libpaths +=  $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao/Valuetype $(CIAO_ROOT)/ciao  $(TAO_ROOT)/orbsvcs/orbsvcs
-  includes += $(CIAO_ROOT) $(CIAO_ROOT)/ciao $(TAO_ROOT)/orbsvcs/orbsvcs
+project : orbsvcslib, ifr_client, valuetype {
+  after    += CIAO_Client
+  idlflags += -I$(CIAO_ROOT) -I$(TAO_ROOT)/CIAO/ciao
+  libs     += TAO TAO_IFR_Client TAO_Valuetype TAO_Security CIAO_Client
+  libpaths += $(CIAO_ROOT)/ciao
+  includes += $(CIAO_ROOT) $(CIAO_ROOT)/ciao 
 }
diff --git a/bin/MakeProjectCreator/config/ciao_component.mpb b/bin/MakeProjectCreator/config/ciao_component.mpb
index f6d3f17fe58..8f718bebf67 100644
--- a/bin/MakeProjectCreator/config/ciao_component.mpb
+++ b/bin/MakeProjectCreator/config/ciao_component.mpb
@@ -1,6 +1,4 @@
-project : ciao_client {
-  after += CIAO_Container
-  libs       += TAO_PortableServer TAO_IORInterceptor TAO_ObjRefTemplate CIAO_Container
-  libpaths += $(TAO_ROOT)/tao/PortableServer $(TAO_ROOT)/tao/IORInterceptor $(TAO_ROOT)/tao/ObjRefTemplate
-
+project : ciao_client, portableserver {
+  after    += CIAO_Container
+  libs     += CIAO_Container
 }
diff --git a/bin/MakeProjectCreator/config/idl_compiler.mpt b/bin/MakeProjectCreator/config/idl_compiler.mpt
new file mode 100644
index 00000000000..6f9076a55a2
--- /dev/null
+++ b/bin/MakeProjectCreator/config/idl_compiler.mpt
@@ -0,0 +1,3 @@
+// If you change this location, be sure to also
+// change the tao_output.mpb as well.
+idl_compiler = $(ACE_ROOT)/bin/tao_idl
diff --git a/bin/MakeProjectCreator/config/idl_compiler_win32.mpt b/bin/MakeProjectCreator/config/idl_compiler_win32.mpt
new file mode 100644
index 00000000000..553fe399fe3
--- /dev/null
+++ b/bin/MakeProjectCreator/config/idl_compiler_win32.mpt
@@ -0,0 +1,6 @@
+// If you change this location, be sure to also
+// change the tao_output.mpb as well.
+idl_compiler = $(ACE_ROOT)\bin\tao_idl
+// This is needed for vc6, so that it can set
+// a path to the tao_idl_be.dll and tao_idl_fe.dll
+idl_compiler_libs = $(ACE_ROOT)\lib
\ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/iorinterceptor.mpb b/bin/MakeProjectCreator/config/iorinterceptor.mpb
index 353cd27b8bb..582f8926c33 100644
--- a/bin/MakeProjectCreator/config/iorinterceptor.mpb
+++ b/bin/MakeProjectCreator/config/iorinterceptor.mpb
@@ -1,5 +1,4 @@
 project {
   after += IORInterceptor
-  libs    += TAO_IORInterceptor
-  libpaths += $(TAO_ROOT)/tao/IORInterceptor
+  libs  += TAO_IORInterceptor
 }
diff --git a/bin/MakeProjectCreator/config/messaging_only.mpb b/bin/MakeProjectCreator/config/messaging_only.mpb
index 747e18e0542..037b71972cd 100644
--- a/bin/MakeProjectCreator/config/messaging_only.mpb
+++ b/bin/MakeProjectCreator/config/messaging_only.mpb
@@ -1,5 +1,4 @@
 project {
   after += Messaging
-  libs    += TAO_Messaging
-  libpaths += $(TAO_ROOT)/tao/Messaging
+  libs  += TAO_Messaging
 }
diff --git a/bin/MakeProjectCreator/config/objreftemplate.mpb b/bin/MakeProjectCreator/config/objreftemplate.mpb
index 52f9fd673eb..6bc8e525df9 100644
--- a/bin/MakeProjectCreator/config/objreftemplate.mpb
+++ b/bin/MakeProjectCreator/config/objreftemplate.mpb
@@ -1,5 +1,4 @@
 project {
   after += ObjRefTemplate
-  libs    += TAO_ObjRefTemplate
-  libpaths += $(TAO_ROOT)/tao/ObjRefTemplate
+  libs  += TAO_ObjRefTemplate
 }
diff --git a/bin/MakeProjectCreator/config/portableserver.mpb b/bin/MakeProjectCreator/config/portableserver.mpb
index a9df7e3cb13..32a0672cccd 100644
--- a/bin/MakeProjectCreator/config/portableserver.mpb
+++ b/bin/MakeProjectCreator/config/portableserver.mpb
@@ -1,4 +1,4 @@
-project : taolib {
+project : taolib, objreftemplate, valuetype, iorinterceptor {
   after   += PortableServer
   libs    += TAO_PortableServer
 }
diff --git a/bin/MakeProjectCreator/config/tao_output.mpb b/bin/MakeProjectCreator/config/tao_output.mpb
index 95a33ef9aaf..faa43ef3c72 100644
--- a/bin/MakeProjectCreator/config/tao_output.mpb
+++ b/bin/MakeProjectCreator/config/tao_output.mpb
@@ -1,4 +1,6 @@
 project {
+  // We tested with all tao libs going to $(TAO_ROOT)/lib, but
+  // decided that it was easier to deal with all libs in one place. 
   libout        = $(ACE_ROOT)/lib 
   libpaths     += $(ACE_ROOT)/lib
   staticflags  += TAO_AS_STATIC_LIBS
diff --git a/bin/MakeProjectCreator/config/valuetype.mpb b/bin/MakeProjectCreator/config/valuetype.mpb
index fa80fccabf8..a90556421cd 100644
--- a/bin/MakeProjectCreator/config/valuetype.mpb
+++ b/bin/MakeProjectCreator/config/valuetype.mpb
@@ -1,5 +1,4 @@
 project {
-  after += Valuetype
+  after   += Valuetype
   libs    += TAO_Valuetype
-  libpaths += $(TAO_ROOT)/tao/Valuetype
 }
diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd
index 3194ba62c31..b70d176c69d 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)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_libs)%><%zzip_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%><%if(zzip)%>/libpath:"$(ZZIP_ROOT)\lib" <%endif%>/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:"<%dllout%>\<%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)%><%dllout%>\<%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")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_libs)%><%zzip_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%><%if(zzip)%>/libpath:"$(ZZIP_ROOT)\lib" <%endif%>/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/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd
index ae609bd22f9..bc5d3a1e61e 100644
--- a/bin/MakeProjectCreator/templates/nmake.mpd
+++ b/bin/MakeProjectCreator/templates/nmake.mpd
@@ -154,7 +154,7 @@ BSC32_SBRS= \
 
 <%if(type_is_binary)%>
 LINK32=link.exe
-LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_libs)%><%zzip_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%><%if(zzip)%>/libpath: "$(ZZIP_ROOT)\lib" <%endif%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%dllout%>\<%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)%><%dllout%>\<%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")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_libs)%><%zzip_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%><%if(zzip)%>/libpath: "$(ZZIP_ROOT)\lib" <%endif%>/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
@@ -171,7 +171,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\<%basenoextension(source_file)%>.obj"<%fornotlast(" \\")%>
 <%endfor%>
 
-"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd
index c730b28bf9c..52b8948f618 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)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> <%if(zzip)%><%foreach(zzip_libs)%><%zzip_lib%>.lib <%endfor%><%endif%><%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%><%if(zzip)%>/libpath:"$(ZZIP_ROOT)\lib" <%endif%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%dllout%>\<%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)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%>"
+# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> <%if(zzip)%><%foreach(zzip_libs)%><%zzip_lib%>.lib <%endfor%><%endif%><%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%><%if(zzip)%>/libpath:"$(ZZIP_ROOT)\lib" <%endif%>/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%>
@@ -184,6 +184,7 @@ InputName=<%basenoextension(idl_file)%>
 InputDir=<%dirname(idl_file)%>
 
 BuildCmds= \
+	PATH=%PATH%;<%idl_compiler_libs%> \
 	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
 
 "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/bin/MakeProjectCreator/templates/vc7.mpd b/bin/MakeProjectCreator/templates/vc7.mpd
index 2a2309d3808..b4b55e6f9b8 100644
--- a/bin/MakeProjectCreator/templates/vc7.mpd
+++ b/bin/MakeProjectCreator/templates/vc7.mpd
@@ -56,7 +56,7 @@
 <%if(type_is_binary)%>
 				AdditionalDependencies="<%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%><%if(ssl)%><%foreach(ssl_libs)%> <%ssl_lib%>.lib<%endfor%><%endif%><%if(zzip)%><%foreach(zzip_libs)%> <%zzip_lib%>.lib<%endfor%><%endif%>"
 <%endif%>
-				OutputFile="<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%><%if(type_is_static)%><%libout%>\<%staticname%><%lib_modifier%>.lib<%endif%>"
+				OutputFile="<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%><%if(type_is_static)%><%libout%>\<%staticname%><%lib_modifier%>.lib<%endif%>"
 				Version="<%version("1.0")%>"
 				LinkIncremental="<%incremental("1")%>"
 				SuppressStartupBanner="TRUE"