Skip to content
Snippets Groups Projects
Commit 58b9ac7c authored by Zoltan Mathe's avatar Zoltan Mathe
Browse files

Merge branch 'devel' into 'devel'

add case for gcc48

See merge request !339
parents 760bbafb 6767c2b7
No related branches found
No related tags found
No related merge requests found
{
"name": "LHCbDirac",
"version": "v8r8-pre1",
"used_projects": {
"project": [
[ "Dirac", "v6r17p19",
[ "bin", "python", "lib" ]
],
[ "LHCbGrid", "v11r7",
[ "bin", "python", "lib" ]
]
]
}
}
......@@ -3,6 +3,8 @@
import os
import logging
import sys
import json
from optparse import OptionParser
......@@ -31,11 +33,33 @@ 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' ) )
try:
localconfig = getattr( options, 'cmtconfig' )
except:
print "cmtconfig not defined"
sys.exit( 0 )
log.info( "Loading projectConfig.json from %s" % jsonMetadataDir )
config = loadConfig( jsonMetadataDir )
if os.path.exists( os.path.join( jsonMetadataDir, 'heptools_' + localconfig + '.json' ) ):
glob_data.update( loadConfig( jsonMetadataDir, 'heptools_' + localconfig + '.json' ) )
else:
glob_data.update( loadConfig( jsonMetadataDir ) )
configfile = os.path.join( jsonMetadataDir, 'projectConfigConcat.json' )
with open( configfile, 'w' ) as f:
json.dump( glob_data, f, indent = 2 )
f.close()
config = loadConfig( jsonMetadataDir, 'projectConfigConcat.json' )
for opt in ( 'cmtconfig', 'python_version', 'dir_base' ):
if opt not in config:
......@@ -59,4 +83,3 @@ if options.xenv_file:
xe = xg.getDocument()
with open( options.xenv_file, "w" ) as f:
f.write( prettify( xe ) )
{
"name": "LHCbDirac",
"version": "v8r7p1",
"used_projects": {
"project": [
[ "Dirac", "v6r17p19",
[ "bin", "python", "lib" ]
],
[ "LHCbGrid", "v11r6",
[ "bin", "python", "lib" ]
]
]
},
"heptools": {
"binary_tag": "$CMTCONFIG",
"version": "79",
"packages": [
[ "Python", "2.7.10",
[ "bin" ]
],
[ "libtool", "2.4.2",
[ "bin", "python", "lib" ]
],
[ "pygsi", "0.6.3",
[ "bin", "python", "lib" ]
],
[ "pygraphics", "2.0",
[ "bin", "python", "lib" ]
],
[ "qt", "4.8.7",
[ "bin", "python", "lib" ]
],
[ "gcc", "4.9.3",
[ "bin", "python", "lib" ]
],
[ "mysql", "5.7.11",
[ "bin", "python", "lib" ]
],
[ "pyparsing", "2.1.8",
[ "bin", "python" ]
],
[ "pytools", "2.0",
[ "bin", "python" ]
],
[ "simplegeneric", "0.8.1",
[ "bin", "python", "lib" ]
],
[ "wcwidth", "0.1.7",
[ "bin", "python", "lib" ]
],
[ "prompt_toolkit", "1.0.3",
[ "bin", "python", "lib" ]
],
[ "pickleshare", "0.7.2",
[ "bin", "python", "lib" ]
],
[ "pathlib2", "2.1.0",
[ "bin", "python", "lib" ]
],
[ "backports", "1.0.0",
[ "bin", "python", "lib" ]
],
[ "pexpect", "4.2.0",
[ "bin", "python", "lib" ]
],
[ "ipython_genutils", "0.1.0",
[ "bin", "python", "lib" ]
]
]
}
}
\ No newline at end of file
{
"name": "LHCbDirac",
"version": "v8r8-pre1",
"used_projects": {
"project": [
[ "Dirac", "v6r17p19",
[ "bin", "python", "lib" ]
],
[ "LHCbGrid", "v11r6",
[ "bin", "python", "lib" ]
]
]
},
"heptools": {
"binary_tag": "$CMTCONFIG",
"version": "87",
......@@ -68,4 +56,4 @@
]
]
}
}
}
\ No newline at end of file
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