diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-07-02 01:46:55 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-07-02 01:46:55 +0000 |
commit | 1c4fa9c3f0d1cf22d3427b2fb5973190a6425d33 (patch) | |
tree | f851194733123c96df3e0b15cc80ffbb89b967fa | |
parent | c2c4bf5316ac4ec72db1a2867dfcb5154aad4f9d (diff) | |
download | ATCD-1c4fa9c3f0d1cf22d3427b2fb5973190a6425d33.tar.gz |
Thu Jul 2 01:47:53 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/generate_component_mpc.pl
* connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc
* connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
* connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc
* DAnCE/tests/CIAO/Components/ProcessColocation.mpc
* DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
* DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
* DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
* DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
* DAnCE/tests/CIAO/Components/SimpleNull.mpc
* DAnCE/tests/CIAO/Components/SimpleProvider.mpc
* DAnCE/tests/CIAO/Components/SimplePublisher.mpc
* DAnCE/tests/CIAO/Components/SimpleUser.mpc
* docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
* docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
* examples/Display/GPS/GPS.mpc
* examples/Hello/Receiver/Receiver.mpc
* examples/Hello/Sender/Sender.mpc
* examples/Null_Component/Null_Component.mpc
* examples/Swapping/Receiver/Receiver.mpc
* examples/Swapping/Sender/Sender.mpc
* performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
* performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
* performance-tests/Protocols/Sender/Sender.mpc
* tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
* tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
* tests/CIDL/CodeGen/CodeGen.mpc
* tests/IDL_Test/Cornucopia/Cornucopia.mpc
* tests/IDL_Test/Keywords/Keywords.mpc
* tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc
* tests/Minimum/Receiver/Receiver.mpc
* tests/Minimum/Sender/Sender.mpc
Changed project names *_idle_gen to *_lem_gen.
33 files changed, 104 insertions, 68 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index 109df8d1295..f98768efcf0 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,3 +1,39 @@ +Thu Jul 2 01:47:53 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/generate_component_mpc.pl + * connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc + * DAnCE/tests/CIAO/Components/ProcessColocation.mpc + * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc + * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc + * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc + * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc + * DAnCE/tests/CIAO/Components/SimpleNull.mpc + * DAnCE/tests/CIAO/Components/SimpleProvider.mpc + * DAnCE/tests/CIAO/Components/SimplePublisher.mpc + * DAnCE/tests/CIAO/Components/SimpleUser.mpc + * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc + * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc + * examples/Display/GPS/GPS.mpc + * examples/Hello/Receiver/Receiver.mpc + * examples/Hello/Sender/Sender.mpc + * examples/Null_Component/Null_Component.mpc + * examples/Swapping/Receiver/Receiver.mpc + * examples/Swapping/Sender/Sender.mpc + * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc + * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc + * performance-tests/Protocols/Sender/Sender.mpc + * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc + * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc + * tests/CIDL/CodeGen/CodeGen.mpc + * tests/IDL_Test/Cornucopia/Cornucopia.mpc + * tests/IDL_Test/Keywords/Keywords.mpc + * tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc + * tests/Minimum/Receiver/Receiver.mpc + * tests/Minimum/Sender/Sender.mpc + Changed project names *_idle_gen to *_lem_gen. + Wed Jul 1 22:18:53 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * performance-tests/Protocols/Receiver/Receiver.mpc: @@ -5,7 +41,7 @@ Wed Jul 1 22:18:53 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: * examples/Display/RateGen/RateGen.mpc: * examples/Display/NavDisplay/NavDisplay.mpc: - + Changed project names *_idle_gen to *_lem_gen. Wed Jul 1 21:36:05 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> @@ -16,7 +52,7 @@ Wed Jul 1 21:36:05 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: * performance-tests/Protocols/Sender/Sender.mpc: * tests/Minimum/Receiver/Receiver.mpc: - + Fixed missing afters Wed Jul 1 17:08:05 UTC 2009 Marcel Smit <msmit@remedy.nl> @@ -31,9 +67,9 @@ Wed Jul 1 16:27:07 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_component.cpp: * TAO_IDL/be/be_visitor_component/component_svs.cpp: - + Conditionalized generation of value factory registration - with a check to see if the eventtype in question has a + with a check to see if the eventtype in question has a concrete factory. Registration macro should be generated only if this check returns true. diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation.mpc index 18e414d6569..126ad174031 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation.mpc @@ -15,7 +15,7 @@ project(ProcessColocation_idl_gen) : componentidldefaults { } } -project(ProcessColocation_idle_gen) : ciaoidldefaults { +project(ProcessColocation_lem_gen) : ciaoidldefaults { custom_only = 1 after += ProcessColocation_idl_gen idlflags += -Wb,export_macro=PROCESSCOLOCATION_EXEC_Export \ @@ -52,7 +52,7 @@ project(ProcessColocation_stub) : ccm_stub { } project(ProcessColocation_exec) : ciao_executor { - after += ProcessColocation_idle_gen ProcessColocation_stub + after += ProcessColocation_lem_gen ProcessColocation_stub sharedname = ProcessColocation_exec libs += ProcessColocation_stub diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc index 2e798e23861..26dec1e85f5 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc @@ -15,7 +15,7 @@ project(SimpleAttribute_idl_gen) : componentidldefaults { } } -project(SimpleAttribute_idle_gen) : ciaoidldefaults { +project(SimpleAttribute_lem_gen) : ciaoidldefaults { after += SimpleAttribute_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SIMPLEATTRIBUTE_EXEC_Export \ @@ -52,7 +52,7 @@ project(SimpleAttribute_stub) : ccm_stub { } project(SimpleAttribute_exec) : ciao_executor { - after += SimpleAttribute_idle_gen SimpleAttribute_stub + after += SimpleAttribute_lem_gen SimpleAttribute_stub sharedname = SimpleAttribute_exec libs += SimpleAttribute_stub diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc index a9fee5751da..c63d06d2b98 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc @@ -15,7 +15,7 @@ project(SimpleCommon_SimpleConsumer_idl_gen) : componentidldefaults { } } -project(SimpleCommon_SimpleConsumer_idle_gen) : ciaoidldefaults { +project(SimpleCommon_SimpleConsumer_lem_gen) : ciaoidldefaults { after += SimpleCommon_SimpleConsumer_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SIMPLECONSUMER_EXEC_Export \ @@ -52,7 +52,7 @@ project(SimpleCommon_SimpleConsumer_stub) : ccm_stub { } project(SimpleCommon_SimpleConsumer_exec) : ciao_executor { - after += SimpleCommon_SimpleConsumer_idle_gen SimpleCommon_SimpleConsumer_stub + after += SimpleCommon_SimpleConsumer_lem_gen SimpleCommon_SimpleConsumer_stub sharedname = SimpleConsumer_exec libs += SimpleConsumer_stub SimpleCommon_stub diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc index b06d2d8a097..62f942a8498 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc @@ -15,7 +15,7 @@ project(SimpleCommon_SimpleEmitter_idl_gen) : componentidldefaults { } } -project(SimpleCommon_SimpleEmitter_idle_gen) : ciaoidldefaults { +project(SimpleCommon_SimpleEmitter_lem_gen) : ciaoidldefaults { after += SimpleCommon_SimpleEmitter_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SIMPLEEMITTER_EXEC_Export \ @@ -52,7 +52,7 @@ project(SimpleCommon_SimpleEmitter_stub) : ccm_stub { } project(SimpleCommon_SimpleEmitter_exec) : ciao_executor { - after += SimpleCommon_SimpleEmitter_idle_gen SimpleCommon_SimpleEmitter_stub + after += SimpleCommon_SimpleEmitter_lem_gen SimpleCommon_SimpleEmitter_stub sharedname = SimpleEmitter_exec libs += SimpleEmitter_stub SimpleCommon_stub diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc index cb7dc72e7e7..c35430137db 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc @@ -15,7 +15,7 @@ project(SimpleCom_SimpleMulUser_idl_gen) : componentidldefaults { } } -project(SimpleCom_SimpleMulUser_idle_gen) : ciaoidldefaults { +project(SimpleCom_SimpleMulUser_lem_gen) : ciaoidldefaults { after += SimpleCom_SimpleMulUser_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SIMPLEMULTIPLEUSER_EXEC_Export \ @@ -52,7 +52,7 @@ project(SimpleCommon_SimpleMultipleUser_stub) : ccm_stub { } project(SimpleCommon_SimpleMultipleUser_exec) : ciao_executor { - after += SimpleCom_SimpleMulUser_idle_gen SimpleCommon_SimpleMultipleUser_stub + after += SimpleCom_SimpleMulUser_lem_gen SimpleCommon_SimpleMultipleUser_stub sharedname = SimpleMultipleUser_exec libs += SimpleMultipleUser_stub SimpleCommon_stub diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc index 7792ced6f1b..84fcb5a4d94 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc @@ -14,7 +14,7 @@ project(SimpleNull_idl_gen) : componentidldefaults { } } -project(SimpleNull_idle_gen) : ciaoidldefaults { +project(SimpleNull_lem_gen) : ciaoidldefaults { after += SimpleNull_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SIMPLENULL_EXEC_Export \ @@ -51,7 +51,7 @@ project(SimpleNull_stub) : ccm_stub { } project(SimpleNull_exec) : ciao_executor { - after += SimpleNull_idle_gen SimpleNull_stub + after += SimpleNull_lem_gen SimpleNull_stub sharedname = SimpleNull_exec libs += SimpleNull_stub diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc index 2fe1d5541b6..61518431854 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc @@ -15,7 +15,7 @@ project(SimpleCommon_SimpleProvider_idl_gen) : componentidldefaults { } } -project(SimpleCommon_SimpleProvider_idle_gen) : ciaoidldefaults { +project(SimpleCommon_SimpleProvider_lem_gen) : ciaoidldefaults { after += SimpleCommon_SimpleProvider_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SIMPLEPROVIDER_EXEC_Export \ @@ -52,7 +52,7 @@ project(SimpleCommon_SimpleProvider_stub) : ccm_stub { } project(SimpleCommon_SimpleProvider_exec) : ciao_executor { - after += SimpleCommon_SimpleProvider_idle_gen SimpleCommon_SimpleProvider_stub + after += SimpleCommon_SimpleProvider_lem_gen SimpleCommon_SimpleProvider_stub sharedname = SimpleProvider_exec libs += SimpleProvider_stub SimpleCommon_stub diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc index 6ef8ad25498..a4b4544687d 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc @@ -15,7 +15,7 @@ project(SimpleCommon_SimplePublisher_idl_gen) : componentidldefaults { } } -project(SimpleCommon_SimplePublisher_idle_gen) : ciaoidldefaults { +project(SimpleCommon_SimplePublisher_lem_gen) : ciaoidldefaults { after += SimpleCommon_SimplePublisher_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SIMPLEPUBLISHER_EXEC_Export \ @@ -52,7 +52,7 @@ project(SimpleCommon_SimplePublisher_stub) : ccm_stub { } project(SimpleCommon_SimplePublisher_exec) : ciao_executor { - after += SimpleCommon_SimplePublisher_idle_gen SimpleCommon_SimplePublisher_stub + after += SimpleCommon_SimplePublisher_lem_gen SimpleCommon_SimplePublisher_stub sharedname = SimplePublisher_exec libs += SimplePublisher_stub SimpleCommon_stub diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc index 7b4a746684b..ff9215fabda 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc @@ -16,7 +16,7 @@ project(SimpleCommon_SimpleUser_idl_gen) : componentidldefaults { } } -project(SimpleCommon_SimpleUser_idle_gen) : ciaoidldefaults { +project(SimpleCommon_SimpleUser_lem_gen) : ciaoidldefaults { after += SimpleCommon_SimpleUser_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SIMPLEUSER_EXEC_Export \ @@ -53,7 +53,7 @@ project(SimpleCommon_SimpleUser_stub) : ccm_stub { } project(SimpleCommon_SimpleUser_exec) : ciao_executor { - after += SimpleCommon_SimpleUser_idle_gen SimpleCommon_SimpleUser_stub + after += SimpleCommon_SimpleUser_lem_gen SimpleCommon_SimpleUser_stub sharedname = SimpleUser_exec libs += SimpleUser_stub SimpleCommon_stub diff --git a/modules/CIAO/bin/generate_component_mpc.pl b/modules/CIAO/bin/generate_component_mpc.pl index 9eb9789493f..795c77c810d 100755 --- a/modules/CIAO/bin/generate_component_mpc.pl +++ b/modules/CIAO/bin/generate_component_mpc.pl @@ -102,7 +102,7 @@ if (defined $opt_c) { if (! defined $opt_n) { $cidl_gen = ' -project('."$unique_prefix"."$com_name".'_idle_gen) : ciaoidldefaults { +project('."$unique_prefix"."$com_name".'_lem_gen) : ciaoidldefaults { after += '."$unique_prefix"."$com_name".'_idl_gen custom_only = 1 idlflags += -Wb,export_macro='."$UCOM_NAME".'_EXEC_Export \ @@ -118,7 +118,7 @@ project('."$unique_prefix"."$com_name".'_idle_gen) : ciaoidldefaults { $component_def = ' project('."$unique_prefix"."$com_name".'_exec) : ciao_executor { - after += '."$unique_prefix"."$com_name".'_idle_gen '."$unique_prefix"."$com_name".'_stub + after += '."$unique_prefix"."$com_name".'_lem_gen '."$unique_prefix"."$com_name".'_stub sharedname = '."$com_name".'_exec libs += '."$com_name".'_stub '."$stub_depend $lib_paths".' diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc b/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc index 59c7069b653..aa5b472e804 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc @@ -15,7 +15,7 @@ project(Hello_DDS_Receiver_idl_gen) : componentidldefaults { } } -project(Hello_DDS_Receiver_idle_gen) : ciaoidldefaults { +project(Hello_DDS_Receiver_lem_gen) : ciaoidldefaults { after += Hello_DDS_Receiver_idl_gen custom_only = 1 idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \ @@ -54,7 +54,7 @@ project(Hello_DDS_Receiver_stub) : ccm_stub { } project(Hello_DDS_Receiver_exec) : ciao_executor { - after += Hello_DDS_Receiver_idle_gen Hello_DDS_Receiver_stub + after += Hello_DDS_Receiver_lem_gen Hello_DDS_Receiver_stub sharedname = Hello_Receiver_exec libs += Hello_Receiver_stub Hello_Base_stub libout = ../lib diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc index 7913c1de726..371d40d4058 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc @@ -15,7 +15,7 @@ project(Hello_Base_Sender_idl_gen) : componentidldefaults { } } -project(Hello_Base_Sender_idle_gen) : ciaoidldefaults { +project(Hello_Base_Sender_lem_gen) : ciaoidldefaults { custom_only = 1 after += Hello_Base_Sender_idl_gen idlflags += -Wb,export_macro=SENDER_EXEC_Export \ @@ -52,7 +52,7 @@ project(Hello_Base_Sender_stub) : ccm_stub { } project(Hello_Base_Sender_exec) : ciao_executor { - after += Hello_Base_Sender_idle_gen Hello_Base_Sender_stub + after += Hello_Base_Sender_lem_gen Hello_Base_Sender_stub sharedname = Sender_exec libs += Sender_stub Hello_Base_stub diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc index 7ce0d24f5ff..08f957f0ea6 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc @@ -16,7 +16,7 @@ project(Hello_Base_Sender_Connector_idl_gen) : componentidldefaults { } } -project(Hello_Base_Sender_Connector_idle_gen) : ciaoidldefaults { +project(Hello_Base_Sender_Connector_lem_gen) : ciaoidldefaults { after += Hello_Base_Sender_Connector_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SENDER_CONNECTOR_EXEC_Export \ @@ -54,7 +54,7 @@ project(Hello_Base_Sender_Connector_stub) : ccm_stub { } project(Hello_Base_Sender_Connector_exec) : ciao_executor, nddslib { - after += Hello_Base_Sender_Connector_idle_gen Hello_Base_Sender_Connector_stub + after += Hello_Base_Sender_Connector_lem_gen Hello_Base_Sender_Connector_stub sharedname = Sender_Connector_exec libs += Sender_Connector_stub Hello_Base_stub diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc b/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc index 95bee8625d9..5864ce092c6 100644 --- a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc +++ b/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc @@ -15,7 +15,7 @@ project(Stock_Base_StockBroker_idl_gen) : componentidldefaults { } } -project(Stock_Base_StockBroker_idle_gen) : ciaoidldefaults { +project(Stock_Base_StockBroker_lem_gen) : ciaoidldefaults { custom_only = 1 after += Stock_Base_StockBroker_idl_gen idlflags += -Wb,export_macro=STOCKBROKER_EXEC_Export \ @@ -54,7 +54,7 @@ project(Stock_Base_StockBroker_stub) : ccm_stub { } project(Stock_Base_StockBroker_exec) : ciao_executor { - after += Stock_Base_StockBroker_idle_gen Stock_Base_StockBroker_stub + after += Stock_Base_StockBroker_lem_gen Stock_Base_StockBroker_stub sharedname = StockBroker_exec libs += StockBroker_stub Stock_Base_stub libout = ../lib diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc index bd84ccbc4a3..8c5eda5f11c 100644 --- a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc +++ b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc @@ -15,7 +15,7 @@ project(Stock_Base_StockDistributor_idl_gen) : componentidldefaults { } } -project(Stock_Base_StockDistributor_idle_gen) : ciaoidldefaults { +project(Stock_Base_StockDistributor_lem_gen) : ciaoidldefaults { custom_only = 1 after += Stock_Base_StockDistributor_idl_gen idlflags += -Wb,export_macro=STOCKDISTRIBUTOR_EXEC_Export \ @@ -54,7 +54,7 @@ project(Stock_Base_StockDistributor_stub) : ccm_stub { } project(Stock_Base_StockDistributor_exec) : ciao_executor { - after += Stock_Base_StockDistributor_idle_gen Stock_Base_StockDistributor_stub + after += Stock_Base_StockDistributor_lem_gen Stock_Base_StockDistributor_stub sharedname = StockDistributor_exec libs += StockDistributor_stub Stock_Base_stub libout = ../lib diff --git a/modules/CIAO/examples/Display/GPS/GPS.mpc b/modules/CIAO/examples/Display/GPS/GPS.mpc index a2490e13e39..65f7ec35601 100644 --- a/modules/CIAO/examples/Display/GPS/GPS.mpc +++ b/modules/CIAO/examples/Display/GPS/GPS.mpc @@ -15,7 +15,7 @@ project(Display_GPS_idl_gen) : componentidldefaults { } } -project(Display_GPS_idle_gen) : ciaoidldefaults { +project(Display_GPS_lem_gen) : ciaoidldefaults { custom_only = 1 after += Display_GPS_idl_gen idlflags += -Wb,export_macro=GPS_EXEC_Export \ @@ -54,7 +54,7 @@ project(Display_GPS_stub) : ccm_stub { } project(Display_GPS_exec) : ciao_executor { - after += Display_GPS_idle_gen Display_GPS_stub + after += Display_GPS_lem_gen Display_GPS_stub sharedname = GPS_exec libs += GPS_stub Display_Base_stub libout = ../lib diff --git a/modules/CIAO/examples/Hello/Receiver/Receiver.mpc b/modules/CIAO/examples/Hello/Receiver/Receiver.mpc index 8f71c91a231..e48359420eb 100644 --- a/modules/CIAO/examples/Hello/Receiver/Receiver.mpc +++ b/modules/CIAO/examples/Hello/Receiver/Receiver.mpc @@ -18,7 +18,7 @@ project(Hello_Receiver_idl_gen) : componentidldefaults { } } -project(Hello_Receiver_idle_gen) : ciaoidldefaults { +project(Hello_Receiver_lem_gen) : ciaoidldefaults { custom_only = 1 after += Hello_Receiver_idl_gen idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \ @@ -57,7 +57,7 @@ project(Hello_Receiver_stub) : ccm_stub { } project(Hello_Receiver_exec) : ciao_executor { - after += Hello_Receiver_idle_gen Hello_Receiver_stub + after += Hello_Receiver_lem_gen Hello_Receiver_stub sharedname = Hello_Receiver_exec libs += Hello_Receiver_stub Hello_Base_stub libout = ../lib diff --git a/modules/CIAO/examples/Hello/Sender/Sender.mpc b/modules/CIAO/examples/Hello/Sender/Sender.mpc index 2d94fa73a03..341eaa1ef96 100644 --- a/modules/CIAO/examples/Hello/Sender/Sender.mpc +++ b/modules/CIAO/examples/Hello/Sender/Sender.mpc @@ -17,7 +17,7 @@ project(Hello_Sender_idl_gen) : componentidldefaults { } } -project(Hello_Sender_idle_gen) : ciaoidldefaults { +project(Hello_Sender_lem_gen) : ciaoidldefaults { after += Hello_Sender_idl_gen custom_only = 1 idlflags += -Wb,export_macro=SENDER_EXEC_Export \ @@ -56,7 +56,7 @@ project(Hello_Sender_stub) : ccm_stub { } project(Hello_Sender_exec) : ciao_executor { - after += Hello_Sender_idle_gen Hello_Sender_stub + after += Hello_Sender_lem_gen Hello_Sender_stub sharedname = Hello_Sender_exec libs += Hello_Sender_stub Hello_Base_stub libout = ../lib diff --git a/modules/CIAO/examples/Null_Component/Null_Component.mpc b/modules/CIAO/examples/Null_Component/Null_Component.mpc index 4ae915afb9d..d60da27794c 100644 --- a/modules/CIAO/examples/Null_Component/Null_Component.mpc +++ b/modules/CIAO/examples/Null_Component/Null_Component.mpc @@ -15,7 +15,7 @@ project(Null_Component_idl_gen) : componentidldefaults { } } -project(Null_Component_idle_gen) : ciaoidldefaults { +project(Null_Component_lem_gen) : ciaoidldefaults { custom_only = 1 after += Null_Component_idl_gen idlflags += -Wb,export_macro=NULL_COMPONENT_EXEC_Export \ @@ -52,7 +52,7 @@ project(Null_Component_stub) : ccm_stub { } project(Null_Component_exec) : ciao_executor { - after += Null_Component_idle_gen Null_Component_stub + after += Null_Component_lem_gen Null_Component_stub sharedname = Null_Component_exec libs += Null_Component_stub Null_Interface_stub diff --git a/modules/CIAO/examples/Swapping/Receiver/Receiver.mpc b/modules/CIAO/examples/Swapping/Receiver/Receiver.mpc index ece8136efe0..e7a99a6ab34 100644 --- a/modules/CIAO/examples/Swapping/Receiver/Receiver.mpc +++ b/modules/CIAO/examples/Swapping/Receiver/Receiver.mpc @@ -15,7 +15,7 @@ project(Swapping_Hello_Receiver_idl_gen) : componentidldefaults { } } -project(Swapping_Hello_Receiver_idle_gen) : ciaoidldefaults { +project(Swapping_Hello_Receiver_lem_gen) : ciaoidldefaults { custom_only = 1 after += Swapping_Hello_Receiver_idl_gen idlflags += -Wb,export_macro=RECEIVER_SVNT_Export \ @@ -55,7 +55,7 @@ project(Swapping_Hello_Receiver_stub): ccm_stub { project(Swapping_Hello_Receiver_svnt) : ciao_servant { after += Swapping_Hello_Base_skel \ Swapping_Hello_Receiver_stub \ - Swapping_Hello_Receiver_idle_gen + Swapping_Hello_Receiver_lem_gen sharedname = Swapping_Receiver_svnt libs += Swapping_Receiver_stub \ Swapping_Hello_Base_skel \ diff --git a/modules/CIAO/examples/Swapping/Sender/Sender.mpc b/modules/CIAO/examples/Swapping/Sender/Sender.mpc index 7623406bcba..fb17f87da74 100644 --- a/modules/CIAO/examples/Swapping/Sender/Sender.mpc +++ b/modules/CIAO/examples/Swapping/Sender/Sender.mpc @@ -15,7 +15,7 @@ project(Swapping_Hello_Sender_idl_gen) : componentidldefaults { } } -project(Swapping_Hello_Sender_idle_gen) : ciaoidldefaults { +project(Swapping_Hello_Sender_lem_gen) : ciaoidldefaults { custom_only = 1 after += Swapping_Hello_Sender_idl_gen idlflags += -Wb,export_macro=SENDER_SVNT_Export \ @@ -58,7 +58,7 @@ project(Swapping_Hello_Sender_svnt) : ciao_servant { libpaths += ../Hello_Base after += Swapping_Hello_Base_skel \ Swapping_Hello_Sender_stub \ - Swapping_Hello_Sender_idle_gen + Swapping_Hello_Sender_lem_gen sharedname = Swapping_Sender_svnt libs += Swapping_Sender_stub \ Swapping_Hello_Base_skel \ diff --git a/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc index 22574f327ad..69c4307f0d2 100644 --- a/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc +++ b/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc @@ -15,7 +15,7 @@ project(Benchmark_RoundTrip_idl_gen) : componentidldefaults { } } -project(Benchmark_RoundTrip_idle_gen) : ciaoidldefaults { +project(Benchmark_RoundTrip_lem_gen) : ciaoidldefaults { custom_only = 1 after += Benchmark_RoundTrip_idl_gen idlflags += -Wb,export_macro=ROUNDTRIP_EXEC_Export \ @@ -53,7 +53,7 @@ project(Benchmark_RoundTrip_stub) : ccm_stub { } project(Benchmark_RoundTrip_exec) : ciao_executor { - after += Benchmark_RoundTrip_idle_gen Benchmark_RoundTrip_stub + after += Benchmark_RoundTrip_lem_gen Benchmark_RoundTrip_stub sharedname = RoundTrip_exec libs += RoundTrip_stub Benchmark_stub libpaths += .. diff --git a/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc index f8041984c32..9cf391f4b92 100644 --- a/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc +++ b/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc @@ -15,7 +15,7 @@ project(Benchmark_RoundTripClient_idl_gen) : componentidldefaults { } } -project(Benchmark_RoundTripClient_idle_gen) : ciaoidldefaults { +project(Benchmark_RoundTripClient_lem_gen) : ciaoidldefaults { custom_only = 1 after += Benchmark_RoundTripClient_idl_gen idlflags += -Wb,export_macro=ROUNDTRIPCLIENT_EXEC_Export \ @@ -53,7 +53,7 @@ project(Benchmark_RoundTripClient_stub) : ccm_stub { } project(Benchmark_RoundTripClient_exec) : ciao_executor { - after += Benchmark_RoundTripClient_idle_gen Benchmark_RoundTripClient_stub + after += Benchmark_RoundTripClient_lem_gen Benchmark_RoundTripClient_stub sharedname = RoundTripClient_exec libs += RoundTripClient_stub Benchmark_stub libpaths += .. diff --git a/modules/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/modules/CIAO/performance-tests/Protocols/Sender/Sender.mpc index 01a28ba668f..6c7540e8361 100644 --- a/modules/CIAO/performance-tests/Protocols/Sender/Sender.mpc +++ b/modules/CIAO/performance-tests/Protocols/Sender/Sender.mpc @@ -15,7 +15,7 @@ project(Protocols_Sender_idl_gen) : componentidldefaults { } } -project(Protocols_Sender_idle_gen) : ciaoidldefaults { +project(Protocols_Sender_lem_gen) : ciaoidldefaults { custom_only = 1 after += Protocols_Sender_idl_gen idlflags += -Wb,export_macro=SENDER_EXEC_Export \ @@ -53,7 +53,7 @@ project(Protocols_Sender_stub) : ccm_stub { } project(Protocols_Sender_exec) : ciao_executor, rtcorba { - after += Protocols_Sender_idle_gen Protocols_Sender_stub + after += Protocols_Sender_lem_gen Protocols_Sender_stub sharedname = Protocols_Sender_exec libs += Protocols_Sender_stub \ Protocols_stub diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc index e90edc3bff9..79eaa9fcfe1 100644 --- a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc @@ -14,7 +14,7 @@ project(TSEC_CheckPoint_idl_gen) : componentidldefaults { } } -project(TSEC_CheckPoint_idle_gen) : ciaoidldefaults { +project(TSEC_CheckPoint_lem_gen) : ciaoidldefaults { custom_only = 1 after += TSEC_CheckPoint_idl_gen idlflags += -SS -St \ @@ -72,7 +72,7 @@ project(TSEC_CheckPoint_svnt) : ciao_servant, event { project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_container, naming { - after += TSEC_CheckPoint_stub TSEC_CheckPoint_idle_gen + after += TSEC_CheckPoint_stub TSEC_CheckPoint_lem_gen after += ENW_skel ENW_stub includes += ../interfaces diff --git a/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc b/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc index 8bab05de279..cf6400373a5 100644 --- a/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc +++ b/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc @@ -15,7 +15,7 @@ project(SimpleComponent_idl_gen) : componentidldefaults { } } -project(SimpleComponent_idle_gen) : ciaoidldefaults { +project(SimpleComponent_lem_gen) : ciaoidldefaults { custom_only = 1 after += SimpleComponent_idl_gen idlflags += -Wb,export_macro=SIMPLECOMPONENT_EXEC_Export \ @@ -51,7 +51,7 @@ project(SimpleComponent_stub) : ccm_stub { } project(SimpleComponent_exec) : ciao_executor { - after += SimpleComponent_idle_gen SimpleComponent_stub + after += SimpleComponent_lem_gen SimpleComponent_stub sharedname = SimpleComponent_exec libs += SimpleComponent_stub diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc index e8b300756b4..c226fe3f7a1 100644 --- a/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc +++ b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc @@ -21,7 +21,7 @@ project(Basic_CodeGen_idl_gen) : componentidldefaults { } } -project(Basic_CodeGen_idle_gen) : ciaoidldefaults { +project(Basic_CodeGen_lem_gen) : ciaoidldefaults { custom_only = 1 after += Basic_CodeGen_idl_gen idlflags += -Wb,export_macro=CODEGEN_EXEC_Export \ @@ -57,7 +57,7 @@ project(Basic_CodeGen_stub) : ccm_stub { } project(Basic_CodeGen_exec) : ciao_executor { - after += Basic_CodeGen_idle_gen Basic_CodeGen_stub + after += Basic_CodeGen_lem_gen Basic_CodeGen_stub sharedname = CodeGen_exec libs += CodeGen_stub Basic_stub diff --git a/modules/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc b/modules/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc index 0abff91ae84..b325281994f 100644 --- a/modules/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc +++ b/modules/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc @@ -17,7 +17,7 @@ project(Cornucopia_idl_gen) : componentidldefaults { } } -project(Cornucopia_idle_gen) : ciaoidldefaults { +project(Cornucopia_lem_gen) : ciaoidldefaults { custom_only = 1 after += Cornucopia_idl_gen idlflags += -Wb,export_macro=CORNUCOPIA_EXEC_Export \ @@ -53,7 +53,7 @@ project(Cornucopia_stub) : ccm_stub { } project(Cornucopia_exec) : ciao_executor { - after += Cornucopia_idle_gen Cornucopia_stub + after += Cornucopia_lem_gen Cornucopia_stub sharedname = Cornucopia_exec libs += Cornucopia_stub diff --git a/modules/CIAO/tests/IDL_Test/Keywords/Keywords.mpc b/modules/CIAO/tests/IDL_Test/Keywords/Keywords.mpc index dce796b988e..98384d52c45 100644 --- a/modules/CIAO/tests/IDL_Test/Keywords/Keywords.mpc +++ b/modules/CIAO/tests/IDL_Test/Keywords/Keywords.mpc @@ -16,7 +16,7 @@ project(Keyword_Clash_idl_gen) : componentidldefaults { } } -project(Keyword_Clash_idle_gen) : ciaoidldefaults { +project(Keyword_Clash_lem_gen) : ciaoidldefaults { after += Keyword_Clash_idl_gen custom_only = 1 idlflags += -Wb,export_macro=KEYWORD_CLASH_EXEC_Export \ @@ -51,7 +51,7 @@ project(Keyword_Clash_stub) : ccm_stub { } project(Keyword_Clash_exec) : ciao_executor { - after += Keyword_Clash_idle_gen Keyword_Clash_stub + after += Keyword_Clash_lem_gen Keyword_Clash_stub sharedname = Keyword_Clash_exec libs += Keyword_Clash_stub diff --git a/modules/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc b/modules/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc index e899ee5091a..6f5f2f3f24f 100644 --- a/modules/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc +++ b/modules/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc @@ -16,7 +16,7 @@ project(Reused_Facet_Interface_idl_gen) : componentidldefaults { } } -project(Reused_Facet_Interface_idle_gen) : ciaoidldefaults { +project(Reused_Facet_Interface_lem_gen) : ciaoidldefaults { custom_only = 1 after += Reused_Facet_Interface_idl_gen idlflags += -Wb,export_macro=CODEGEN_EXEC_Export \ @@ -53,7 +53,7 @@ project(Reused_Facet_Interface_stub) : ccm_stub { } project(Reused_Facet_Interface_exec) : ciao_executor { - after += Reused_Facet_Interface_idle_gen Reused_Facet_Interface_stub + after += Reused_Facet_Interface_lem_gen Reused_Facet_Interface_stub sharedname = CodeGen_exec libs += CodeGen_stub Basic_stub diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc b/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc index cc8665b22ed..3c035c1b858 100644 --- a/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc @@ -15,7 +15,7 @@ project(Minimum_Base_Receiver_idl_gen) : componentidldefaults { } } -project(Minimum_Base_Receiver_idle_gen) : ciaoidldefaults { +project(Minimum_Base_Receiver_lem_gen) : ciaoidldefaults { custom_only = 1 after += Minimum_Base_Receiver_idl_gen idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \ @@ -52,7 +52,7 @@ project(Minimum_Base_Receiver_stub) : ccm_stub { } project(Minimum_Base_Receiver_exec) : ciao_executor { - after += Minimum_Base_Receiver_idle_gen Minimum_Base_Receiver_stub + after += Minimum_Base_Receiver_lem_gen Minimum_Base_Receiver_stub sharedname = Receiver_exec libs += Receiver_stub Minimum_Base_stub libpaths += ../Minimum_Base diff --git a/modules/CIAO/tests/Minimum/Sender/Sender.mpc b/modules/CIAO/tests/Minimum/Sender/Sender.mpc index 3c52172d5f1..3e1aea88bac 100644 --- a/modules/CIAO/tests/Minimum/Sender/Sender.mpc +++ b/modules/CIAO/tests/Minimum/Sender/Sender.mpc @@ -15,7 +15,7 @@ project(Minimum_Base_Sender_idl_gen) : componentidldefaults { } } -project(Minimum_Base_Sender_idle_gen) : ciaoidldefaults { +project(Minimum_Base_Sender_lem_gen) : ciaoidldefaults { custom_only = 1 after += Minimum_Base_Sender_idl_gen idlflags += -Wb,export_macro=SENDER_EXEC_Export \ @@ -53,7 +53,7 @@ project(Minimum_Base_Sender_stub) : ccm_stub { } project(Minimum_Base_Sender_exec) : ciao_executor { - after += Minimum_Base_Sender_idle_gen Minimum_Base_Sender_stub + after += Minimum_Base_Sender_lem_gen Minimum_Base_Sender_stub sharedname = Sender_exec libs += Sender_stub Minimum_Base_stub libpaths += ../Minimum_Base |