Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
common_bench
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
benchmarks
common_bench
Commits
f9645bb9
Commit
f9645bb9
authored
Jun 13, 2022
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
DETECTOR_PREFIX="${LOCAL_PREFIX}/share"
parent
e70e1b74
No related branches found
No related tags found
1 merge request
!44
Draft: Resolve "DETECTOR_PATH should point to CMAKE_INSTALL_PREFIX subtree, not source dir"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/build_detector.sh
+4
-5
4 additions, 5 deletions
bin/build_detector.sh
bin/env.sh
+1
-1
1 addition, 1 deletion
bin/env.sh
with
5 additions
and
6 deletions
bin/build_detector.sh
+
4
−
5
View file @
f9645bb9
...
...
@@ -24,7 +24,7 @@ fi
## =============================================================================
## Step 1: download/update the detector definitions (if needed)
pushd
${
DETECTOR
_PREFIX
}
pushd
${
LOCAL
_PREFIX
}
/src
## We need an up-to-date copy of the detector
## start clean to avoid issues...
...
...
@@ -74,14 +74,15 @@ git clone --depth 1 https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
[[
"
$?
"
==
"0"
]]
||
exit
1
rm
-rf
"accelerator/.git"
## Now symlink the accelerator definition into the detector definition
echo
"Linking accelerator definition into detector definition"
## Now symlink the accelerator
and beamline
definition
s
into the detector definition
echo
"Linking accelerator
and beamline
definition into detector definition"
ln
-s
-f
${
DETECTOR_PREFIX
}
/accelerator/eic
${
DETECTOR_PATH
}
/eic
[[
"
$?
"
==
"0"
]]
||
exit
1
ln
-s
-f
${
DETECTOR_PREFIX
}
/
${
BEAMLINE_CONFIG
}
/
${
BEAMLINE_CONFIG
}
${
DETECTOR_PATH
}
/
${
BEAMLINE_CONFIG
}
[[
"
$?
"
==
"0"
]]
||
exit
1
popd
## =============================================================================
## Step 2: Compile and install the detector definition
echo
"Building and installing the
${
JUGGLER_DETECTOR
}
package"
...
...
@@ -98,8 +99,6 @@ cmake ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG} -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFI
popd
rm
-rf
${
DETECTOR_PREFIX
}
/
${
BEAMLINE_CONFIG
}
_build
## =============================================================================
## Step 3: That's all!
echo
"Detector build/install complete!"
This diff is collapsed.
Click to expand it.
bin/env.sh
+
1
−
1
View file @
f9645bb9
...
...
@@ -106,7 +106,7 @@ mkdir -p "${LOCAL_PREFIX}"
export
LOCAL_PREFIX
=
`
realpath
${
LOCAL_PREFIX
}
`
## detector prefix: prefix for the detector definitions
export
DETECTOR_PREFIX
=
"
${
LOCAL_PREFIX
}
/
detector
"
export
DETECTOR_PREFIX
=
"
${
LOCAL_PREFIX
}
/
share
"
mkdir
-p
${
DETECTOR_PREFIX
}
## detector path: actual detector definition path
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment