diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-18 08:26:54 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-18 08:26:54 +0200 |
| commit | ad9983b5ed5796616a511ee5ea50729108172fc1 (patch) | |
| tree | 1a29446011ef2f8b95b72730100afdc64b69d09a /ACE/bin | |
| parent | b888b487c9bb05280ad48227f00d1564e478d955 (diff) | |
| download | ATCD-ad9983b5ed5796616a511ee5ea50729108172fc1.tar.gz | |
Removed some dance leftovers
Diffstat (limited to 'ACE/bin')
| -rw-r--r-- | ACE/bin/ACE+TAO+CIAO+DAnCE.json | 3 | ||||
| -rw-r--r-- | ACE/bin/PerlACE/Process_Unix.pm | 4 | ||||
| -rwxr-xr-x | ACE/bin/fuzz.pl | 36 |
3 files changed, 0 insertions, 43 deletions
diff --git a/ACE/bin/ACE+TAO+CIAO+DAnCE.json b/ACE/bin/ACE+TAO+CIAO+DAnCE.json index 63760e06f1c..3e715a522be 100644 --- a/ACE/bin/ACE+TAO+CIAO+DAnCE.json +++ b/ACE/bin/ACE+TAO+CIAO+DAnCE.json @@ -57,9 +57,6 @@ { line_regex: "TAOLIB_DEBUG" }, { line_regex: "TAOLIB_ERROR" }, { line_regex: "TAOLIB_ERROR_RETURN" }, - { line_regex: "DANCE_DEBUG" }, - { line_regex: "DANCE_ERROR" }, - { line_regex: "DANCE_ERROR_RETURN" }, { line_regex: "TAO_debug_level" }, { line_regex: "ORBSVCS_DEBUG" }, { line_regex: "ORBSVCS_ERROR" }, diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm index e4bbdd21bd6..d6896698de4 100644 --- a/ACE/bin/PerlACE/Process_Unix.pm +++ b/ACE/bin/PerlACE/Process_Unix.pm @@ -311,10 +311,6 @@ sub CommandLine () "export LIBPATH=$libpath:.:\$LIBPATH\n". "export SHLIB_PATH=$libpath:.:\$SHLIB_PATH\n". "export PATH=\$PATH:$root/bin:$root/lib:$libpath:.\n"; - if (defined $self->{TARGET}->{dance_root}) { - $run_script .= - "export DANCE_ROOT=$self->{TARGET}->{dance_root}\n"; - } if (defined $self->{TARGET}->{ace_root}) { $run_script .= "export ACE_ROOT=$self->{TARGET}->{ace_root}\n"; diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index 3afa70e046b..aa6ea4d1303 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -1735,41 +1735,6 @@ sub check_for_generated_headers() } } -sub check_for_numeric_log() -{ - return if is_suppressed (); - - print "Running check for numeric flags in DAnCE and DDS4CCM\n"; - - foreach $file (@files_inl, @files_cpp, @files_h) { - if (open (FILE, $file)) { - while (<FILE>) { - # look for debug statements - if (m/DANCE_DEBUG\s*\(\s*\d*\s*,/) { - print_warning ("$file:$.: Found numeric log level in debug statement"); - } - if (m/DANCE_ERROR\s*\(\s*\d\s*,/) { - print_warning ("$file:$.: Found numeric log level in error statement"); - } - if (m/DANCE_TRACE_LOG\s*\(\s*\d\s*,/) { - print_warning ("$file:$.: Found numeric log level in trace log statement"); - } - if (m/DDS4CCM_DEBUG\s*\(\s*\d*\s*,/) { - print_warning ("$file:$.: Found numeric log level in debug statement"); - } - if (m/DDS4CCM_ERROR\s*\(\s*\d\s*,/) { - print_warning ("$file:$.: Found numeric log level in error statement"); - } - } - - close (FILE); - } - else { - print STDERR "Error: Could not open $file\n"; - } - } -} - # Make sure ACE_[OS_]TRACE matches the function/method sub check_for_bad_ace_trace() { @@ -2362,7 +2327,6 @@ if (!getopts ('cdx:hl:t:s:mv') || $opt_h) { check_for_ORB_init check_for_trailing_whitespace check_for_include_OS_h - check_for_numeric_log check_for_ORB_init check_for_old_documentation_style check_for_ace_log_categories |