diff options
Diffstat (limited to 'CIAO/tests')
| -rw-r--r-- | CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc | 3 | ||||
| -rw-r--r-- | CIAO/tests/Bug_3834_Regression/CompA.idl | 2 | ||||
| -rw-r--r-- | CIAO/tests/Bug_3834_Regression/CompA.mpc | 26 | ||||
| -rw-r--r-- | CIAO/tests/Bug_3834_Regression/CompB.mpc | 15 | ||||
| -rw-r--r-- | CIAO/tests/Bug_3834_Regression/Moo.idl | 2 | ||||
| -rw-r--r-- | CIAO/tests/Bug_3834_Regression/Moo.mpc | 66 | ||||
| -rw-r--r-- | CIAO/tests/DAnCE/Components/SimpleCommon.mpc | 3 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Glfa/A.idl | 8 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Glfa/A.mpc | 67 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Glfa/B.idl | 12 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Glfa/B.mpc | 132 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl | 7 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl | 1 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc | 4 |
14 files changed, 85 insertions, 263 deletions
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc index 77645d9db2b..0745726bd2f 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc @@ -7,8 +7,7 @@ project(TSEC_CheckPoint_idl_gen) : componentidldefaults { -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export \ -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h \ -Wb,exec_export_macro=TSEC_CHECKPOINT_EXEC_Export \ - -Wb,exec_export_include=TSEC_CheckPoint_exec_export.h \ - -Glfa + -Wb,exec_export_include=TSEC_CheckPoint_exec_export.h requires += dummy_label IDL_Files { diff --git a/CIAO/tests/Bug_3834_Regression/CompA.idl b/CIAO/tests/Bug_3834_Regression/CompA.idl index 88675e2ea67..7499894518f 100644 --- a/CIAO/tests/Bug_3834_Regression/CompA.idl +++ b/CIAO/tests/Bug_3834_Regression/CompA.idl @@ -6,6 +6,8 @@ #include <Components.idl> #include "Moo.idl" +#pragma ciao lem "CompAE.idl" + component CompA { provides Moo my_moo; diff --git a/CIAO/tests/Bug_3834_Regression/CompA.mpc b/CIAO/tests/Bug_3834_Regression/CompA.mpc index 206c9232a9d..c2e6587eb47 100644 --- a/CIAO/tests/Bug_3834_Regression/CompA.mpc +++ b/CIAO/tests/Bug_3834_Regression/CompA.mpc @@ -3,7 +3,6 @@ project(Moo_CompA_idl_gen) : componentidldefaults { custom_only = 1 - idlflags += -Glfa idlflags += -Wb,stub_export_macro=COMPA_STUB_Export \ -Wb,stub_export_include=CompA_stub_export.h \ -Wb,skel_export_macro=COMPA_SVNT_Export \ @@ -13,14 +12,13 @@ project(Moo_CompA_idl_gen) : componentidldefaults { -Wb,svnt_export_macro=COMPA_SVNT_Export \ -Wb,svnt_export_include=CompA_svnt_export.h - IDL_Files { CompA.idl } } project(Moo_CompA_lem_gen) : ciaoidldefaults { - after += Moo_CompA_idl_gen + after += Moo_CompA_idl_gen Moo_idl_gen Moo_lem_gen custom_only = 1 idlflags += -Wb,stub_export_macro=COMPA_EXEC_Export \ -Wb,stub_export_include=CompA_exec_export.h \ @@ -34,8 +32,8 @@ project(Moo_CompA_lem_gen) : ciaoidldefaults { project(Moo_CompA_stub) : ccm_stub { after += Moo_CompA_idl_gen Moo_stub libs += Moo_stub - - + + sharedname = CompA_stub dynamicflags += COMPA_STUB_BUILD_DLL @@ -57,11 +55,10 @@ project(Moo_CompA_stub) : ccm_stub { } project(Moo_CompA_exec) : ciao_executor { - after += Moo_CompA_lem_gen Moo_CompA_stub + after += Moo_CompA_lem_gen Moo_CompA_stub Moo_lem_stub sharedname = CompA_exec - libs += CompA_stub Moo_stub - - + libs += CompA_stub Moo_stub Moo_lem_stub + dynamicflags += COMPA_EXEC_BUILD_DLL IDL_Files { @@ -85,16 +82,17 @@ project(Moo_CompA_exec) : ciao_executor { project(Moo_CompA_svnt) : ciao_servant { - after += Moo_skel Moo_CompA_exec + after += Moo_skel Moo_CompA_exec sharedname = CompA_svnt libs += CompA_exec \ CompA_stub \ Moo_skel \ - Moo_stub - - + Moo_stub \ + Moo_lem_stub + + dynamicflags += COMPA_SVNT_BUILD_DLL - + IDL_Files { } diff --git a/CIAO/tests/Bug_3834_Regression/CompB.mpc b/CIAO/tests/Bug_3834_Regression/CompB.mpc index ac8cf43f85e..0077cb5ef34 100644 --- a/CIAO/tests/Bug_3834_Regression/CompB.mpc +++ b/CIAO/tests/Bug_3834_Regression/CompB.mpc @@ -3,7 +3,6 @@ project(Moo_CompB_idl_gen) : componentidldefaults { custom_only = 1 - idlflags += -Glfa idlflags += -Wb,stub_export_macro=COMPB_STUB_Export \ -Wb,stub_export_include=CompB_stub_export.h \ -Wb,skel_export_macro=COMPB_SVNT_Export \ @@ -34,8 +33,8 @@ project(Moo_CompB_lem_gen) : ciaoidldefaults { project(Moo_CompB_stub) : ccm_stub { after += Moo_CompB_idl_gen Moo_stub libs += Moo_stub - - + + sharedname = CompB_stub dynamicflags += COMPB_STUB_BUILD_DLL @@ -60,8 +59,8 @@ project(Moo_CompB_exec) : ciao_executor { after += Moo_CompB_lem_gen Moo_CompB_stub sharedname = CompB_exec libs += CompB_stub Moo_stub - - + + dynamicflags += COMPB_EXEC_BUILD_DLL IDL_Files { @@ -91,10 +90,10 @@ project(Moo_CompB_svnt) : ciao_servant { CompB_stub \ Moo_skel \ Moo_stub - - + + dynamicflags += COMPB_SVNT_BUILD_DLL - + IDL_Files { } diff --git a/CIAO/tests/Bug_3834_Regression/Moo.idl b/CIAO/tests/Bug_3834_Regression/Moo.idl index a833fc8d170..7a32e41104d 100644 --- a/CIAO/tests/Bug_3834_Regression/Moo.idl +++ b/CIAO/tests/Bug_3834_Regression/Moo.idl @@ -3,6 +3,8 @@ #ifndef MOO_IDL_ #define MOO_IDL_ +#pragma ciao lem "MooE.idl" + interface Moo { void do_something(); diff --git a/CIAO/tests/Bug_3834_Regression/Moo.mpc b/CIAO/tests/Bug_3834_Regression/Moo.mpc index dd0d5335bca..46ce818eb66 100644 --- a/CIAO/tests/Bug_3834_Regression/Moo.mpc +++ b/CIAO/tests/Bug_3834_Regression/Moo.mpc @@ -1,24 +1,61 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Moo" -project(Moo_idl_gen) : componentidldefaults { +project(Moo_idl_gen) : componentidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=MOO_STUB_Export \ -Wb,stub_export_include=Moo_stub_export.h \ + -Wb,exec_export_macro=MOO_EXEC_Export \ + -Wb,exec_export_include=Moo_exec_export.h \ -Wb,skel_export_macro=MOO_SKEL_Export \ - -Wb,skel_export_include=Moo_skel_export.h \ - -Gxhex -Glem + -Wb,skel_export_include=Moo_skel_export.h IDL_Files { Moo.idl } } -project(Moo_stub) : ccm_stub { - after += Moo_idl_gen - libs += - - +project(Moo_lem_gen) : ciaoidldefaults { + after += Moo_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=MOO_EXEC_Export \ + -Wb,stub_export_include=Moo_exec_export.h \ + -SS + + IDL_Files { + MooE.idl + } +} + +project(Moo_lem_stub) : ccm_stub { + after += Moo_lem_gen Moo_stub + libs += Moo_stub + + sharedname = Moo_lem_stub + dynamicflags += MOO_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + MooEC.cpp + } + + Header_Files { + MooEC.h + Moo_exec_export.h + } + + Inline_Files { + MooEC.inl + } +} + +project(Moo_stub) : ccm_stub { + after += Moo_idl_gen + libs += + + sharedname = Moo_stub dynamicflags += MOO_STUB_BUILD_DLL @@ -39,16 +76,15 @@ project(Moo_stub) : ccm_stub { } } - -project(Moo_skel) : ciao_executor { - after += Moo_stub Moo_lem_stub +project(Moo_skel) : ciao_executor { + after += Moo_stub Moo_lem_stub sharedname = Moo_skel libs += Moo_stub - - - + + + dynamicflags += MOO_SKEL_BUILD_DLL - + IDL_Files { } diff --git a/CIAO/tests/DAnCE/Components/SimpleCommon.mpc b/CIAO/tests/DAnCE/Components/SimpleCommon.mpc index 089ce7133c0..43c23deb2d8 100644 --- a/CIAO/tests/DAnCE/Components/SimpleCommon.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleCommon.mpc @@ -7,7 +7,8 @@ project(SimpleCommon_idl_gen) : ciaoidldefaults, anytypecode { -Wb,stub_export_macro=SIMPLECOMMON_STUB_Export \ -Wb,stub_export_include=SimpleCommon_stub_export.h \ -Wb,skel_export_macro=SIMPLECOMMON_SKEL_Export \ - -Wb,skel_export_include=SimpleCommon_skel_export.h -Glem + -Wb,skel_export_include=SimpleCommon_skel_export.h \ + -Glem -Gsv IDL_Files { SimpleCommon.idl diff --git a/CIAO/tests/IDL_Test/Glfa/A.idl b/CIAO/tests/IDL_Test/Glfa/A.idl deleted file mode 100644 index 559c514560d..00000000000 --- a/CIAO/tests/IDL_Test/Glfa/A.idl +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ -#ifndef A_IDL -#define A_IDL - -interface A -{}; - -#endif diff --git a/CIAO/tests/IDL_Test/Glfa/A.mpc b/CIAO/tests/IDL_Test/Glfa/A.mpc deleted file mode 100644 index 187148ddcd1..00000000000 --- a/CIAO/tests/IDL_Test/Glfa/A.mpc +++ /dev/null @@ -1,67 +0,0 @@ -// $Id$ -// This file is generated with "generate_component_mpc.pl -n -u Glfa A" - -project(Glfa_A_idl_gen) : taoidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=A_STUB_Export \ - -Wb,stub_export_include=A_stub_export.h \ - -Wb,skel_export_macro=A_SKEL_Export \ - -Wb,skel_export_include=A_skel_export.h \ - -Gxhsk -Gxhst - - IDL_Files { - A.idl - } -} - -project(Glfa_A_stub) : ccm_stub { - after += Glfa_A_idl_gen - libs += - - sharedname = A_stub - dynamicflags += A_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - AC.cpp - } - - Header_Files { - AC.h - A_stub_export.h - } - - Inline_Files { - AC.inl - } -} - - -project(Glfa_A_skel) : ciao_executor { - after += Glfa_A_stub Glfa_A_lem_stub - sharedname = A_skel - libs += A_stub - - - - dynamicflags += A_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - AS.cpp - } - - Header_Files { - AS.h - A_skel_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/tests/IDL_Test/Glfa/B.idl b/CIAO/tests/IDL_Test/Glfa/B.idl deleted file mode 100644 index 059479f5e84..00000000000 --- a/CIAO/tests/IDL_Test/Glfa/B.idl +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ -#ifndef B_IDL -#define B_IDL -#include <Components.idl> -#include "A.idl" - -component B -{ - provides A a_port; -}; - -#endif diff --git a/CIAO/tests/IDL_Test/Glfa/B.mpc b/CIAO/tests/IDL_Test/Glfa/B.mpc deleted file mode 100644 index 6e65a5ea3de..00000000000 --- a/CIAO/tests/IDL_Test/Glfa/B.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// $Id$ -// This file is generated with "generate_component_mpc.pl -u Glfa B" - -project(Glfa_B_idl_gen) : componentidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=B_STUB_Export \ - -Wb,stub_export_include=B_stub_export.h \ - -Wb,skel_export_macro=B_SVNT_Export \ - -Wb,skel_export_include=B_svnt_export.h \ - -Wb,exec_export_macro=B_EXEC_Export \ - -Wb,exec_export_include=B_exec_export.h \ - -Gxhex -Gxhsk -Gxhst -Glfa -Gex - - IDL_Files { - B.idl - } -} - -project(Glfa_B_lem_gen) : ciaoidldefaults { - after += Glfa_B_idl_gen Glfa_A_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=B_LEM_STUB_Export \ - -Wb,stub_export_include=B_lem_stub_export.h \ - -SS -Gxhst - - IDL_Files { - BE.idl - } -} - -project(Glfa_B_lem_stub) : ccm_svnt { - after += Glfa_B_lem_gen Glfa_B_stub Glfa_A_stub - libs += B_stub A_stub - - - sharedname = B_lem_stub - dynamicflags += B_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - BEC.cpp - } - - Header_Files { - BEC.h - B_lem_stub_export.h - } - - Inline_Files { - BEC.inl - } -} - -project(Glfa_B_stub) : ccm_stub { - after += Glfa_B_idl_gen Glfa_A_stub - libs += A_stub - - - sharedname = B_stub - dynamicflags += B_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - BC.cpp - } - - Header_Files { - BC.h - B_stub_export.h - } - - Inline_Files { - BC.inl - } -} - -project(Glfa_B_exec) : ciao_executor { - after += Glfa_B_lem_stub Glfa_B_stub Glfa_A_stub - sharedname = B_exec - libs += B_stub B_lem_stub A_stub - - - dynamicflags += B_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - B_exec.cpp - } - - Header_Files { - B_exec.h - B_exec_export.h - } - - Inline_Files { - } -} - - -project(Glfa_B_svnt) : ciao_servant { - after += Glfa_B_lem_stub Glfa_A_stub Glfa_A_skel - sharedname = B_svnt - libs += B_stub B_lem_stub A_stub A_skel - - - dynamicflags += B_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - BS.cpp - B_svnt.cpp - } - - Header_Files { - BS.h - B_svnt.h - B_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl index 7eaae4f5743..ba209fa830c 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl @@ -15,12 +15,15 @@ module Inherited attribute string str_base_interface; }; - // TODO: derive this interface from a base interface... - interface derived_interface { + interface derived_interface : base_interface { void do_derived (); readonly attribute string str_derived_interface; }; + + interface another_interface { + void do_another (); + }; }; module Inherited diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl index e409001b64a..0557867f7cb 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl @@ -24,6 +24,7 @@ module Inherited { provides Inherited::derived_interface prov_derived; uses Inherited::derived_interface uses_derived; + uses Inherited::another_interface uses_another; attribute long derived; }; diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc index 854e8da7918..018f10f429d 100644 --- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc +++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc @@ -7,7 +7,7 @@ project(Reused_Facet_Interface_Basic_idl_gen) : ciaoidldefaults, anytypecode { -Wb,stub_export_include=Basic_stub_export.h \ -Wb,skel_export_macro=BASIC_SKEL_Export \ -Wb,skel_export_include=Basic_skel_export.h \ - -Gxhst -Gxhsk -Glem + -Gxhst -Gxhsk -Glem -Gsv IDL_Files { Basic.idl @@ -21,7 +21,7 @@ project(Reused_Facet_Interface_Basic_lem_gen) : ciaoidldefaults, anytypecode { -Wb,stub_export_include=Basic_stub_export.h \ -Wb,skel_export_macro=BASIC_SKEL_Export \ -Wb,skel_export_include=Basic_skel_export.h \ - -Gxhst + -Gxhst IDL_Files { BasicE.idl |