From 0ec560082fba4e95c11eeaa6608393aacc69c24f Mon Sep 17 00:00:00 2001
From: Rosen Matev <rosen.matev@cern.ch>
Date: Sat, 5 Mar 2022 00:14:10 +0100
Subject: [PATCH] Change ENV_CMAKE_SOURCE_DIR -> ENV_PROJECT_SOURCE_DIR
so that things work in a super project build
---
Gaudi/tests/qmtest/gaudi.qms/bug_37488.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/bug_45517.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/bug_61144.qmt | 2 +-
.../qmtest/gaudi.qms/case_sensitivity.qmt | 4 +-
Gaudi/tests/qmtest/gaudi.qms/conf_to_str.qmt | 2 +-
.../tests/qmtest/gaudi.qms/export_oldopts.qmt | 2 +-
.../gaudi.qms/export_oldopts_special.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/import_opts.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/import_py.qmt | 2 +-
.../tests/qmtest/gaudi.qms/import_py_err.qmt | 4 +-
Gaudi/tests/qmtest/gaudi.qms/issue_188.qmt | 2 +-
.../qmtest/gaudi.qms/minimal_gaudi_exe.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/override1.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/override2.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/pickle_read.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/pickle_write.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/purge.qmt | 2 +-
Gaudi/tests/qmtest/gaudi.qms/reference.qmt | 2 +-
GaudiAlg/doc/Html.cfg | 34 ++++++-------
GaudiAlg/doc/LaTex.cfg | 48 +++++++++----------
.../qmtest/gaudiexamples.qms/abort_event.qmt | 6 +--
.../qmtest/gaudiexamples.qms/aida2rootex.qmt | 8 ++--
.../gaudiexamples.qms/array_properties.qmt | 2 +-
.../auditors_user_timing.qmt | 4 +-
.../chronostatsvc.qms/per_event_file.qmt | 2 +-
.../qmtest/gaudiexamples.qms/colormsg_py.qmt | 2 +-
.../conditional_output.qms/write.qmt | 6 +--
.../gaudiexamples.qms/configurableuser.qmt | 2 +-
.../control_flow.qms/algsequencer.qmt | 4 +-
.../superalg_dynamic_graph.qmt | 4 +-
.../control_flow.qms/superalgorithm.qmt | 4 +-
.../qmtest/gaudiexamples.qms/counter.qmt | 6 +--
.../custom_app_from_python.qmt | 2 +-
.../gaudiexamples.qms/event_timeout.qmt | 2 +-
.../gaudiexamples.qms/event_timeout_abort.qmt | 2 +-
.../extended_properties2.qmt | 2 +-
.../gaudiexamples.qms/gaudipython_mix.qmt | 2 +-
.../gaudiexamples.qms/init_loop_check_off.qmt | 2 +-
.../gaudiexamples.qms/init_loop_check_on.qmt | 2 +-
.../gaudiexamples.qms/particlepropsvc.qmt | 2 +-
.../gaudiexamples.qms/properties.qms/all.qmt | 2 +-
.../gaudiexamples.qms/properties.qms/all2.qmt | 2 +-
.../properties.qms/all_py.qmt | 2 +-
.../gaudiexamples.qms/signal_handler.qmt | 2 +-
.../tests/qmtest/gaudiexamples.qms/timing.qmt | 4 +-
.../gaudiexamples.qms/timing_histos.qmt | 6 +--
GaudiHive/python/GaudiHive/precedence.py | 12 ++---
GaudiMP/scripts/compareOutputFiles.py | 2 +-
GaudiProfiling/scripts/GaudiProfiler | 8 ++--
GaudiRelease/doc/doxygen/Doxyfile.in | 14 +++---
cmake/GaudiToolbox.cmake | 2 +-
cmake/tests/dummyProject/CMakeLists.txt | 2 +-
cmake/tests/dummyProject/tests/test_run.sh | 4 +-
53 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/Gaudi/tests/qmtest/gaudi.qms/bug_37488.qmt b/Gaudi/tests/qmtest/gaudi.qms/bug_37488.qmt
index d6664e97a7..5eea57b085 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/bug_37488.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/bug_37488.qmt
@@ -17,7 +17,7 @@
<text>--dry-run</text>
</set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
<text>TESTOPTS=test1.opts</text>
</set></argument>
<argument name="options"><text>
diff --git a/Gaudi/tests/qmtest/gaudi.qms/bug_45517.qmt b/Gaudi/tests/qmtest/gaudi.qms/bug_45517.qmt
index c35b759c71..efb7ce53da 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/bug_45517.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/bug_45517.qmt
@@ -13,7 +13,7 @@
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set><text>-v</text><text>-n</text></set></argument>
<argument name="environment"><set>
- <text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+ <text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="options"><text>
from Gaudi.Configuration import *
diff --git a/Gaudi/tests/qmtest/gaudi.qms/bug_61144.qmt b/Gaudi/tests/qmtest/gaudi.qms/bug_61144.qmt
index b41639e774..20e644cdf0 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/bug_61144.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/bug_61144.qmt
@@ -15,7 +15,7 @@
<text>-n</text>
</set></argument>
<argument name="environment"><set>
-<text>PYTHONPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/python:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
+<text>PYTHONPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/python:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
</set></argument>
<argument name="options"><text>
# Add the fake configurables to the path
diff --git a/Gaudi/tests/qmtest/gaudi.qms/case_sensitivity.qmt b/Gaudi/tests/qmtest/gaudi.qms/case_sensitivity.qmt
index 010679c0b5..96702c1e27 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/case_sensitivity.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/case_sensitivity.qmt
@@ -18,7 +18,7 @@
<text>case_sensitivity.py</text>
</set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="validator"><text>
conf_dict = eval('\n'.join(stdout.splitlines()))
@@ -35,7 +35,7 @@ if conf_dict != expected:
warnings = [ "WARNING: property 'testproperty' was requested for MyAlg1, but the correct spelling is 'TestProperty'",
"WARNING: Option 'testproperty' was used for MyAlg2, but the correct spelling is 'TestProperty'"]
-# extract all the warning messages
+# extract all the warning messages
all_warnings = filter(lambda l: "warning" in l.lower(), stdout.splitlines())
result["GaudiTest.configuration.missing_warnings"] = ""
diff --git a/Gaudi/tests/qmtest/gaudi.qms/conf_to_str.qmt b/Gaudi/tests/qmtest/gaudi.qms/conf_to_str.qmt
index 260f94fb41..99991c2b54 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/conf_to_str.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/conf_to_str.qmt
@@ -18,7 +18,7 @@
<text>conf_to_str.py</text>
</set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="validator"><text>
# skip Athena common messages
diff --git a/Gaudi/tests/qmtest/gaudi.qms/export_oldopts.qmt b/Gaudi/tests/qmtest/gaudi.qms/export_oldopts.qmt
index 3b744ca305..f3d7290af6 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/export_oldopts.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/export_oldopts.qmt
@@ -14,6 +14,6 @@
<argument name="program"><text>../scripts/test_export_oldopts.py</text></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
</extension>
diff --git a/Gaudi/tests/qmtest/gaudi.qms/export_oldopts_special.qmt b/Gaudi/tests/qmtest/gaudi.qms/export_oldopts_special.qmt
index 2fe4207b6f..4d0513292c 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/export_oldopts_special.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/export_oldopts_special.qmt
@@ -15,6 +15,6 @@
<argument name="args"><set><text>export_oldopts/special_cases.py</text></set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
</extension>
diff --git a/Gaudi/tests/qmtest/gaudi.qms/import_opts.qmt b/Gaudi/tests/qmtest/gaudi.qms/import_opts.qmt
index a6669e2318..9547c286ce 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/import_opts.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/import_opts.qmt
@@ -18,7 +18,7 @@
<text>main.opts</text>
</set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="validator"><text>
conf_dict = eval('\n'.join(stdout.splitlines()))
diff --git a/Gaudi/tests/qmtest/gaudi.qms/import_py.qmt b/Gaudi/tests/qmtest/gaudi.qms/import_py.qmt
index 74d1df787e..59afbd4d8c 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/import_py.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/import_py.qmt
@@ -18,7 +18,7 @@
<text>main.py</text>
</set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="validator"><text>
# skip Athena common messages
diff --git a/Gaudi/tests/qmtest/gaudi.qms/import_py_err.qmt b/Gaudi/tests/qmtest/gaudi.qms/import_py_err.qmt
index 1a70ee963a..c1cc9e2e94 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/import_py_err.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/import_py_err.qmt
@@ -18,11 +18,11 @@
<text>main_err.py</text>
</set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="exit_code"><integer>1</integer></argument>
<argument name="validator"><text>
-expected_error = "AttributeError: Configurable 'MessageSvc' does not have property 'IDontHaveIt'"
+expected_error = "AttributeError: Configurable 'MessageSvc' does not have property 'IDontHaveIt'"
if stderr.find(expected_error) == -1:
causes.append("error")
result["GaudiTest.expected_error"] = result.Quote(expected_error)
diff --git a/Gaudi/tests/qmtest/gaudi.qms/issue_188.qmt b/Gaudi/tests/qmtest/gaudi.qms/issue_188.qmt
index 7f003dce87..116ee90d6e 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/issue_188.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/issue_188.qmt
@@ -18,7 +18,7 @@
<text>test_issue_188:config</text>
</set></argument>
<argument name="environment"><set>
-<text>PYTHONPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/python:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
+<text>PYTHONPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/python:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
</set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="validator"><text>
diff --git a/Gaudi/tests/qmtest/gaudi.qms/minimal_gaudi_exe.qmt b/Gaudi/tests/qmtest/gaudi.qms/minimal_gaudi_exe.qmt
index f14a9c64b5..35d24fd64b 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/minimal_gaudi_exe.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/minimal_gaudi_exe.qmt
@@ -17,6 +17,6 @@ countErrorLines()
</text></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests</text>
</set></argument>
</extension>
diff --git a/Gaudi/tests/qmtest/gaudi.qms/override1.qmt b/Gaudi/tests/qmtest/gaudi.qms/override1.qmt
index c80a47aee7..e2bf8ede8a 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/override1.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/override1.qmt
@@ -19,7 +19,7 @@ MessageSvc.OutputLevel = 123;
MessageSvc.OutputLevel = 123;
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="validator"><text>
conf_dict = eval('\n'.join(stdout.splitlines()))
diff --git a/Gaudi/tests/qmtest/gaudi.qms/override2.qmt b/Gaudi/tests/qmtest/gaudi.qms/override2.qmt
index aebe81ce51..b944409738 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/override2.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/override2.qmt
@@ -20,7 +20,7 @@ importOptions("override.opts")
MessageSvc(OutputLevel = 123)
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="validator"><text>
conf_dict = eval('\n'.join(stdout.splitlines()))
diff --git a/Gaudi/tests/qmtest/gaudi.qms/pickle_read.qmt b/Gaudi/tests/qmtest/gaudi.qms/pickle_read.qmt
index 21c2b46016..79cc2ed6f9 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/pickle_read.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/pickle_read.qmt
@@ -19,7 +19,7 @@
<tuple><text>gaudi.pickle_write</text><enumeral>PASS</enumeral></tuple>
</set></argument>
<argument name="environment"><set>
- <text>PYTHONPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/python:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
+ <text>PYTHONPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/python:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
</set></argument>
<argument name="validator"><text>
from GaudiKernel.DataHandle import DataHandle
diff --git a/Gaudi/tests/qmtest/gaudi.qms/pickle_write.qmt b/Gaudi/tests/qmtest/gaudi.qms/pickle_write.qmt
index 689e06a1fe..7809d9d169 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/pickle_write.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/pickle_write.qmt
@@ -16,7 +16,7 @@
<text>-p</text><text>options.pkl</text>
</set></argument>
<argument name="environment"><set>
-<text>PYTHONPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/python:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
+<text>PYTHONPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/python:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
</set></argument>
<argument name="options"><text>
# Add the fake configurables to the path
diff --git a/Gaudi/tests/qmtest/gaudi.qms/purge.qmt b/Gaudi/tests/qmtest/gaudi.qms/purge.qmt
index 66b19c93e6..1a8d264013 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/purge.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/purge.qmt
@@ -13,7 +13,7 @@
<extension class="GaudiTest.GaudiExeTest" kind="test">
<argument name="program"><text>../scripts/test_purge.py</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="validator"><text>
from pprint import PrettyPrinter
diff --git a/Gaudi/tests/qmtest/gaudi.qms/reference.qmt b/Gaudi/tests/qmtest/gaudi.qms/reference.qmt
index 71f3c6d1d7..0d2c700736 100644
--- a/Gaudi/tests/qmtest/gaudi.qms/reference.qmt
+++ b/Gaudi/tests/qmtest/gaudi.qms/reference.qmt
@@ -18,7 +18,7 @@
<text>reference.py</text>
</set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts</text>
</set></argument>
<argument name="validator"><text>
conf_dict = eval('\n'.join(stdout.splitlines()))
diff --git a/GaudiAlg/doc/Html.cfg b/GaudiAlg/doc/Html.cfg
index 930d8c8cce..6b704402e9 100644
--- a/GaudiAlg/doc/Html.cfg
+++ b/GaudiAlg/doc/Html.cfg
@@ -1,10 +1,10 @@
PROJECT_NAME = "GaudiAlg package"
-OUTPUT_DIRECTORY = $(ENV_CMAKE_SOURCE_DIR)/GaudiAlg/doc
+OUTPUT_DIRECTORY = $(ENV_PROJECT_SOURCE_DIR)/GaudiAlg/doc
GENERATE_TAGFILE = GaudiAlg.tag
GENERATE_MAN = NO
GENERATE_RTF = NO
CASE_SENSE_NAMES = YES
-INPUT = $(ENV_CMAKE_SOURCE_DIR)/GaudiAlg
+INPUT = $(ENV_PROJECT_SOURCE_DIR)/GaudiAlg
FILE_PATTERNS = *.cpp *.h *.doc *.opts
@@ -18,23 +18,23 @@ COLS_IN_ALPHA_INDEX = 3
JAVADOC_AUTOBRIEF = YES
HAVE_DOT = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
GRAPHICAL_HIERARCHY = YES
-GENERATE_LEGEND = YES
+GENERATE_LEGEND = YES
-# LaTeX options
+# LaTeX options
GENERATE_LATEX = NO
-PAPER_TYPE = a4
-PDF_HYPERLINKS = NO
-LATEX_BATCHMODE = NO
+PAPER_TYPE = a4
+PDF_HYPERLINKS = NO
+LATEX_BATCHMODE = NO
-# HTML options
-GENERATE_HTML = YES
-GENERATE_HTMLHELP = YES
-GENERATE_TREEVIEW = YES
+# HTML options
+GENERATE_HTML = YES
+GENERATE_HTMLHELP = YES
+GENERATE_TREEVIEW = YES
HTML_ALIGN_MEMBERS = YES
-#HTML_HEADER = $(ENV_CMAKE_SOURCE_DIR)/GaudiAlg/doc/header.html
-#HTML_FOOTER = $(ENV_CMAKE_SOURCE_DIR)/GaudiAlg/doc/footer.html
+#HTML_HEADER = $(ENV_PROJECT_SOURCE_DIR)/GaudiAlg/doc/header.html
+#HTML_FOOTER = $(ENV_PROJECT_SOURCE_DIR)/GaudiAlg/doc/footer.html
diff --git a/GaudiAlg/doc/LaTex.cfg b/GaudiAlg/doc/LaTex.cfg
index 4643917de2..21c6cdb082 100644
--- a/GaudiAlg/doc/LaTex.cfg
+++ b/GaudiAlg/doc/LaTex.cfg
@@ -1,25 +1,25 @@
PROJECT_NAME = "GaudiAlg package"
-OUTPUT_DIRECTORY = $(ENV_CMAKE_SOURCE_DIR)/GaudiAlg/doc
+OUTPUT_DIRECTORY = $(ENV_PROJECT_SOURCE_DIR)/GaudiAlg/doc
GENERATE_TAGFILE = GaudiAlg.tag
GENERATE_MAN = NO
GENERATE_RTF = NO
CASE_SENSE_NAMES = YES
-INPUT = $(ENV_CMAKE_SOURCE_DIR)/GaudiAlg/GaudiAlg
+INPUT = $(ENV_PROJECT_SOURCE_DIR)/GaudiAlg/GaudiAlg
FILE_PATTERNS = Gaudi*.h Gaudi*.cpp Map*.h Tuple*.h Tuple*.cpp
-EXCLUDE = EventCounter.h Prescaler.h Sequencer.h
+EXCLUDE = EventCounter.h Prescaler.h Sequencer.h
RECURSIVE = NO
EXTRACT_ALL = YES
-EXTRACT_PRIVATE = YES
+EXTRACT_PRIVATE = YES
EXTRACT_STATIC = YES
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-STRIP_CODE_COMMENTS = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+STRIP_CODE_COMMENTS = NO
INLINE_SOURCES = NO
EXTRACT_PRIVATE = NO
-SHOW_INCLUDE_FILES = YES
-HIDE_SCOPE_NAMES = YES
-SHOW_USED_FILES = YES
+SHOW_INCLUDE_FILES = YES
+HIDE_SCOPE_NAMES = YES
+SHOW_USED_FILES = YES
QUIET = YES
WARNINGS = NO
ALPHABETICAL_INDEX = YES
@@ -27,24 +27,24 @@ COLS_IN_ALPHA_INDEX = 3
JAVADOC_AUTOBRIEF = YES
HAVE_DOT = YES
-CLASS_DIAGRAMS = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
+CLASS_DIAGRAMS = YES
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
GRAPHICAL_HIERARCHY = YES
-GENERATE_LEGEND = YES
+GENERATE_LEGEND = YES
-# LaTeX options
+# LaTeX options
GENERATE_LATEX = YES
-PAPER_TYPE = a4
+PAPER_TYPE = a4
PDF_HYPERLINKS = NO
-LATEX_BATCHMODE = NO
+LATEX_BATCHMODE = NO
-# HTML options
+# HTML options
GENERATE_HTML = NO
-GENERATE_HTMLHELP = YES
-GENERATE_TREEVIEW = YES
+GENERATE_HTMLHELP = YES
+GENERATE_TREEVIEW = YES
HTML_ALIGN_MEMBERS = YES
-#HTML_HEADER = $(ENV_CMAKE_SOURCE_DIR)/GaudiAlg/doc/header.html
-#HTML_FOOTER = $(ENV_CMAKE_SOURCE_DIR)/GaudiAlg/doc/footer.html
+#HTML_HEADER = $(ENV_PROJECT_SOURCE_DIR)/GaudiAlg/doc/header.html
+#HTML_FOOTER = $(ENV_PROJECT_SOURCE_DIR)/GaudiAlg/doc/footer.html
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/abort_event.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/abort_event.qmt
index 40c3763159..1482e0c55f 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/abort_event.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/abort_event.qmt
@@ -30,9 +30,9 @@ MessageSvc().setDebug.append("EventLoopMgr")
</text></argument>
<argument name="environment"><set>
-<text>STDOPTS=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests</text>
-<text>PYTHONPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/python:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
+<text>STDOPTS=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests</text>
+<text>PYTHONPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/python:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/Gaudi/Gaudi/tests/python:$PYTHONPATH</text>
</set></argument>
<argument name="validator"><text>
stdout = '\n'.join(l for l in stdout.splitlines()
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/aida2rootex.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/aida2rootex.qmt
index c0c310cbd7..cd0854d7ca 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/aida2rootex.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/aida2rootex.qmt
@@ -21,12 +21,12 @@
<argument name="validator"><text>
preprocessor = (normalizeExamples +
LineSkipper(regexps = [r'Info in <TCanvas::Print>: png file .* has been created']))
-
+
validateWithReference(preproc = preprocessor)
</text></argument>
<argument name="environment"><set>
-<text>STDOPTS=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options</text>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests</text>
-<text>PYTHONPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/python:$PYTHONPATH</text>
+<text>STDOPTS=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests</text>
+<text>PYTHONPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/python:$PYTHONPATH</text>
</set></argument>
</extension>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/array_properties.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/array_properties.qmt
index ce27422c0f..5fbb36acbf 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/array_properties.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/array_properties.qmt
@@ -13,6 +13,6 @@
<argument name="program"><text>../../scripts/ArrayProperties.py</text></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="environment"><set>
- <text>ROOT_INCLUDE_PATH=$ENV_CMAKE_SOURCE_DIR/GaudiKernel/include:$ROOT_INCLUDE_PATH</text>
+ <text>ROOT_INCLUDE_PATH=$ENV_PROJECT_SOURCE_DIR/GaudiKernel/include:$ROOT_INCLUDE_PATH</text>
</set></argument>
</extension>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/auditors_user_timing.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/auditors_user_timing.qmt
index 5217825462..41f7a105b6 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/auditors_user_timing.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/auditors_user_timing.qmt
@@ -28,11 +28,11 @@ app = ApplicationMgr(TopAlg = [AuditorTestAlg()],
app.ExtSvc += [ ToolSvc(), AuditorSvc() ]
app.AuditAlgorithms = True
-MessageSvc().setDebug.append("EventLoopMgr")
+MessageSvc().setDebug.append("EventLoopMgr")
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="validator"><text>
import re
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/chronostatsvc.qms/per_event_file.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/chronostatsvc.qms/per_event_file.qmt
index 0bd3f7200b..5749ae0ca9 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/chronostatsvc.qms/per_event_file.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/chronostatsvc.qms/per_event_file.qmt
@@ -36,7 +36,7 @@ app.AuditAlgorithms = True
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="validator"><text>
import re
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/colormsg_py.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/colormsg_py.qmt
index 1936afcfb1..f62fbf9b0e 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/colormsg_py.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/colormsg_py.qmt
@@ -16,6 +16,6 @@
<argument name="reference"><text>refs/ColorMsg_py.ref</text></argument>
<argument name="unsupported_platforms"><set><text>win32</text></set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
</extension>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/conditional_output.qms/write.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/conditional_output.qms/write.qmt
index 34b17ac5a3..be2077932b 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/conditional_output.qms/write.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/conditional_output.qms/write.qmt
@@ -18,8 +18,8 @@
<argument name="reference"><text>refs/conditional_output/write.ref</text></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="environment"><set>
-<text>STDOPTS=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options</text>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests</text>
-<text>PYTHONPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/python:$PYTHONPATH</text>
+<text>STDOPTS=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests</text>
+<text>PYTHONPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/python:$PYTHONPATH</text>
</set></argument>
</extension>
\ No newline at end of file
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/configurableuser.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/configurableuser.qmt
index 1a346f0ca4..73add49a1b 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/configurableuser.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/configurableuser.qmt
@@ -23,6 +23,6 @@ findReferenceBlock("""
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
</extension>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/algsequencer.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/algsequencer.qmt
index d0d5b57be6..753068e5db 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/algsequencer.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/algsequencer.qmt
@@ -17,8 +17,8 @@
<argument name="validator"><text>
import os
import sys
-sys.path.append(os.path.join(os.environ.get("ENV_CMAKE_SOURCE_DIR"), "GaudiExamples", "tests", "qmtest"))
-sys.path.append(os.path.join(os.environ.get("ENV_CMAKE_SOURCE_DIR"), "Gaudi", "GaudiExamples", "tests", "qmtest"))
+sys.path.append(os.path.join(os.environ.get("ENV_PROJECT_SOURCE_DIR"), "GaudiExamples", "tests", "qmtest"))
+sys.path.append(os.path.join(os.environ.get("ENV_PROJECT_SOURCE_DIR"), "Gaudi", "GaudiExamples", "tests", "qmtest"))
from ControlFlowTestValidator import preprocessor
validateWithReference(preproc = preprocessor)
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/superalg_dynamic_graph.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/superalg_dynamic_graph.qmt
index 9a6b2bd442..bfcb864549 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/superalg_dynamic_graph.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/superalg_dynamic_graph.qmt
@@ -17,8 +17,8 @@
<argument name="validator"><text>
import os
import sys
-sys.path.append(os.path.join(os.environ.get("ENV_CMAKE_SOURCE_DIR"), "GaudiExamples", "tests", "qmtest"))
-sys.path.append(os.path.join(os.environ.get("ENV_CMAKE_SOURCE_DIR"), "Gaudi", "GaudiExamples", "tests", "qmtest"))
+sys.path.append(os.path.join(os.environ.get("ENV_PROJECT_SOURCE_DIR"), "GaudiExamples", "tests", "qmtest"))
+sys.path.append(os.path.join(os.environ.get("ENV_PROJECT_SOURCE_DIR"), "Gaudi", "GaudiExamples", "tests", "qmtest"))
from ControlFlowTestValidator import preprocessor
validateWithReference(preproc = preprocessor)
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/superalgorithm.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/superalgorithm.qmt
index 934ec452f0..697e46421d 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/superalgorithm.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/control_flow.qms/superalgorithm.qmt
@@ -17,8 +17,8 @@
<argument name="validator"><text>
import os
import sys
-sys.path.append(os.path.join(os.environ.get("ENV_CMAKE_SOURCE_DIR"), "GaudiExamples", "tests", "qmtest"))
-sys.path.append(os.path.join(os.environ.get("ENV_CMAKE_SOURCE_DIR"), "Gaudi", "GaudiExamples", "tests", "qmtest"))
+sys.path.append(os.path.join(os.environ.get("ENV_PROJECT_SOURCE_DIR"), "GaudiExamples", "tests", "qmtest"))
+sys.path.append(os.path.join(os.environ.get("ENV_PROJECT_SOURCE_DIR"), "Gaudi", "GaudiExamples", "tests", "qmtest"))
from ControlFlowTestValidator import preprocessor
validateWithReference(preproc = preprocessor)
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/counter.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/counter.qmt
index 9a77ae9bc0..6c02ace624 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/counter.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/counter.qmt
@@ -14,8 +14,8 @@
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="reference"><text>refs/Counter.ref</text></argument>
<argument name="environment"><set>
- <text>STDOPTS=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options</text>
- <text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests</text>
- <text>PYTHONPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_CMAKE_SOURCE_DIR/Gaudi/tests/python:$PYTHONPATH</text>
+ <text>STDOPTS=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options</text>
+ <text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/pyjobopts:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests</text>
+ <text>PYTHONPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/tests/qmtest:$ENV_PROJECT_SOURCE_DIR/Gaudi/tests/python:$PYTHONPATH</text>
</set></argument>
</extension>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/custom_app_from_python.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/custom_app_from_python.qmt
index d693d6789e..bbc775560e 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/custom_app_from_python.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/custom_app_from_python.qmt
@@ -21,6 +21,6 @@ findReferenceBlock("=== Custom Application ===")
</text></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="environment"><set>
-<text>ROOT_INCLUDE_PATH=$ENV_CMAKE_SOURCE_DIR/GaudiKernel/include:$ENV_CMAKE_SOURCE_DIR/GaudiPluginService/include:$ROOT_INCLUDE_PATH</text>
+<text>ROOT_INCLUDE_PATH=$ENV_PROJECT_SOURCE_DIR/GaudiKernel/include:$ENV_PROJECT_SOURCE_DIR/GaudiPluginService/include:$ROOT_INCLUDE_PATH</text>
</set></argument>
</extension>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/event_timeout.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/event_timeout.qmt
index 4defa6a689..a065c6f2af 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/event_timeout.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/event_timeout.qmt
@@ -28,7 +28,7 @@ app = ApplicationMgr(TopAlg = [alg],
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="validator"><text>
import re
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/event_timeout_abort.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/event_timeout_abort.qmt
index faaa388d33..ac98ac5b13 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/event_timeout_abort.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/event_timeout_abort.qmt
@@ -36,7 +36,7 @@ app = ApplicationMgr(TopAlg = [alg],
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="signal"><integer>3</integer></argument>
<argument name="validator"><text>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/extended_properties2.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/extended_properties2.qmt
index 1526fa75d2..b25d6719ce 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/extended_properties2.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/extended_properties2.qmt
@@ -13,6 +13,6 @@
<argument name="program"><text>../../scripts/ExtendedProperties2.py</text></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="environment"><set>
- <text>ROOT_INCLUDE_PATH=$ENV_CMAKE_SOURCE_DIR/GaudiKernel/include:$ROOT_INCLUDE_PATH</text>
+ <text>ROOT_INCLUDE_PATH=$ENV_PROJECT_SOURCE_DIR/GaudiKernel/include:$ROOT_INCLUDE_PATH</text>
</set></argument>
</extension>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/gaudipython_mix.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/gaudipython_mix.qmt
index db6445b55b..526f8ff36b 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/gaudipython_mix.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/gaudipython_mix.qmt
@@ -14,6 +14,6 @@
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="reference"><text>refs/Mix.ref</text></argument>
<argument name="environment"><set>
- <text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+ <text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
</extension>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/init_loop_check_off.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/init_loop_check_off.qmt
index 4457805ecb..95a8e732a4 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/init_loop_check_off.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/init_loop_check_off.qmt
@@ -17,7 +17,7 @@ ApplicationMgr.TopAlg = { "LoopAlg" };
ApplicationMgr.InitializationLoopCheck = False;
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="validator"><text>
findReferenceBlock('ApplicationMgr INFO Application Manager Initialized successfully')
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/init_loop_check_on.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/init_loop_check_on.qmt
index e2c47e84e4..97d9d337e2 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/init_loop_check_on.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/init_loop_check_on.qmt
@@ -16,7 +16,7 @@
ApplicationMgr.TopAlg = { "LoopAlg" };
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="validator"><text>
findReferenceBlock('ServiceManager ERROR Initialization loop detected when creating service "ServiceB"')
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/particlepropsvc.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/particlepropsvc.qmt
index 2be56558fa..fccc856a59 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/particlepropsvc.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/particlepropsvc.qmt
@@ -26,7 +26,7 @@ ApplicationMgr( EvtMax = 1,
</text></argument>
<argument name="environment"><set>
- <text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+ <text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="validator"><text>
expected = "Opened particle properties file : ../data/ParticleTable.txt"
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all.qmt
index 9f53f023b4..4ca25cda21 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all.qmt
@@ -12,7 +12,7 @@
<extension class="GaudiTest.GaudiExeTest" kind="test">
<argument name="args"><set><text>../../options/Properties.opts</text></set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="reference"><text>refs/Properties.ref</text></argument>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all2.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all2.qmt
index 6ef3436a8e..b48ea41532 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all2.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all2.qmt
@@ -13,7 +13,7 @@
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set><text>../../options/Properties.opts</text></set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="reference"><text>refs/Properties2.ref</text></argument>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all_py.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all_py.qmt
index be18aca8bb..d9de56c407 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all_py.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/properties.qms/all_py.qmt
@@ -13,7 +13,7 @@
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set><text>../../options/Properties.py</text></set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="reference"><text>refs/Properties_py.ref</text></argument>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/signal_handler.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/signal_handler.qmt
index f10ab74205..0311c5d306 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/signal_handler.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/signal_handler.qmt
@@ -28,7 +28,7 @@ app = ApplicationMgr(TopAlg = [alg],
MessageSvc().setDebug.append("EventLoopMgr")
</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="exit_code"><integer>130</integer></argument>
<argument name="validator"><text>
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/timing.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/timing.qmt
index aa89221d6c..90b17f060b 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/timing.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/timing.qmt
@@ -14,11 +14,11 @@
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set><text>Timing.py</text></set></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="validator"><text>
import re
-expected = ( r"Timing\s+SUCCESS\s+The timing is \(in us\)\s*\n" +
+expected = ( r"Timing\s+SUCCESS\s+The timing is \(in us\)\s*\n" +
r"\|\s*\|\s*#\s*\|\s*Total\s*\|\s*Mean\+-RMS\s*\|\s*Min/Max\s*\|\s*\n" +
r"\|\s*\(1U\)\s*\|\s*\d*\s*\|(?:[-+.\deE /]+\|){3}\s*\n" +
r"\|\s*\(2U\)\s*\|\s*\d*\s*\|(?:[-+.\deE /]+\|){3}\s*\n" +
diff --git a/GaudiExamples/tests/qmtest/gaudiexamples.qms/timing_histos.qmt b/GaudiExamples/tests/qmtest/gaudiexamples.qms/timing_histos.qmt
index d14f72fdb2..e3ee657ac3 100644
--- a/GaudiExamples/tests/qmtest/gaudiexamples.qms/timing_histos.qmt
+++ b/GaudiExamples/tests/qmtest/gaudiexamples.qms/timing_histos.qmt
@@ -15,7 +15,7 @@
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="reference"><text>refs/TimingHistograms.ref</text></argument>
<argument name="environment"><set>
-<text>JOBOPTSEARCHPATH=$ENV_CMAKE_SOURCE_DIR/GaudiExamples/options:$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
+<text>JOBOPTSEARCHPATH=$ENV_PROJECT_SOURCE_DIR/GaudiExamples/options:$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiExamples/options</text>
</set></argument>
<argument name="validator"><text>
# Default validation.
@@ -25,9 +25,9 @@ validateWithReference()
import os
from subprocess import Popen, PIPE
-testscript = os.path.join(os.environ['ENV_CMAKE_SOURCE_DIR'], 'GaudiExamples', 'tests', 'scripts', 'test_timing_histo_file.py')
+testscript = os.path.join(os.environ['ENV_PROJECT_SOURCE_DIR'], 'GaudiExamples', 'tests', 'scripts', 'test_timing_histo_file.py')
if not os.path.exists(testscript):
- testscript = os.path.join(os.environ['ENV_CMAKE_SOURCE_DIR'], 'Gaudi', 'GaudiExamples', 'tests', 'scripts', 'test_timing_histo_file.py')
+ testscript = os.path.join(os.environ['ENV_PROJECT_SOURCE_DIR'], 'Gaudi', 'GaudiExamples', 'tests', 'scripts', 'test_timing_histo_file.py')
test = Popen(['python', testscript], stdout=PIPE, stderr=PIPE)
out, err = test.communicate()
diff --git a/GaudiHive/python/GaudiHive/precedence.py b/GaudiHive/python/GaudiHive/precedence.py
index a714ce9a23..f1980e45fd 100644
--- a/GaudiHive/python/GaudiHive/precedence.py
+++ b/GaudiHive/python/GaudiHive/precedence.py
@@ -31,7 +31,7 @@ def _buildFilePath(filePath):
if not os.path.exists(filePath):
__fullFilePath__ = os.path.realpath(
os.path.join(
- os.environ.get("ENV_CMAKE_SOURCE_DIR", ""),
+ os.environ.get("ENV_PROJECT_SOURCE_DIR", ""),
"GaudiHive",
"data",
filePath,
@@ -40,7 +40,7 @@ def _buildFilePath(filePath):
if not os.path.exists(__fullFilePath__):
__fullFilePath__ = os.path.realpath(
os.path.join(
- os.environ.get("ENV_CMAKE_SOURCE_DIR", ""),
+ os.environ.get("ENV_PROJECT_SOURCE_DIR", ""),
"Gaudi",
"GaudiHive",
"data",
@@ -51,8 +51,8 @@ def _buildFilePath(filePath):
print(
"\nERROR: invalid file path '%s'. "
"It must be either absolute, or relative to "
- "'$ENV_CMAKE_SOURCE_DIR/GaudiHive/data/' or to "
- "'$ENV_CMAKE_SOURCE_DIR/Gaudi/GaudiHive/data/'." % filePath
+ "'$ENV_PROJECT_SOURCE_DIR/GaudiHive/data/' or to "
+ "'$ENV_PROJECT_SOURCE_DIR/Gaudi/GaudiHive/data/'." % filePath
)
sys.exit(1)
else:
@@ -200,8 +200,8 @@ class CruncherSequence(object):
Keyword arguments:
timeValue -- timeValue object to set algorithm execution time
BlockingBoolValue -- *BooleanValue object to set whether an algorithm has to experience CPU-blocking execution
- cfgPath -- relative to $ENV_CMAKE_SOURCE_DIR/GaudiHive/data path to GRAPHML file with control flow dependencies
- dfgPath -- relative to $ENV_CMAKE_SOURCE_DIR/GaudiHive/data path to GRAPHML file with data flow dependencies
+ cfgPath -- relative to $ENV_PROJECT_SOURCE_DIR/GaudiHive/data path to GRAPHML file with control flow dependencies
+ dfgPath -- relative to $ENV_PROJECT_SOURCE_DIR/GaudiHive/data path to GRAPHML file with data flow dependencies
showStat -- print out statistics on precedence graph
"""
diff --git a/GaudiMP/scripts/compareOutputFiles.py b/GaudiMP/scripts/compareOutputFiles.py
index e7884ffce3..530da49f67 100755
--- a/GaudiMP/scripts/compareOutputFiles.py
+++ b/GaudiMP/scripts/compareOutputFiles.py
@@ -33,7 +33,7 @@ def checkKeys(name):
importOptions("$STDOPTS/LHCbApplication.opts")
-importOptions("$ENV_CMAKE_SOURCE_DIR/RootCnv/options/Setup.opts")
+importOptions("$ENV_PROJECT_SOURCE_DIR/RootCnv/options/Setup.opts")
OutputStream("DstWriter").Output = ""
HistogramPersistencySvc().OutputFile = ""
diff --git a/GaudiProfiling/scripts/GaudiProfiler b/GaudiProfiling/scripts/GaudiProfiler
index 5b800c8888..7107eee89d 100755
--- a/GaudiProfiling/scripts/GaudiProfiler
+++ b/GaudiProfiling/scripts/GaudiProfiler
@@ -23,11 +23,11 @@ from GaudiProfiling.GenerateGaudiOpts import ConvertXmlToDict
if __name__ == "__main__":
from PyCPUFamily import CPUFamily
- if "ENV_CMAKE_SOURCE_DIR" not in os.environ:
+ if "ENV_PROJECT_SOURCE_DIR" not in os.environ:
print(
"""
****************************************** ERROR *****************************************
- * GaudiProfiler: Environment variable $ENV_CMAKE_SOURCE_DIR is missing. Process stopped. *
+ * GaudiProfiler: Environment variable $ENV_PROJECT_SOURCE_DIR is missing. Process stopped. *
******************************************************************************************
"""
)
@@ -37,7 +37,7 @@ if __name__ == "__main__":
else:
configFile = os.path.sep.join(
[
- os.environ["ENV_CMAKE_SOURCE_DIR"],
+ os.environ["ENV_PROJECT_SOURCE_DIR"],
"GaudiProfiling",
"data",
"pfm_config_%s.xml" % CPUFamily(),
@@ -101,7 +101,7 @@ if __name__ == "__main__":
shutil.copy2(
os.path.sep.join(
[
- os.environ["ENV_CMAKE_SOURCE_DIR"],
+ os.environ["ENV_PROJECT_SOURCE_DIR"],
"GaudiProfiling",
"data",
"sorttable.js",
diff --git a/GaudiRelease/doc/doxygen/Doxyfile.in b/GaudiRelease/doc/doxygen/Doxyfile.in
index 61b89298ac..faabd63e73 100644
--- a/GaudiRelease/doc/doxygen/Doxyfile.in
+++ b/GaudiRelease/doc/doxygen/Doxyfile.in
@@ -144,7 +144,7 @@ FULL_PATH_NAMES = YES
# will be relative from the directory where doxygen is started.
# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@ @CMAKE_BINARY_DIR@
+STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@ @CMAKE_BINARY_DIR@
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
# path mentioned in the documentation of a class, which tells the reader which
@@ -743,7 +743,7 @@ WARN_LOGFILE = @CMAKE_BINARY_DIR@/doxygen-warnings.log
# spaces.
# Note: If this tag is empty the current directory is searched.
-INPUT = @CMAKE_SOURCE_DIR@
+INPUT = @PROJECT_SOURCE_DIR@
INPUT += @CMAKE_BINARY_DIR@/include
INPUT += @CMAKE_CURRENT_BINARY_DIR@
@@ -785,10 +785,10 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.
-EXCLUDE = @CMAKE_SOURCE_DIR@/GaudiRelease/doc/GaudiHive-release-notes.md
-EXCLUDE += @CMAKE_SOURCE_DIR@/ReleaseNotes
-EXCLUDE += @CMAKE_SOURCE_DIR@/InstallArea
-#EXCLUDE += @CMAKE_SOURCE_DIR@/GaudiExamples
+EXCLUDE = @PROJECT_SOURCE_DIR@/GaudiRelease/doc/GaudiHive-release-notes.md
+EXCLUDE += @PROJECT_SOURCE_DIR@/ReleaseNotes
+EXCLUDE += @PROJECT_SOURCE_DIR@/InstallArea
+#EXCLUDE += @PROJECT_SOURCE_DIR@/GaudiExamples
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -821,7 +821,7 @@ EXCLUDE_SYMBOLS =
# that contain example code fragments that are included (see the \include
# command).
-EXAMPLE_PATH = @CMAKE_SOURCE_DIR@
+EXAMPLE_PATH = @PROJECT_SOURCE_DIR@
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
diff --git a/cmake/GaudiToolbox.cmake b/cmake/GaudiToolbox.cmake
index 5857ab230f..47b7170fa6 100644
--- a/cmake/GaudiToolbox.cmake
+++ b/cmake/GaudiToolbox.cmake
@@ -1212,7 +1212,7 @@ export LD_LIBRARY_PATH=\"$<SHELL_PATH:$<FILTER:$<REMOVE_DUPLICATES:$<GENEX_EVAL:
export PYTHONPATH=\"$<SHELL_PATH:$<FILTER:$<REMOVE_DUPLICATES:$<GENEX_EVAL:$<TARGET_PROPERTY:target_runtime_paths,runtime_pythonpath>>;${_ENV_PYTHONPATH}>,EXCLUDE,^[^/]>>\${PYTHONPATH:+:\${PYTHONPATH}}\"
$<$<NOT:$<STREQUAL:$ENV{PYTHONHOME},>>:export PYTHONHOME=\"$ENV{PYTHONHOME}\">
export ROOT_INCLUDE_PATH=\"$<SHELL_PATH:$<FILTER:$<REMOVE_DUPLICATES:$<GENEX_EVAL:$<TARGET_PROPERTY:target_runtime_paths,runtime_root_include_path>>;${_ENV_ROOT_INCLUDE_PATH}>,EXCLUDE,^[^/]>>\${ROOT_INCLUDE_PATH:+:\${ROOT_INCLUDE_PATH}}\"
-export ENV_CMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"
+export ENV_PROJECT_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\"
export ENV_CMAKE_BINARY_DIR=\"${CMAKE_BINARY_DIR}\"
export ENV_CMAKE_BUILD_TYPE=\"$<CONFIG>\"
$<IF:$<NOT:$<STREQUAL:${BINARY_TAG},>>,export BINARY_TAG=\"${BINARY_TAG}\",$<$<NOT:$<STREQUAL:$ENV{BINARY_TAG},>>:export BINARY_TAG=\"$ENV{BINARY_TAG}\">>
diff --git a/cmake/tests/dummyProject/CMakeLists.txt b/cmake/tests/dummyProject/CMakeLists.txt
index a348750bd7..6126c6936f 100644
--- a/cmake/tests/dummyProject/CMakeLists.txt
+++ b/cmake/tests/dummyProject/CMakeLists.txt
@@ -67,7 +67,7 @@ endif()
# Test python tests
enable_testing()
-gaudi_add_tests(pytest ${CMAKE_SOURCE_DIR}/python)
+gaudi_add_tests(pytest ${PROJECT_SOURCE_DIR}/python)
# Install python modules
gaudi_install(PYTHON)
diff --git a/cmake/tests/dummyProject/tests/test_run.sh b/cmake/tests/dummyProject/tests/test_run.sh
index 40673512f4..c1f4cce5ff 100755
--- a/cmake/tests/dummyProject/tests/test_run.sh
+++ b/cmake/tests/dummyProject/tests/test_run.sh
@@ -35,9 +35,9 @@ then
exit 4
fi
-if [ "x$ENV_CMAKE_SOURCE_DIR" = "x" ]
+if [ "x$ENV_PROJECT_SOURCE_DIR" = "x" ]
then
- echo "Error ENV_CMAKE_SOURCE_DIR not set"
+ echo "Error ENV_PROJECT_SOURCE_DIR not set"
exit 5
fi
--
GitLab