diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-12-19 14:46:42 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-12-19 14:46:42 +0000 |
| commit | 6cd19c341da802ba7b1548181089eecf695a1af8 (patch) | |
| tree | 4860bd1c45c7341fd7abcaf65213058d95b96b10 | |
| parent | d6166ddc530fb08d951878b274ed19e17539d793 (diff) | |
| download | ATCD-6cd19c341da802ba7b1548181089eecf695a1af8.tar.gz | |
Wed Dec 19 14:46:24 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_cegcc.GNU:
* include/makeinclude/platform_g++_common.GNU:
* include/makeinclude/platform_rtems.x_g++.GNU:
* include/makeinclude/platform_vxworks6.2.GNU:
* include/makeinclude/platform_vxworks6.3.GNU:
Install tao_idl3_to_idl2 and tao_idl3_to_xmi into ACE_ROOT/bin
to handle cross compilation in a flat layout more easily, this
way we can use the same approach as tao_idl does
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_cegcc.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_g++_common.GNU | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_rtems.x_g++.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.2.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 2 |
6 files changed, 17 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 99160af4af8..68fe7c3ccc1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Wed Dec 19 14:46:24 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_cegcc.GNU: + * include/makeinclude/platform_g++_common.GNU: + * include/makeinclude/platform_rtems.x_g++.GNU: + * include/makeinclude/platform_vxworks6.2.GNU: + * include/makeinclude/platform_vxworks6.3.GNU: + Install tao_idl3_to_idl2 and tao_idl3_to_xmi into ACE_ROOT/bin + to handle cross compilation in a flat layout more easily, this + way we can use the same approach as tao_idl does + Mon Dec 17 20:53:22 UTC 2012 Adam Mitz <mitza@ociweb.com> * ace/Message_Queue_Vx.inl: diff --git a/ACE/include/makeinclude/platform_cegcc.GNU b/ACE/include/makeinclude/platform_cegcc.GNU index a5502a40167..67f6c77e585 100644 --- a/ACE/include/makeinclude/platform_cegcc.GNU +++ b/ACE/include/makeinclude/platform_cegcc.GNU @@ -50,7 +50,7 @@ endif ifneq (,$(HOST_ROOT)) TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf TAO_IDL = $(HOST_ROOT)/bin/tao_idl$(HOST_EXE_EXT) -TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2$(HOST_EXE_EXT) +TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2$(HOST_EXE_EXT) TAO_IDL_DEP = $(TAO_IDL) TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) else diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index 4a856fa6cd5..73f9235a690 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -29,9 +29,9 @@ else TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf TAO_IDL = $(HOST_ROOT)/bin/tao_idl TAO_IDL_DEP = $(TAO_IDL) - TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2 + TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2 TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) - TAO_IDL3_TO_XMI = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_xmi + TAO_IDL3_TO_XMI = $(HOST_ROOT)/bin/tao_idl3_to_xmi TAO_IDL3_TO_XMI_DEP = $(TAO_IDL3_TO_XMI) # make sure to use the target compiler, not the cross-compiler # as preprocessor for the cross-compiled idl tools diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU index 785c1a9d197..4c4636d425c 100644 --- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU +++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU @@ -15,7 +15,7 @@ rwho = 0 ifneq (,$(HOST_ROOT)) TAO_IDL = $(HOST_ROOT)/bin/tao_idl - TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2 + TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2 TAO_IDL_DEP = $(TAO_IDL) TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) endif diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU index ff77b1b63a1..040f9740fea 100644 --- a/ACE/include/makeinclude/platform_vxworks6.2.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU @@ -68,7 +68,7 @@ ifneq (,$(HOST_ROOT)) TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf ifeq ("$(WIND_HOST_TYPE)","x86-win32") TAO_IDL = $(HOST_ROOT)/bin/tao_idl.exe - TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2.exe + TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2.exe else TAO_IDL = $(HOST_ROOT)/bin/tao_idl TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2 diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index 05b3914782f..35302b9a078 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -69,7 +69,7 @@ endif # x86-win32 ifneq (,$(HOST_ROOT)) TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf TAO_IDL = $(HOST_ROOT)/bin/tao_idl$(HOST_EXE_EXT) -TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2$(HOST_EXE_EXT) +TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2$(HOST_EXE_EXT) TAO_IDL_DEP = $(TAO_IDL) TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) else |