Skip to content

Support for deprecated CPP_LOCATION environment variable has been removed #2387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwillemsen merged 4 commits into from
May 28, 2025
Merged

Support for deprecated CPP_LOCATION environment variable has been removed #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f3a702
Removed support for deprecated CPP_LOCATION environment variable
jwillemsen May 28, 2025
802e0e9
List change
jwillemsen May 28, 2025
cdfb84c
Zap TAO_IDL_DEFAULT_CPP_FLAGS
jwillemsen May 28, 2025
3c14174
Updated wording
jwillemsen May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions TAO/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +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
. 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
====================================================
Expand Down
38 changes: 1 addition & 37 deletions TAO/TAO_IDL/fe/fe_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,24 +502,7 @@ FE_get_cpp_loc_from_env ()
}
else
{
// Check for the deprecated CPP_LOCATION environment variable
ACE_Env_Value<char*> 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;
Expand All @@ -538,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<char*> 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;
}
6 changes: 0 additions & 6 deletions TAO/docs/compiler.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,6 @@ <h3>Generated Files</h3>
by setting the environment variables TAO_IDL_PREPROCESSOR and
TAO_IDL_PREPROCESSOR_ARGS.</P>

<P>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.</P>

<P>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
Expand Down
Loading