summarylogtreecommitdiffstats
path: root/build.patch
diff options
context:
space:
mode:
Diffstat (limited to 'build.patch')
-rw-r--r--build.patch165
1 files changed, 93 insertions, 72 deletions
diff --git a/build.patch b/build.patch
index fcf9dfd4fda6..3497610ebbd5 100644
--- a/build.patch
+++ b/build.patch
@@ -1,101 +1,122 @@
-diff -up src/ACE_wrappers/TAO/CIAO/ccm/CCM_stub.mpc.orig src/ACE_wrappers/TAO/CIAO/ccm/CCM_stub.mpc
---- src/ACE_wrappers/TAO/CIAO/ccm/CCM_stub.mpc.orig 2014-09-25 02:05:52.000000000 -0600
-+++ src/ACE_wrappers/TAO/CIAO/ccm/CCM_stub.mpc 2014-09-25 02:06:05.000000000 -0600
-@@ -140,7 +140,7 @@ project(CCM_stub) : install, ciaolib_wit
- }
+--- src/OpenDDS/DDS_TAOv2.mwc.1
++++ src/OpenDDS/DDS_TAOv2.mwc
+@@ -24,7 +24,6 @@ workspace {
+ dds
+ tools
+ java
+- DevGuideExamples
- verbatim(gnuace, postinstall) {
--" $(MKDIR) $(INSTALL_PREFIX)/share/ciao/ccm"
--" ln -sf $(INSTALL_PREFIX)/include/ccm/Components.idl $(INSTALL_PREFIX)/share/ciao/ccm"
-+" $(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ciao/ccm"
-+" ln -sf $(INSTALL_PREFIX)/include/ccm/Components.idl $(DESTDIR)$(INSTALL_PREFIX)/share/ciao/ccm"
- }
- }
-diff -up src/ACE_wrappers/TAO/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc.orig src/ACE_wrappers/TAO/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
---- src/ACE_wrappers/TAO/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc.orig 2014-09-25 02:10:36.000000000 -0600
-+++ src/ACE_wrappers/TAO/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc 2014-09-25 02:11:06.000000000 -0600
-@@ -22,7 +22,7 @@ project (CIAO_NDDS_idl_gen) : install, n
+ exclude {
+ java/jms
+--- src/ACE_wrappers/TAO/TAO_IDL/tao_idl.mpc
++++ src/ACE_wrappers/TAO/TAO_IDL/tao_idl.mpc
+@@ -42,7 +42,8 @@
+ " ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
+ "ifeq ($(shared_libs),1)"
+ " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
+-" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
++" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_FE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
++" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_BE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
+ "endif"
}
- verbatim(gnuace, postinstall) {
--" cp ndds_dcps_instance_handle.idl $(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/"
-+" cp ndds_dcps_instance_handle.idl $(DESTDIR)$(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/"
+--- src/OpenDDS/dds/DdsDcps.mpc
++++ src/OpenDDS/dds/DdsDcps.mpc
+@@ -80,15 +80,10 @@ project(OpenDDS_Dcps): core, coverage_optional, \
+ ../rules.dds.GNU
}
- }
-@@ -68,8 +68,8 @@ project (CIAO_NDDS_idl_install_only) {
+- InstallData_Files {
+- gendir = bin
+- ../bin/PerlDDS
+- }
+-
+ verbatim(gnuace, postinstall) {
+-" echo export DDS_ROOT=$(DESTDIR)$(INSTALL_PREFIX)/share/dds> $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds-devel.sh"
++" echo export DDS_ROOT=$(INSTALL_PREFIX)/share/dds> $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds-devel.sh"
+ " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
+-" ln -sf $(DESTDIR)$(INSTALL_PREFIX)/include/dds/Version.h $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
++" ln -sf $(INSTALL_PREFIX)/include/dds/Version.h $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
+ " cp $(DDS_ROOT)/user_macros.GNU $(DESTDIR)$(INSTALL_PREFIX)/share/dds $(ACE_NUL_STDERR)"
+ " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/$(INSTALL_LIB)/cmake/OpenDDS"
+ " cp $(DDS_ROOT)/cmake/*.cmake $(DESTDIR)$(INSTALL_PREFIX)/$(INSTALL_LIB)/cmake/OpenDDS"
+--- src/OpenDDS/dds/idl/opendds_idl.mpc
++++ src/OpenDDS/dds/idl/opendds_idl.mpc
+@@ -35,7 +35,7 @@ project: aceexe, dds_macros, crosscompile, install {
- verbatim(gnuace, bottom) {
- "install:"
--" $(MKDIR) $(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
--" cp *.idl $(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
-+" $(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
-+" cp *.idl $(DESTDIR)$(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
+ verbatim(gnuace, postinstall) {
+ " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
+-" ln -sf $(DESTDIR)$(INSTALL_PREFIX)/bin/opendds_idl $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
++" ln -sf $(INSTALL_PREFIX)/bin/opendds_idl $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
}
}
-diff -up src/ACE_wrappers/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc.orig src/ACE_wrappers/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
---- src/ACE_wrappers/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc.orig 2014-09-25 02:12:05.000000000 -0600
-+++ src/ACE_wrappers/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc 2014-09-25 02:12:12.000000000 -0600
-@@ -69,7 +69,7 @@ project(TAO_IDL3_TO_IDL2_EXE) : aceexe,
+--- src/OpenDDS/java/dds/dcps_java.mpc
++++ src/OpenDDS/java/dds/dcps_java.mpc
+@@ -112,6 +112,6 @@ project: idl2jni, javah, dcpslib, optional_jni_check, dcps_java_optional, dcps_t
+ " cp $(DDS_ROOT)/lib/OpenDDS_DCPS.jar $(INSTALL_PREFIX)/lib"
+ " perl -pi -e 's!\\$$[(]DDS_ROOT[)]/lib!$(INSTALL_PREFIX)/lib!g' $(DESTDIR)$(INSTALL_PREFIX)/share/dds/MPC/config/idl2jni.mpb"
+ " perl -pi -e 's!\\$$[(]DDS_ROOT[)]/lib!$(INSTALL_PREFIX)/lib!g' $(DESTDIR)$(INSTALL_PREFIX)/share/dds/MPC/config/dcps_java.mpb"
+-" rm $(INSTALL_PREFIX)/dds/*.idl && rmdir $(INSTALL_PREFIX)/dds"
++" rm $(DESTDIR)$(INSTALL_PREFIX)/dds/*.idl && rmdir $(DESTDIR)$(INSTALL_PREFIX)/dds"
+ }
+ }
+--- src/OpenDDS/java/dds/dcps_java.mpc
++++ src/OpenDDS/java/dds/dcps_java.mpc
+@@ -109,7 +109,7 @@ project: idl2jni, javah, dcpslib, optional_jni_check, dcps_java_optional, dcps_t
}
verbatim(gnuace, postinstall) {
--" @$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin"
--" ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_idl2 $(INSTALL_PREFIX)/share/ace/bin"
-+" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
-+" ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_idl2 $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
- }
- }
-diff -up src/ACE_wrappers/TAO/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc.orig src/ACE_wrappers/TAO/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
---- src/ACE_wrappers/TAO/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc.orig 2014-09-25 02:11:33.000000000 -0600
-+++ src/ACE_wrappers/TAO/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc 2014-09-25 02:11:44.000000000 -0600
-@@ -64,7 +64,7 @@ project(CIAO_IDL3_TO_XMI_EXE) : aceexe,
+-" cp $(DDS_ROOT)/lib/OpenDDS_DCPS.jar $(INSTALL_PREFIX)/lib"
++" cp $(DDS_ROOT)/lib/OpenDDS_DCPS.jar $(DESTDIR)$(INSTALL_PREFIX)/lib"
+ " perl -pi -e 's!\\$$[(]DDS_ROOT[)]/lib!$(INSTALL_PREFIX)/lib!g' $(DESTDIR)$(INSTALL_PREFIX)/share/dds/MPC/config/idl2jni.mpb"
+ " perl -pi -e 's!\\$$[(]DDS_ROOT[)]/lib!$(INSTALL_PREFIX)/lib!g' $(DESTDIR)$(INSTALL_PREFIX)/share/dds/MPC/config/dcps_java.mpb"
+ " rm $(DESTDIR)$(INSTALL_PREFIX)/dds/*.idl && rmdir $(DESTDIR)$(INSTALL_PREFIX)/dds"
+--- src/OpenDDS/java/idl2jni/codegen/idl2jni_codegen.mpc
++++ src/OpenDDS/java/idl2jni/codegen/idl2jni_codegen.mpc
+@@ -22,7 +22,7 @@ project: aceexe, crosscompile, dds_macros, install {
}
verbatim(gnuace, postinstall) {
--" @$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin"
--" ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_xmi $(INSTALL_PREFIX)/share/ace/bin"
-+" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
-+" ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_xmi $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
+-" @$(MKDIR) $(INSTALL_PREFIX)/share/dds/bin"
+-" ln -sf $(INSTALL_PREFIX)/bin/idl2jni $(INSTALL_PREFIX)/share/dds/bin"
++" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
++" ln -sf $(INSTALL_PREFIX)/bin/idl2jni $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
}
}
-diff -up src/ACE_wrappers/TAO/DAnCE/dance/DAnCE_Properties.mpc.orig src/ACE_wrappers/TAO/DAnCE/dance/DAnCE_Properties.mpc
---- src/ACE_wrappers/TAO/DAnCE/dance/DAnCE_Properties.mpc.orig 2014-09-25 02:14:45.000000000 -0600
-+++ src/ACE_wrappers/TAO/DAnCE/dance/DAnCE_Properties.mpc 2014-09-25 02:15:27.000000000 -0600
-@@ -24,8 +24,8 @@ project(DAnCE_Properties_IDL) : install,
+--- src/OpenDDS/java/idl2jni/compact/idl2jni_compact.mpc
++++ src/OpenDDS/java/idl2jni/compact/idl2jni_compact.mpc
+@@ -13,6 +13,6 @@ project: java, dds_macros, install {
}
verbatim(gnuace, postinstall) {
--" cp ../rules.dance.GNU $(INSTALL_PREFIX)/share/dance"
--" perl -i -pe's!\\$$[{(]DANCE_ROOT[})]!$(INSTALL_PREFIX)/include!g;' $(INSTALL_PREFIX)/share/dance/rules.dance.GNU"
--" echo export DANCE_ROOT=$(INSTALL_PREFIX)/share/dance> $(INSTALL_PREFIX)/share/dance/dance-devel.sh"
-+" cp ../rules.dance.GNU $(DESTDIR)$(INSTALL_PREFIX)/share/dance"
-+" perl -i -pe's!\\$$[{(]DANCE_ROOT[})]!$(INSTALL_PREFIX)/include!g;' $(DESTDIR)$(INSTALL_PREFIX)/share/dance/rules.dance.GNU"
-+" echo export DANCE_ROOT=$(INSTALL_PREFIX)/share/dance> $(DESTDIR)$(INSTALL_PREFIX)/share/dance/dance-devel.sh"
+-" cp $(DDS_ROOT)/lib/i2jrt_compact.jar $(INSTALL_PREFIX)/lib"
++" cp $(DDS_ROOT)/lib/i2jrt_compact.jar $(DESTDIR)$(INSTALL_PREFIX)/lib"
}
}
-diff -up src/ACE_wrappers/TAO/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc.orig src/ACE_wrappers/TAO/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc
---- src/ACE_wrappers/TAO/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc.orig 2014-09-25 02:14:07.000000000 -0600
-+++ src/ACE_wrappers/TAO/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc 2014-09-25 02:14:15.000000000 -0600
-@@ -34,6 +34,6 @@ project (DAnCE_LocalityManager_Exec) : d
+--- src/OpenDDS/java/idl2jni/runtime/idl2jni_runtime.mpc
++++ src/OpenDDS/java/idl2jni/runtime/idl2jni_runtime.mpc
+@@ -24,9 +24,9 @@ project: taolib, java, javah, optional_jni_check, dds_macros, i2jrt_optional, in
}
verbatim(gnuace, postinstall) {
--" cp Locality_Manager_Task.cpp Locality_Manager.cpp Locality_Manager_Task.h $(INSTALL_PREFIX)/include/dance/LocalityManager/Daemon"
-+" cp Locality_Manager_Task.cpp Locality_Manager.cpp Locality_Manager_Task.h $(DESTDIR)$(INSTALL_PREFIX)/include/dance/LocalityManager/Daemon"
+-" cp $(DDS_ROOT)/lib/i2jrt.jar $(INSTALL_PREFIX)/lib"
+-" @$(MKDIR) $(INSTALL_PREFIX)/share/dds/java/build_scripts"
+-" cp ../../build_scripts/java?_wrapper.pl $(INSTALL_PREFIX)/share/dds/java/build_scripts"
+-" cp *.h $(INSTALL_PREFIX)/share/dds/java"
++" cp $(DDS_ROOT)/lib/i2jrt.jar $(DESTDIR)$(INSTALL_PREFIX)/lib"
++" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/java/build_scripts"
++" cp ../../build_scripts/java?_wrapper.pl $(DESTDIR)$(INSTALL_PREFIX)/share/dds/java/build_scripts"
++" cp *.h $(DESTDIR)$(INSTALL_PREFIX)/share/dds/java"
}
}
-diff -up src/ACE_wrappers/TAO/TAO_IDL/tao_idl.mpc.orig src/ACE_wrappers/TAO/TAO_IDL/tao_idl.mpc
---- src/ACE_wrappers/TAO/TAO_IDL/tao_idl.mpc.orig 2014-09-25 02:13:01.000000000 -0600
-+++ src/ACE_wrappers/TAO/TAO_IDL/tao_idl.mpc 2014-09-25 02:13:33.000000000 -0600
-@@ -36,7 +36,8 @@ project(TAO_IDL_EXE) : aceexe, install,
- " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
- " ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
- " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
--" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
-+" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_FE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
-+" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_BE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
+--- src/OpenDDS/java/tao/tao_java.mpc
++++ src/OpenDDS/java/tao/tao_java.mpc
+@@ -34,6 +34,6 @@ project: taolib, idl2jni, install {
}
- Source_Files {
+ verbatim(gnuace, postinstall) {
+-" cp $(DDS_ROOT)/lib/tao_java.jar $(INSTALL_PREFIX)/lib"
++" cp $(DDS_ROOT)/lib/tao_java.jar $(DESTDIR)$(INSTALL_PREFIX)/lib"
+ }
+ }