Skip to content
Snippets Groups Projects
Commit ebf3530c authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Switched to the new version of externals: 2.0.16

Former-commit-id: f605f81a
parent 166fab1e
No related branches found
No related tags found
No related merge requests found
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AnalysisBaseExternalsVersion = 2.0.15.1 AnalysisBaseExternalsVersion = 2.0.17
# Versions of the various externals to build before starting the build of # Versions of the various externals to build before starting the build of
# this project, when doing a full stack nightly build. # this project, when doing a full stack nightly build.
AnalysisBaseExternalsVersion = 2.0.15.1 AnalysisBaseExternalsVersion = 2.0.17
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AtlasExternalsVersion = 2.0.15.1 AtlasExternalsVersion = 2.0.17
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthSimulationExternalsVersion = 2.0.15.1 AthSimulationExternalsVersion = 2.0.17
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v31r0.000 GaudiVersion = v31r0.000
...@@ -139,9 +139,9 @@ fi ...@@ -139,9 +139,9 @@ fi
AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/externals.txt) AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/externals.txt)
# Check out AthenaExternals from the right branch/tag: # Check out AthenaExternals from the right branch/tag:
#${scriptsdir}/checkout_atlasexternals.sh \ ${scriptsdir}/checkout_atlasexternals.sh \
# -t ${AthenaExternalsVersion} \ -t ${AthenaExternalsVersion} \
# -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log
# log analyzer never affects return status in the parent shell: # log analyzer never affects return status in the parent shell:
{ {
...@@ -162,7 +162,7 @@ AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/ex ...@@ -162,7 +162,7 @@ AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/ex
## Build AthenaExternals: ## Build AthenaExternals:
export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/AthenaExternals export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/AthenaExternals
${scriptsdir}/build_atlasexternals.sh \ ${scriptsdir}/build_atlasexternals.sh \
-s /build1/tsulaia/athena-devel/atlasexternals/src \ -s ${BUILDDIR}/src/AthenaExternals \
-b ${BUILDDIR}/build/AthenaExternals \ -b ${BUILDDIR}/build/AthenaExternals \
-i ${BUILDDIR}/install/AthenaExternals/${NICOS_PROJECT_VERSION} \ -i ${BUILDDIR}/install/AthenaExternals/${NICOS_PROJECT_VERSION} \
-p AthenaExternals ${RPMOPTIONS} -t ${BUILDTYPE} \ -p AthenaExternals ${RPMOPTIONS} -t ${BUILDTYPE} \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthenaExternalsVersion = 2.0.15.1 AthenaExternalsVersion = 2.0.17
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v31r0.000 GaudiVersion = v31r0.000
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment