ChangeLogTag:Sun Mar 18 02:43:41 2001 Ossama Othman <ossama@uci.edu>

3 files changed, 161 insertions, 14 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 528589bc2f6..a8bc03406e4 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Sun Mar 18 02:43:41 2001  Ossama Othman  <ossama@uci.edu>
+
+	* orbsvcs/orbsvcs/Security.dsp:
+	* orbsvcs/orbsvcs/Security.bor:
+
+	  Added new Security Level 1 related files to the source lists in
+	  these files.
+
 Sun Mar 18 01:53:42 2001  Ossama Othman  <ossama@uci.edu>
 
 	* Security/Security_Current.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Security.bor b/TAO/orbsvcs/orbsvcs/Security.bor
index 47cc1a396b3..c1840900366 100644
--- a/TAO/orbsvcs/orbsvcs/Security.bor
+++ b/TAO/orbsvcs/orbsvcs/Security.bor
@@ -6,15 +6,23 @@ NAME = TAO_Security
 
 TAO_IDL	= $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
 	-I..\..	-Ge 1 -Wb,export_macro=TAO_Security_Export \
-	-Wb,export_include=Security/security_export.h -Wb,pre_include=ace/pre.h	\
+	-Wb,export_include=Security/security_export.h \
+	-Wb,pre_include=ace/pre.h \
 	-Wb,post_include=ace/post.h
 
 IDLFILES = \
-	$(IDLDIR)\Security.idl
+	$(IDLDIR)\Security.idl \
+	$(IDLDIR)\SecurityLevel1.idl \
+	$(IDLDIR)\SecurityLevel2.idl
 
 OBJFILES = \
 	$(OBJDIR)\SecurityC.obj	\
-	$(OBJDIR)\SecurityS.obj
+	$(OBJDIR)\SecurityLevel1C.obj	\
+	$(OBJDIR)\SecurityLevel2C.obj	\
+	$(OBJDIR)\SecurityLevel2S.obj \
+	$(OBJDIR)\Security_Current.obj \
+	$(OBJDIR)\Security_Current_Impl.obj \
+	$(OBJDIR)\Security_ORBInitializer.obj
 
 RESOURCE = $(OBJDIR)\orbsvcs.res
 
@@ -49,5 +57,14 @@ all: idl_src_files
 
 idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
 
-$(IDLDIR)\SecurityC.cpp	$(IDLDIR)\SecurityS.cpp: $(IDLDIR)\Security.idl
+$(IDLDIR)\SecurityC.cpp: $(IDLDIR)\Security.idl
+	$(TAO_IDL) $**
+
+$(IDLDIR)\SecurityLevel1C.cpp: $(IDLDIR)\SecurityLevel1.idl
+	$(TAO_IDL) $**
+
+$(IDLDIR)\SecurityLevel2C.cpp: $(IDLDIR)\SecurityLevel2.idl
+	$(TAO_IDL) $**
+
+$(IDLDIR)\SecurityLevel2S.cpp: $(IDLDIR)\SecurityLevel2.idl
 	$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/Security.dsp b/TAO/orbsvcs/orbsvcs/Security.dsp
index 305d80e3729..f01286ca038 100644
--- a/TAO/orbsvcs/orbsvcs/Security.dsp
+++ b/TAO/orbsvcs/orbsvcs/Security.dsp
@@ -95,11 +95,31 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\Security\Security_Current.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\Security_Current_Impl.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\Security_ORBInitializer.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\SecurityC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\SecurityS.cpp

+SOURCE=.\SecurityLevel1C.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2C.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2S.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -107,15 +127,43 @@ SOURCE=.\SecurityS.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\Security\Security_Current.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\Security_Current.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\Security_Current_Impl.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Security\security_export.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Security\Security_ORBInitializer.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\SecurityC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\SecurityS.h

+SOURCE=.\SecurityLevel1C.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2C.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2S.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2S_T.h

 # End Source File

 # End Group

 # Begin Group "IDL Files"

@@ -128,13 +176,17 @@ SOURCE=.\Security.idl
 !IF  "$(CFG)" == "Security - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__SECUR="..\..\..\bin\Release\tao_idl.exe"	

+

+!ELSEIF  "$(CFG)" == "Security - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__SECUR="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\Security.idl

 InputName=Security

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security\security_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security\security_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -164,13 +216,72 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel1.idl

+

+!IF  "$(CFG)" == "Security - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+

 !ELSEIF  "$(CFG)" == "Security - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__SECUR="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

-InputPath=.\Security.idl

-InputName=Security

+InputPath=.\SecurityLevel1.idl

+InputName=SecurityLevel1

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security\security_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2.idl

+

+!IF  "$(CFG)" == "Security - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+

+!ELSEIF  "$(CFG)" == "Security - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+InputPath=.\SecurityLevel2.idl

+InputName=SecurityLevel2

 

 BuildCmds= \

 	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security\security_export.h $(InputName).idl

@@ -216,7 +327,19 @@ SOURCE=.\SecurityC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\SecurityS.i

+SOURCE=.\SecurityLevel1C.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2C.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2S.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\SecurityLevel2S_T.i

 # End Source File

 # End Group

 # Begin Group "Template Files"

@@ -224,8 +347,7 @@ SOURCE=.\SecurityS.i
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\SecurityS_T.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\SecurityLevel2S_T.cpp

 # End Source File

 # End Group

 # End Target