summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/CIAO/ChangeLog20
-rw-r--r--TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc10
-rw-r--r--TAO/CIAO/tools/Daemon/CIAO_Daemon.dsp213
-rw-r--r--TAO/CIAO/tools/Daemon/Daemon.dsw40
-rw-r--r--TAO/CIAO/tools/Daemon/Daemon.mpc9
-rw-r--r--TAO/CIAO/tools/Daemon/DaemonController.dsp261
-rw-r--r--TAO/CIAO/tools/XML_Helpers/Assembly_Spec.h28
-rw-r--r--TAO/CIAO/tools/XML_Helpers/Helper_Test.dsp154
-rw-r--r--TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.h6
-rw-r--r--TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc19
-rw-r--r--TAO/CIAO/tools/XML_Helpers/XML_Helpers.dsw28
-rw-r--r--TAO/CIAO/tools/XML_Helpers/XML_Helpers_Export.h50
-rw-r--r--TAO/CIAO/tools/XML_Helpers/XML_Utils.h3
13 files changed, 119 insertions, 722 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 296769f354e..2ca9736e968 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Tue Apr 15 17:07:52 2003 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * tools/XML_Helpers/Assembly_Spec.h:
+ * tools/XML_Helpers/Softpkg_Handlers.h:
+ * tools/XML_Helpers/XMLHelpers.mpc:
+ * tools/XML_Helpers/XML_Utils.h:
+ * tools/XML_Helpers/XML_Helpers_Export.h: Refactored these files
+ to make them into a library.
+
+ * tools/XML_Helpers/XML_Helpers.dsw:
+ * tools/XML_Helpers/Helper_Test.dsp:
+ * tools/Daemon/CIAO_Daemon.dsp:
+ * tools/Daemon/Daemon.dsw:
+ * tools/Daemon/DaemonController.dsp: Removed these project files
+ and depend solely on MPC generated files.
+
+ * tools/Assembly_Deployer/Assembly_Deployer.mpc:
+ * tools/Daemon/Daemon.mpc: Updated MPC files to link with the new
+ XML_Helpers library.
+
Tue Apr 15 11:07:36 2003 Nanbor Wang <nanbor@cs.wustl.edu>
* ciao/Daemon.idl:
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
index 82dd8f68436..8c27531cf1b 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc
@@ -1,18 +1,14 @@
project(Assembly_Manager): ciao_server, acexml {
- libs += TAO_IORTable
- libpaths += $(TAO_ROOT)/tao/IORTable
+ libs += TAO_IORTable CIAO_XML_Helpers
+ libpaths += $(TAO_ROOT)/tao/IORTable ../XML_Helpers
+ depends += XML_Helpers
Source_Files {
Assembly_Impl.cpp
Assembly_Visitors.cpp
Deployment_Configuration.cpp
Assembly_Manager.cpp // Main
- ../XML_Helpers/XML_Utils.cpp
- ../XML_Helpers/Softpkg_Handlers.cpp
- ../XML_Helpers/Cascadable_DocHandler.cpp
- ../XML_Helpers/Assembly_Spec.cpp
- ../XML_Helpers/Assembly_Handlers.cpp
Assembly_Service_Impl.cpp
Assembly_ServiceC.cpp
Assembly_ServiceS.cpp
diff --git a/TAO/CIAO/tools/Daemon/CIAO_Daemon.dsp b/TAO/CIAO/tools/Daemon/CIAO_Daemon.dsp
deleted file mode 100644
index 702d5083621..00000000000
--- a/TAO/CIAO/tools/Daemon/CIAO_Daemon.dsp
+++ /dev/null
@@ -1,213 +0,0 @@
-# Microsoft Developer Studio Project File - Name="CIAO_Daemon" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=CIAO_Daemon - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "CIAO_Daemon.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "CIAO_Daemon.mak" CFG="CIAO_Daemon - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "CIAO_Daemon - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "CIAO_Daemon - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "CIAO_Daemon - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\ciao" /I "..\..\..\orbsvcs\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib TAO_IFR_Client.lib CIAO_Container.lib CIAO_Client.lib CIAO_Server.lib TAO_PortableServer.lib TAO_Security.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /out:"Release\CIAO_Daemon.exe" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\IFR_Client" /libpath:"..\..\ciao" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\IORTable"
-
-!ELSEIF "$(CFG)" == "CIAO_Daemon - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "server___Win32_Debug"
-# PROP BASE Intermediate_Dir "server___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\ciao" /I "..\..\..\orbsvcs\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib taod.lib TAO_IFR_Clientd.lib CIAO_Containerd.lib CIAO_Clientd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_Securityd.lib TAO_CosNamingd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\IFR_Client" /libpath:"..\..\ciao" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\IORTable"
-
-!ENDIF
-
-# Begin Target
-
-# Name "CIAO_Daemon - Win32 Release"
-# Name "CIAO_Daemon - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\CIAO_Daemon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Daemon_Impl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonS.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\Daemon_Impl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonS.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "IDL Files"
-
-# PROP Default_Filter "idl"
-# Begin Source File
-
-SOURCE=.\Daemon.idl
-
-!IF "$(CFG)" == "CIAO_Daemon - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
-OutDir=.
-InputPath=.\Daemon.idl
-InputName=Daemon
-
-BuildCmds= \
- ..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\.. -I..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\.. -I ..\..\.. -I ..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "CIAO_Daemon - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
-OutDir=.
-InputPath=.\Daemon.idl
-InputName=Daemon
-
-BuildCmds= \
- ..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\.. -I..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\.. -I ..\..\.. -I ..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Inline Files"
-
-# PROP Default_Filter "i;inl"
-# Begin Source File
-
-SOURCE=.\Daemon_Impl.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonS.i
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/CIAO/tools/Daemon/Daemon.dsw b/TAO/CIAO/tools/Daemon/Daemon.dsw
deleted file mode 100644
index cade69a9405..00000000000
--- a/TAO/CIAO/tools/Daemon/Daemon.dsw
+++ /dev/null
@@ -1,40 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "CIAO_Daemon"=.\CIAO_Daemon.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DaemonController EXE"=.\DaemonController.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
diff --git a/TAO/CIAO/tools/Daemon/Daemon.mpc b/TAO/CIAO/tools/Daemon/Daemon.mpc
index 6d745673dc7..1b6d2ceb0ca 100644
--- a/TAO/CIAO/tools/Daemon/Daemon.mpc
+++ b/TAO/CIAO/tools/Daemon/Daemon.mpc
@@ -17,6 +17,10 @@ project(CIAO_Daemon): ciao_server {
project(DaemonController) : ciao_server, acexml {
+ libs += CIAO_XML_Helpers
+ libpaths += ../XML_Helpers
+ depends += XML_Helpers
+
IDL_Files {
Daemon.idl
}
@@ -27,10 +31,5 @@ project(DaemonController) : ciao_server, acexml {
controller_i.cpp
Daemon_Commands.cpp
Softpkg_Commands.cpp
- ../XML_Helpers/XML_Utils.cpp
- ../XML_Helpers/Softpkg_Handlers.cpp
- ../XML_Helpers/Cascadable_DocHandler.cpp
- ../XML_Helpers/Assembly_Handlers.cpp
- ../XML_Helpers/Assembly_Spec.cpp
}
}
diff --git a/TAO/CIAO/tools/Daemon/DaemonController.dsp b/TAO/CIAO/tools/Daemon/DaemonController.dsp
deleted file mode 100644
index fbcd930815d..00000000000
--- a/TAO/CIAO/tools/Daemon/DaemonController.dsp
+++ /dev/null
@@ -1,261 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DaemonController EXE" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=DaemonController EXE - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "DaemonController.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "DaemonController.mak" CFG="DaemonController EXE - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "DaemonController EXE - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DaemonController EXE - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "DaemonController EXE - Win32 Release"
-
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\ciao" /I "..\..\..\orbsvcs\orbsvcs" /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\..\CIAO" /i "..\..\..\..\CIAO\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1
-BSC32=bscmake.exe
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib CIAO_Server.lib TAO_PortableServer.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib CIAO_Client.lib ACE.lib ACEXML.lib ACEXML_Parser.lib /nologo /version:1.3 /subsystem:console /machine:I386 /out:"DaemonController.exe" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\IFR_Client" /libpath:"..\..\ciao" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\ACEXML\Common" /libpath:"..\..\..\..\ACEXML\parser\parser"
-
-!ELSEIF "$(CFG)" == "DaemonController EXE - Win32 Debug"
-
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\.." /I "..\..\.." /I "..\..\ciao" /I "..\..\..\orbsvcs\orbsvcs" /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\..\CIAO" /i "..\..\..\..\CIAO\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1
-BSC32=bscmake.exe
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib CIAO_Clientd.lib ACEd.lib ACEXMLd.lib ACEXML_Parserd.lib /nologo /version:1.3 /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\IFR_Client" /libpath:"..\..\ciao" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\ACEXML\Common" /libpath:"..\..\..\..\ACEXML\parser\parser"
-
-!ENDIF
-
-# Begin Target
-
-# Name "DaemonController EXE - Win32 Release"
-# Name "DaemonController EXE - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;cxx;c"
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Assembly_Handlers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Assembly_Spec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Cascadable_DocHandler.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\controller_i.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Daemon_Commands.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonController.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Softpkg_Commands.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Softpkg_Handlers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\XML_Utils.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hh"
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Assembly_Handlers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Assembly_Spec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Cascadable_DocHandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\controller_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Daemon_Commands.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Softpkg_Commands.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Softpkg_Handlers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\XML_Utils.h
-# End Source File
-# End Group
-# Begin Group "Inline Files"
-
-# PROP Default_Filter "i;inl"
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Assembly_Handlers.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Assembly_Spec.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\controller_i.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\Daemon_Commands.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\DaemonC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Softpkg_Commands.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\Softpkg_Handlers.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\XML_Helpers\XML_Utils.inl
-# End Source File
-# End Group
-# Begin Group "IDL FIles"
-
-# PROP Default_Filter "idl"
-# Begin Source File
-
-SOURCE=.\Daemon.idl
-
-!IF "$(CFG)" == "DaemonController EXE - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
-OutDir=.\Release
-InputPath=.\Daemon.idl
-InputName=Daemon
-
-BuildCmds= \
- ..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\.. -I..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\.. -I ..\..\.. -I ..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "DaemonController EXE - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
-OutDir=.
-InputPath=.\Daemon.idl
-InputName=Daemon
-
-BuildCmds= \
- ..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\.. -I..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\.. -I ..\..\.. -I ..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.h b/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.h
index aadeecdf8d2..f4746470d0b 100644
--- a/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.h
+++ b/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.h
@@ -17,6 +17,7 @@
#include "ace/Containers_T.h"
#include "ace/SString.h"
#include "ace/CORBA_macros.h"
+#include "XML_Helpers_Export.h"
namespace CIAO
{
@@ -55,7 +56,7 @@ namespace CIAO
*
* Abstract base class for placement information
*/
- class Node
+ class CIAO_XML_HELPERS_Export Node
{
public:
/// Default constructor.
@@ -89,8 +90,9 @@ namespace CIAO
*
* Abstract base class for container type placement node
*/
- class Container : public Node,
- public ACE_Double_Linked_List<Node>
+ class CIAO_XML_HELPERS_Export Container
+ : public Node,
+ public ACE_Double_Linked_List<Node>
{
public:
Container (const char *id,
@@ -119,7 +121,8 @@ namespace CIAO
/**
* @class componentinstantiation
*/
- class componentinstantiation : public Node
+ class CIAO_XML_HELPERS_Export componentinstantiation
+ : public Node
{
public:
typedef enum _if_register_type
@@ -169,7 +172,8 @@ namespace CIAO
/**
* @class homeplacement
*/
- class homeplacement : public Container
+ class CIAO_XML_HELPERS_Export homeplacement
+ : public Container
{
public:
typedef enum _register_method
@@ -212,7 +216,8 @@ namespace CIAO
/**
* @class hostcollocation
*/
- class hostcollocation : public Container
+ class CIAO_XML_HELPERS_Export hostcollocation
+ : public Container
{
public:
hostcollocation (const char *id,
@@ -230,7 +235,8 @@ namespace CIAO
/**
* @class hostcollocation
*/
- class processcollocation : public Container
+ class CIAO_XML_HELPERS_Export processcollocation
+ : public Container
{
public:
processcollocation (const char *id,
@@ -250,7 +256,7 @@ namespace CIAO
*
* Abstract Base class for placement node visitor.
*/
- class Visitor
+ class CIAO_XML_HELPERS_Export Visitor
{
public:
Visitor ();
@@ -302,7 +308,7 @@ namespace CIAO
INVALID_CONN
} Connection_Type;
- class IF_Resolver_Info
+ class CIAO_XML_HELPERS_Export IF_Resolver_Info
{
public:
IF_Resolver_Info (IF_Resolution_Method type,
@@ -340,7 +346,7 @@ namespace CIAO
/**
*
*/
- typedef struct _CII
+ typedef struct CIAO_XML_HELPERS_Export _CII
{
_CII ();
@@ -367,7 +373,7 @@ namespace CIAO
/**
*
*/
- typedef struct _ASpec
+ typedef struct CIAO_XML_HELPERS_Export _ASpec
{
_ASpec ();
diff --git a/TAO/CIAO/tools/XML_Helpers/Helper_Test.dsp b/TAO/CIAO/tools/XML_Helpers/Helper_Test.dsp
deleted file mode 100644
index 3d3e4c48fc7..00000000000
--- a/TAO/CIAO/tools/XML_Helpers/Helper_Test.dsp
+++ /dev/null
@@ -1,154 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Helper_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Helper_Test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Helper_Test.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Helper_Test.mak" CFG="Helper_Test - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Helper_Test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Helper_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Helper_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib ACEXML.lib ACEXML_Parser.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\..\ACEXML\Common" /libpath:"..\..\..\..\ACEXML\parser\parser"
-
-!ELSEIF "$(CFG)" == "Helper_Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib ACEXMLd.lib ACEXML_Parserd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\..\ACEXML\Common" /libpath:"..\..\..\..\ACEXML\parser\parser"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Helper_Test - Win32 Release"
-# Name "Helper_Test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\Assembly_Handlers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Assembly_Spec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Cascadable_DocHandler.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Softpkg_Handlers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\XML_Utils.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\Assembly_Handlers.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Assembly_Handlers.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\Assembly_Spec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Assembly_Spec.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\Softpkg_Handlers.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Softpkg_Handlers.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\XML_Utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\XML_Utils.inl
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.h b/TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.h
index 60f790535db..f1a438327dc 100644
--- a/TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.h
+++ b/TAO/CIAO/tools/XML_Helpers/Softpkg_Handlers.h
@@ -16,6 +16,7 @@
#ifndef CIAO_SOFTPKG_HANDLER_H
#define CIAO_SOFTPKG_HANDLER_H
+#include "XML_Helpers_Export.h"
#include "Cascadable_DocHandler.h"
namespace CIAO
@@ -28,7 +29,8 @@ namespace CIAO
* This SAX event handler try to regenerate the XML document it
* reads with correct indentation.
*/
- class Softpkg_Handler : public CIAO::XMLHelpers::Cascadable_DocHandler
+ class CIAO_XML_HELPERS_Export Softpkg_Handler
+ : public CIAO::XMLHelpers::Cascadable_DocHandler
{
public:
/**
@@ -62,7 +64,7 @@ namespace CIAO
* This Softpkg_Info combines information from both a component
* softpkg descriptor and a servant softpkg descriptor.
*/
- typedef struct Struct_Softpkg_Info
+ typedef struct CIAO_XML_HELPERS_Export Struct_Softpkg_Info
{
/// Specify the pathname (should change to URI later) to the
/// component descriptor file.
diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
index 86038d1fb5b..d73aab62935 100644
--- a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
+++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
@@ -1,2 +1,21 @@
+project(XML_Helpers): acelib, acexml {
+ sharedname=CIAO_XML_Helpers
+ dllflags += CIAO_XML_HELPERS_BUILD_DLL
+
+ Source_Files {
+ XML_Utils.cpp
+ Softpkg_Handlers.cpp
+ Cascadable_DocHandler.cpp
+ Assembly_Spec.cpp
+ Assembly_Handlers.cpp
+ }
+}
+
project(Helper_Test): aceexe, acexml {
+ libs += CIAO_XML_Helpers
+ depends += XML_Helpers
+
+ Source_Files {
+ main.cpp
+ }
}
diff --git a/TAO/CIAO/tools/XML_Helpers/XML_Helpers.dsw b/TAO/CIAO/tools/XML_Helpers/XML_Helpers.dsw
deleted file mode 100644
index 408d1e9da9e..00000000000
--- a/TAO/CIAO/tools/XML_Helpers/XML_Helpers.dsw
+++ /dev/null
@@ -1,28 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Helper_Test"=.\Helper_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
diff --git a/TAO/CIAO/tools/XML_Helpers/XML_Helpers_Export.h b/TAO/CIAO/tools/XML_Helpers/XML_Helpers_Export.h
new file mode 100644
index 00000000000..2eca335e6db
--- /dev/null
+++ b/TAO/CIAO/tools/XML_Helpers/XML_Helpers_Export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl CIAO_XML_HELPERS
+// ------------------------------
+#ifndef CIAO_XML_HELPERS_EXPORT_H
+#define CIAO_XML_HELPERS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (CIAO_XML_HELPERS_HAS_DLL)
+# define CIAO_XML_HELPERS_HAS_DLL 1
+#endif /* ! CIAO_XML_HELPERS_HAS_DLL */
+
+#if defined (CIAO_XML_HELPERS_HAS_DLL) && (CIAO_XML_HELPERS_HAS_DLL == 1)
+# if defined (CIAO_XML_HELPERS_BUILD_DLL)
+# define CIAO_XML_HELPERS_Export ACE_Proper_Export_Flag
+# define CIAO_XML_HELPERS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define CIAO_XML_HELPERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* CIAO_XML_HELPERS_BUILD_DLL */
+# define CIAO_XML_HELPERS_Export ACE_Proper_Import_Flag
+# define CIAO_XML_HELPERS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define CIAO_XML_HELPERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* CIAO_XML_HELPERS_BUILD_DLL */
+#else /* CIAO_XML_HELPERS_HAS_DLL == 1 */
+# define CIAO_XML_HELPERS_Export
+# define CIAO_XML_HELPERS_SINGLETON_DECLARATION(T)
+# define CIAO_XML_HELPERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* CIAO_XML_HELPERS_HAS_DLL == 1 */
+
+// Set CIAO_XML_HELPERS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (CIAO_XML_HELPERS_NTRACE)
+# if (ACE_NTRACE == 1)
+# define CIAO_XML_HELPERS_NTRACE 1
+# else /* (ACE_NTRACE == 1) */
+# define CIAO_XML_HELPERS_NTRACE 0
+# endif /* (ACE_NTRACE == 1) */
+#endif /* !CIAO_XML_HELPERS_NTRACE */
+
+#if (CIAO_XML_HELPERS_NTRACE == 1)
+# define CIAO_XML_HELPERS_TRACE(X)
+#else /* (CIAO_XML_HELPERS_NTRACE == 1) */
+# define CIAO_XML_HELPERS_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (CIAO_XML_HELPERS_NTRACE == 1) */
+
+#endif /* CIAO_XML_HELPERS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/tools/XML_Helpers/XML_Utils.h b/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
index 0357e244403..adba93382f8 100644
--- a/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
+++ b/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
@@ -13,6 +13,7 @@
#ifndef CIAO_XML_UTILS_H
#define CIAO_XML_UTILS_H
+#include "XML_Helpers_Export.h"
#include "Softpkg_Handlers.h"
#include "Assembly_Spec.h"
@@ -23,7 +24,7 @@ namespace CIAO
*
* @brief Utils contains a collection of utility functions
*/
- class XML_Utils
+ class CIAO_XML_HELPERS_Export XML_Utils
{
public:
/**
View Lorry Controller Status