*** empty log message ***

4 files changed, 33 insertions, 30 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 60e6be6c146..a7220c27815 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Apr 03 15:08:20 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ciao/Assembly_Impl.*:
+	* tools/Assembly_Deployer/Assembly_Impl.*: Moved the Assembly
+	  implementaiton files to the tools/Assembly_Deployer/ directory.
+
+	* ciao/CCM_Core.mpc:
+	* ciao/CIAO_Server.dsp: Removed Assembly_Impl.*.
+
 Thu Apr 03 13:11:49 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tools/XML_Helpers/Assembly_Spec.h:
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index d139a67fafc..66a6c1c6c0f 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -73,7 +73,6 @@ project (CIAO_Server) :taolib_with_idl {
     DaemonS.cpp
     HomeRegistrarC.cpp
     HomeRegistrarS.cpp
-    Assembly_Impl.cpp
     ComponentInstallation_Impl.cpp
     ComponentServer_Impl.cpp
     Container_Base.cpp
diff --git a/TAO/CIAO/ciao/CIAO_Server.dsp b/TAO/CIAO/ciao/CIAO_Server.dsp
index 87b5e57a5a9..6b59216575c 100644
--- a/TAO/CIAO/ciao/CIAO_Server.dsp
+++ b/TAO/CIAO/ciao/CIAO_Server.dsp
@@ -92,10 +92,6 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\Assembly_Impl.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\CCM_DeploymentC.cpp

 # End Source File

 # Begin Source File

@@ -164,10 +160,6 @@ SOURCE=.\ServerActivator_Impl.cpp
 # PROP Default_Filter "h;hpp;hxx;hm"

 # Begin Source File

 

-SOURCE=.\Assembly_Impl.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CCM_DeploymentC.h

 # End Source File

 # Begin Source File

@@ -504,10 +496,6 @@ BuildCmds= \
 # PROP Default_Filter "i,inl"

 # Begin Source File

 

-SOURCE=.\Assembly_Impl.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\CCM_DeploymentC.i

 # End Source File

 # Begin Source File

diff --git a/TAO/CIAO/examples/handcrafted/Hello/client.dsp b/TAO/CIAO/examples/handcrafted/Hello/client.dsp
index a489bc555c5..0fe87e79c3a 100644
--- a/TAO/CIAO/examples/handcrafted/Hello/client.dsp
+++ b/TAO/CIAO/examples/handcrafted/Hello/client.dsp
@@ -6,21 +6,20 @@
 

 CFG=client EXE - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE run the tool that generated this project file and specify the

-!MESSAGE nmake output type.  You can then use the following command:

-!MESSAGE

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

 !MESSAGE NMAKE /f "client.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "client.mak" CFG="client EXE - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "client EXE - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "client EXE - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -35,14 +34,18 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release\client"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /GX /O2 /MD /GR /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.."

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO.lib TAO_IFR_Client.lib CIAO_Client.lib ACE.lib /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:console /pdb:"Release\client.pdb"  /machine:I386 /out:"Release\client.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib CIAO_Client.lib ACE.lib  hello_stubd.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1

+# SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "client EXE - Win32 Debug"

 

@@ -50,16 +53,20 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

 # PROP Intermediate_Dir "Debug\client"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.."

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAOd.lib TAO_IFR_Clientd.lib CIAO_Clientd.lib ACEd.lib /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:console /pdb:".\client.pdb" /debug /machine:I386 /out:".\client.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAOd.lib TAO_IFR_Clientd.lib CIAO_Clientd.lib ACEd.lib hello_stubd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1

+# SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target