summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2011-12-09 13:43:08 +0000
committermsmit <msmit@remedy.nl>2011-12-09 13:43:08 +0000
commit0e5d8d964dca346779e6a432a4d74279566b668f (patch)
tree44d85c23294d562053849703a5002ecada3f3bc2
parent7b9189673b4d08d9fd05b0cb917d116071de3777 (diff)
downloadATCD-0e5d8d964dca346779e6a432a4d74279566b668f.tar.gz
Fri Dec 9 13:42:40 UTC 2011 Marcel Smit <msmit@remedy.nl>
* tests/Bug_3834_Regression/CompA.idl: * tests/Bug_3834_Regression/CompA.mpc: * tests/Bug_3834_Regression/Moo.idl: * tests/Bug_3834_Regression/Moo.mpc: Fixed compile issues on Linux.
-rw-r--r--CIAO/ChangeLog.BRANCH8
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompA.idl2
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompA.mpc1
-rw-r--r--CIAO/tests/Bug_3834_Regression/Moo.idl2
-rw-r--r--CIAO/tests/Bug_3834_Regression/Moo.mpc33
5 files changed, 36 insertions, 10 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index d57a3fb9355..7bd04621911 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,11 @@
+Fri Dec 9 13:42:40 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * tests/Bug_3834_Regression/CompA.idl:
+ * tests/Bug_3834_Regression/CompA.mpc:
+ * tests/Bug_3834_Regression/Moo.idl:
+ * tests/Bug_3834_Regression/Moo.mpc:
+ Fixed compile issues on Linux.
+
Fri Dec 9 13:24:31 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
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 415cab8baa3..3682f042c64 100644
--- a/CIAO/tests/Bug_3834_Regression/CompA.mpc
+++ b/CIAO/tests/Bug_3834_Regression/CompA.mpc
@@ -12,7 +12,6 @@ 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
}
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..71612ae1b0e 100644
--- a/CIAO/tests/Bug_3834_Regression/Moo.mpc
+++ b/CIAO/tests/Bug_3834_Regression/Moo.mpc
@@ -5,6 +5,8 @@ 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
@@ -14,11 +16,24 @@ project(Moo_idl_gen) : componentidldefaults {
}
}
+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_stub) : ccm_stub {
- after += Moo_idl_gen
- libs +=
-
-
+ after += Moo_idl_gen
+ libs +=
+
+
sharedname = Moo_stub
dynamicflags += MOO_STUB_BUILD_DLL
@@ -41,14 +56,14 @@ project(Moo_stub) : ccm_stub {
project(Moo_skel) : ciao_executor {
- after += Moo_stub Moo_lem_stub
+ after += Moo_stub Moo_lem_stub
sharedname = Moo_skel
libs += Moo_stub
-
-
-
+
+
+
dynamicflags += MOO_SKEL_BUILD_DLL
-
+
IDL_Files {
}