summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-05-29 09:22:48 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-05-29 09:22:48 +0200
commit2c5a1fd94d2e4d40ba2011c9883a511933b35fa9 (patch)
tree30acaf9856e73714803b6a9ffdbe16fa2c43e312 /ACE/include/makeinclude
parentecf8b66600e449e853d2b55c92b60172cf0c540b (diff)
downloadATCD-2c5a1fd94d2e4d40ba2011c9883a511933b35fa9.tar.gz
Removed support for tao_idl3_to_idl2 and tao_idl3_to_xml now that CIAO is archived, wasn't supported for a longer time already
* ACE/bin/MakeProjectCreator/docs/templates/gnu.txt: * ACE/bin/MakeProjectCreator/templates/gnu.mpd: * ACE/include/makeinclude/platform_clang_common.GNU: * ACE/include/makeinclude/platform_g++_common.GNU: * ACE/include/makeinclude/platform_macosx_iOS.GNU: * ACE/include/makeinclude/platform_rtems.x_g++.GNU: * ACE/include/makeinclude/platform_vxworks6.2.GNU: * ACE/include/makeinclude/platform_vxworks6.3.GNU: * ACE/include/makeinclude/platform_vxworks7.0.GNU:
Diffstat (limited to 'ACE/include/makeinclude')
-rw-r--r--ACE/include/makeinclude/platform_clang_common.GNU4
-rw-r--r--ACE/include/makeinclude/platform_g++_common.GNU4
-rw-r--r--ACE/include/makeinclude/platform_macosx_iOS.GNU4
-rw-r--r--ACE/include/makeinclude/platform_rtems.x_g++.GNU2
-rw-r--r--ACE/include/makeinclude/platform_vxworks6.2.GNU3
-rw-r--r--ACE/include/makeinclude/platform_vxworks6.3.GNU3
-rw-r--r--ACE/include/makeinclude/platform_vxworks7.0.GNU3
7 files changed, 1 insertions, 22 deletions
diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU
index b9c77141d68..e466c595693 100644
--- a/ACE/include/makeinclude/platform_clang_common.GNU
+++ b/ACE/include/makeinclude/platform_clang_common.GNU
@@ -19,10 +19,6 @@ ifneq ($(CROSS_COMPILE),)
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)/bin/tao_idl3_to_idl2
- TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
- 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 host compiler, not the cross-compiler
# as preprocessor for the cross-compiled idl tools
TAO_IDL_PREPROCESSOR = clang
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index 9a1b0593e00..5deb509623d 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -17,10 +17,6 @@ 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)/bin/tao_idl3_to_idl2
- TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
- 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 host compiler, not the cross-compiler
# as preprocessor for the cross-compiled idl tools
TAO_IDL_PREPROCESSOR = gcc
diff --git a/ACE/include/makeinclude/platform_macosx_iOS.GNU b/ACE/include/makeinclude/platform_macosx_iOS.GNU
index c0acc1f9143..3b375e5db0a 100644
--- a/ACE/include/makeinclude/platform_macosx_iOS.GNU
+++ b/ACE/include/makeinclude/platform_macosx_iOS.GNU
@@ -10,7 +10,7 @@ else
endif
ifndef IPHONE_TARGET
- $(error Please set IPHONE_TARGET to SIMULATOR or HARDWARE)
+ $(error Please set IPHONE_TARGET to SIMULATOR or HARDWARE)
endif
ifeq ($(IPHONE_TARGET), SIMULATOR)
@@ -62,9 +62,7 @@ CCFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK)
ifneq (,$(HOST_ROOT))
TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf
TAO_IDL = $(HOST_ROOT)/bin/tao_idl
- 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)
# make sure to use the target compiler, not the cross-compiler
# as preprocessor for the cross-compiled idl tools
TAO_IDL_PREPROCESSOR = clang
diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
index 1214ac30a68..2f61e6a647e 100644
--- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
@@ -14,9 +14,7 @@ rwho = 0
ifneq (,$(HOST_ROOT))
TAO_IDL = $(HOST_ROOT)/bin/tao_idl
- 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
ifeq (,$(RTEMS_MAKEFILE_PATH))
diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU
index 21e7489a9c1..8ab8fd3707d 100644
--- a/ACE/include/makeinclude/platform_vxworks6.2.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU
@@ -67,13 +67,10 @@ 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)/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
endif
TAO_IDL_DEP = $(TAO_IDL)
-TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
endif
HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index bd6366bc81a..d6d047ca3f7 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -68,13 +68,10 @@ 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)/bin/tao_idl3_to_idl2$(HOST_EXE_EXT)
TAO_IDL_DEP = $(TAO_IDL)
-TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
else
# Append the HOST_EXE_EXT if it's not already there
TAO_IDL_DEP = $(TAO_IDL:$(HOST_EXE_EXT)=)$(HOST_EXE_EXT)
-TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2:$(HOST_EXE_EXT)=)$(HOST_EXE_EXT)
endif
HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU
index 3a698197aaf..ababc0ae6f0 100644
--- a/ACE/include/makeinclude/platform_vxworks7.0.GNU
+++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU
@@ -65,13 +65,10 @@ 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)/bin/tao_idl3_to_idl2$(HOST_EXE_EXT)
TAO_IDL_DEP = $(TAO_IDL)
- TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
else
# Append the HOST_EXE_EXT if it's not already there
TAO_IDL_DEP = $(TAO_IDL:$(HOST_EXE_EXT)=)$(HOST_EXE_EXT)
- TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2:$(HOST_EXE_EXT)=)$(HOST_EXE_EXT)
endif
VXWORKS_VERSION_FLAG ?= -DACE_VXWORKS=0x700