Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LHCbDIRAC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Anton Lu
LHCbDIRAC
Commits
964e7731
Commit
964e7731
authored
7 years ago
by
Joel Closier
Browse files
Options
Downloads
Patches
Plain Diff
change logic for the config tools
parent
42f82a2f
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist-tools/gen_xenv.py
+19
-5
19 additions, 5 deletions
dist-tools/gen_xenv.py
dist-tools/heptools_x86_64-slc6-gcc48-opt.json
+0
-0
0 additions, 0 deletions
dist-tools/heptools_x86_64-slc6-gcc48-opt.json
dist-tools/projectConfig.json
+1
-1
1 addition, 1 deletion
dist-tools/projectConfig.json
with
20 additions
and
6 deletions
dist-tools/gen_xenv.py
+
19
−
5
View file @
964e7731
...
...
@@ -3,6 +3,8 @@
import
os
import
logging
import
sys
import
json
from
optparse
import
OptionParser
...
...
@@ -31,16 +33,28 @@ log = logging.getLogger()
# Building the paths for the input and output files
jsonMetadataDir
=
_lbconf_dir
glob_data
=
{}
# Now import the code to generate the XML files
from
LbUtils.LbRunConfigTools
import
prettify
,
loadConfig
from
LbUtils.LbRunConfigTools
import
ManifestGenerator
,
XEnvGenerator
log
.
info
(
"
Loading LHCbDirac_version.json from %s
"
%
jsonMetadataDir
)
glob_data
.
update
(
loadConfig
(
jsonMetadataDir
,
'
LHCbDirac_version.json
'
)
)
log
.
info
(
"
Loading projectConfig.json from %s
"
%
jsonMetadataDir
)
config
=
loadConfig
(
jsonMetadataDir
)
# Special case for gcc series 4
if
os
.
environ
[
'
CMTCONFIG
'
]
==
'
x86_64-slc6-gcc48-opt
'
:
if
os
.
path
.
exists
(
os
.
path
.
join
(
jsonMetadataDir
,
'
projectConfig_gcc48.json
'
)
)
:
config
=
loadConfig
(
jsonMetadataDir
,
'
projectConfig_gcc48.json
'
)
if
os
.
environ
.
has_key
(
'
CMTCONFIG
'
):
if
os
.
path
.
exists
(
os
.
path
.
join
(
jsonMetadataDir
,
'
heptools_
'
+
os
.
environ
[
'
CMTCONFIG
'
]
+
'
.json
'
)
):
glob_data
.
update
(
loadConfig
(
jsonMetadataDir
,
'
heptools_
'
+
os
.
environ
[
'
CMTCONFIG
'
]
+
'
.json
'
)
)
else
:
glob_data
.
update
(
loadConfig
(
jsonMetadataDir
)
)
configfile
=
os
.
path
.
join
(
jsonMetadataDir
,
'
projectConfigJoel.json
'
)
with
open
(
configfile
,
'
w
'
)
as
f
:
json
.
dump
(
glob_data
,
f
,
indent
=
2
)
f
.
close
()
config
=
loadConfig
(
jsonMetadataDir
,
'
projectConfigJoel.json
'
)
for
opt
in
(
'
cmtconfig
'
,
'
python_version
'
,
'
dir_base
'
):
if
opt
not
in
config
:
if
getattr
(
options
,
opt
):
...
...
This diff is collapsed.
Click to expand it.
dist-tools/
projectConfig_
gcc48.json
→
dist-tools/
heptools_x86_64-slc6-
gcc48
-opt
.json
+
0
−
0
View file @
964e7731
File moved
This diff is collapsed.
Click to expand it.
dist-tools/projectConfig.json
+
1
−
1
View file @
964e7731
...
...
@@ -6,7 +6,7 @@
[
"Dirac"
,
"v6r17p19"
,
[
"bin"
,
"python"
,
"lib"
]
],
[
"LHCbGrid"
,
"v11r
6
"
,
[
"LHCbGrid"
,
"v11r
7
"
,
[
"bin"
,
"python"
,
"lib"
]
]
]
...
...
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