From 45ab1034d3fe2ed1bb95ab32e73e5bc30d852085 Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 16:34:38 +0200
Subject: [PATCH] 'CMakeLists.txt' (Scripts-00-01-92)
* Tagging Scripts-00-01-92.
* cmt/completion/setup_completion.bash,
share/lookup_local_joboptions.sh: Fix completion for references to
files not in the current directory.
2016-02-26 scott snyder <snyder@bnl.gov>
* Tagging Scripts-00-01-91.
* share/checkDbgSymbols.sh (filter): Ignore gtest libraries.
2016-01-28 Stewart Martin-Haugh <smh@cern.ch>
* Tagging Scripts-00-01-90.
* cmt/requirements: remove unparsed comment for cmt2cmake
2015-10-20 scott snyder <snyder@bnl.gov>
* Tagging Scripts-00-01-89.
ignore.
...
(Long ChangeLog diff - truncated)
---
Tools/Scripts/CMakeLists.txt | 16 ++++++++++++++++
.../Scripts/cmt/completion/setup_completion.bash | 2 +-
Tools/Scripts/cmt/requirements | 1 -
Tools/Scripts/share/checkDbgSymbols.sh | 2 +-
Tools/Scripts/share/lookup_local_joboptions.sh | 4 +---
5 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 Tools/Scripts/CMakeLists.txt
diff --git a/Tools/Scripts/CMakeLists.txt b/Tools/Scripts/CMakeLists.txt
new file mode 100644
index 00000000000..97ca5f0fe92
--- /dev/null
+++ b/Tools/Scripts/CMakeLists.txt
@@ -0,0 +1,16 @@
+################################################################################
+# Package: Scripts
+################################################################################
+
+# Declare the package name:
+atlas_subdir( Scripts )
+
+# this line failed automatic conversion in cmt2cmake :
+# setup_script $(SETUPCOMPLETIONROOT)/cmt/completion/setup_completion_main
+
+# Install files from the package:
+atlas_install_scripts( share/get_joboptions share/get_files share/lookup_local_joboptions.sh share/lookup_joboptions.sh share/lookup_scripts.sh share/lookup_xmls.sh share/lookup_data.sh share/checkDbgSymbols.sh )
+
+athena_env( SET DO_EXT_ATHENA_TAB_COMPLETION 0
+ SET SETUPCOMPLETIONROOT \\\${SCRIPTSROOT} )
+
diff --git a/Tools/Scripts/cmt/completion/setup_completion.bash b/Tools/Scripts/cmt/completion/setup_completion.bash
index 25caa0a6301..20be51e55b0 100755
--- a/Tools/Scripts/cmt/completion/setup_completion.bash
+++ b/Tools/Scripts/cmt/completion/setup_completion.bash
@@ -94,7 +94,7 @@ if [ "${DO_EXT_ATHENA_TAB_COMPLETION:-}" = 1 ]; then
complete -C lookup_joboptions.sh -X '!&*' athena athena.py
else
# echo "do only local completion for athena"
- complete -C lookup_local_joboptions.sh -X '!&*' athena athena.py
+ complete -C lookup_local_joboptions.sh -X '!&*' -o dirnames athena athena.py
fi
complete -F f_get_txtjoboptions check_joboptions
#complete -F f_get_pyjoboptions athena.py
diff --git a/Tools/Scripts/cmt/requirements b/Tools/Scripts/cmt/requirements
index 7a5b2c5c7f4..7954c327cb6 100755
--- a/Tools/Scripts/cmt/requirements
+++ b/Tools/Scripts/cmt/requirements
@@ -22,7 +22,6 @@ use AtlasPolicy AtlasPolicy-*
apply_pattern declare_scripts files="get_joboptions get_files \
lookup_local_joboptions.sh \
lookup_joboptions.sh lookup_scripts.sh lookup_xmls.sh lookup_data.sh \
-# setup_completion.zsh setup_completion.tcsh setup_completion.bash \
checkDbgSymbols.sh"
# Source the tab completion script for jobOptions and other files
diff --git a/Tools/Scripts/share/checkDbgSymbols.sh b/Tools/Scripts/share/checkDbgSymbols.sh
index 9257325da44..1d9e2b34c2c 100755
--- a/Tools/Scripts/share/checkDbgSymbols.sh
+++ b/Tools/Scripts/share/checkDbgSymbols.sh
@@ -13,7 +13,7 @@ fi
# Ignore these libraries (regexp)
filter='HepMC|libfastjet|libCDFConesPlugin|libSISConePlugin|libsiscone|libulxmlrpcpp|libG4processes|libModelInteractions|libCascade_i|libMCTester_i|
-|libColMan|libATLASConePlugin|libCMSIterativeConePlugin|libD0RunIIConePlugin|libEECambridgePlugin|libJadePlugin|libNestedDefsPlugin|libPxConePlugin|libTrackJetPlugin|libtbb'
+|libColMan|libATLASConePlugin|libCMSIterativeConePlugin|libD0RunIIConePlugin|libEECambridgePlugin|libJadePlugin|libNestedDefsPlugin|libPxConePlugin|libTrackJetPlugin|libtbb|libtcmalloc|libfftw3f|libprofiler|libgmock|libgtest'
ignored=''
dbglibs=''
diff --git a/Tools/Scripts/share/lookup_local_joboptions.sh b/Tools/Scripts/share/lookup_local_joboptions.sh
index 05e56a69bf8..a45c96fa24a 100755
--- a/Tools/Scripts/share/lookup_local_joboptions.sh
+++ b/Tools/Scripts/share/lookup_local_joboptions.sh
@@ -1,3 +1 @@
-
-f=`pwd`
-if test -d ${f} ; then find ${f} -name '*.py' -o -name '*.pyc' | sed -e 's#'"${f}"'/##'; fi
+find ${2}* -maxdepth 0 -name "*.py" -o -name "*.pyc" 2>/dev/null
--
GitLab