From 3f3a702f513ec4d7c72971dd0bdc173d5dcc2a92 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 28 May 2025 15:37:21 +0200 Subject: [PATCH 1/4] Removed support for deprecated CPP_LOCATION environment variable * TAO/TAO_IDL/fe/fe_init.cpp: * TAO/docs/compiler.html: --- TAO/TAO_IDL/fe/fe_init.cpp | 19 +------------------ TAO/docs/compiler.html | 6 ------ 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index dd8e162edbd7f..8b132c2799645 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -502,24 +502,7 @@ FE_get_cpp_loc_from_env () } else { - // Check for the deprecated CPP_LOCATION environment variable - ACE_Env_Value cpp_path (ACE_TEXT ("CPP_LOCATION"), - (char *) nullptr); - - if (cpp_path != 0) - { - ACE_ERROR ((LM_WARNING, - "WARNING: The environment variable " - "CPP_LOCATION has been deprecated.\n" - " Please use TAO_IDL_PREPROCESSOR " - "instead.\n")); - - cpp_loc = cpp_path; - } - else - { - cpp_loc = idl_global->cpp_location (); - } + cpp_loc = idl_global->cpp_location (); } return cpp_loc; diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index eaa53ba1a27d1..6ca6270989d04 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -157,12 +157,6 @@

Generated Files

by setting the environment variables TAO_IDL_PREPROCESSOR and TAO_IDL_PREPROCESSOR_ARGS.

-

In previous versions, the environment variables CPP_LOCATION and -TAO_IDL_DEFAULT_CPP_FLAGS were used for this purpose. Both will still work, -but TAO_IDL will display a deprecation warning if it detects one of these. -It is possible that support for these old variables will be removed in a -future version of TAO.

-

If ACE_ROOT or TAO_ROOT are defined, then TAO_IDL will use them to include the $(ACE_ROOT)/TAO/tao or $(TAO_ROOT)/tao directories. This is to allow TAO_IDL to automatically find From 802e0e9add924aa588b9c3e904ef80b588488315 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 28 May 2025 15:38:07 +0200 Subject: [PATCH 2/4] List change * TAO/NEWS: --- TAO/NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/TAO/NEWS b/TAO/NEWS index 90fb05dd2dc98..fff3d4dbbf3ee 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -7,6 +7,7 @@ USER VISIBLE CHANGES BETWEEN TAO-4.0.3 and TAO-4.0.4 builtin backend doesn't enforce the bound . Support for using maps in unions, sequences, and arrays . Fix memory leaks caused by maps + . Support for deprecated CPP_LOCATION environment variable has been removed USER VISIBLE CHANGES BETWEEN TAO-4.0.2 and TAO-4.0.3 ==================================================== From cdfb84cd0f4610c5469d073228e3f947585f05cd Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 28 May 2025 15:44:43 +0200 Subject: [PATCH 3/4] Zap TAO_IDL_DEFAULT_CPP_FLAGS * TAO/NEWS: * TAO/TAO_IDL/fe/fe_init.cpp: --- TAO/NEWS | 3 ++- TAO/TAO_IDL/fe/fe_init.cpp | 19 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/TAO/NEWS b/TAO/NEWS index fff3d4dbbf3ee..3ab6549a9707b 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -7,7 +7,8 @@ USER VISIBLE CHANGES BETWEEN TAO-4.0.3 and TAO-4.0.4 builtin backend doesn't enforce the bound . Support for using maps in unions, sequences, and arrays . Fix memory leaks caused by maps - . Support for deprecated CPP_LOCATION environment variable has been removed + . Support for deprecated CPP_LOCATION and TAO_IDL_DEFAULT_CPP_FLAGS environment + variables has been removed USER VISIBLE CHANGES BETWEEN TAO-4.0.2 and TAO-4.0.3 ==================================================== diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index 8b132c2799645..e0bca2175b65e 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -521,25 +521,6 @@ FE_get_cpp_args_from_env () { cpp_args = args1; } - else - { - // Check for the deprecated TAO_IDL_DEFAULT_CPP_FLAGS environment - // variable. - ACE_Env_Value args2 (ACE_TEXT ("TAO_IDL_DEFAULT_CPP_FLAGS"), - (char *) nullptr); - - if (args2 != 0) - { - ACE_ERROR ((LM_WARNING, - "Warning: The environment variable " - "TAO_IDL_DEFAULT_CPP_FLAGS has been " - "deprecated.\n" - " Please use " - "TAO_IDL_PREPROCESSOR_ARGS instead.\n")); - - cpp_args = args2; - } - } return cpp_args; } From 3c141748f650d781a50d7d1ea7f656c09162a70a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 28 May 2025 15:53:17 +0200 Subject: [PATCH 4/4] Updated wording * TAO/NEWS: --- TAO/NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TAO/NEWS b/TAO/NEWS index 3ab6549a9707b..88849b71b645a 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -7,8 +7,8 @@ USER VISIBLE CHANGES BETWEEN TAO-4.0.3 and TAO-4.0.4 builtin backend doesn't enforce the bound . Support for using maps in unions, sequences, and arrays . Fix memory leaks caused by maps - . Support for deprecated CPP_LOCATION and TAO_IDL_DEFAULT_CPP_FLAGS environment - variables has been removed + . Removed support for deprecated CPP_LOCATION and TAO_IDL_DEFAULT_CPP_FLAGS + environment variables USER VISIBLE CHANGES BETWEEN TAO-4.0.2 and TAO-4.0.3 ====================================================