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

Merge branch 'devel' into 'devel'

change name for json file

See merge request !343
parents 63fb5a9e 99ab2392
No related branches found
No related tags found
No related merge requests found
{
"name": "LHCbDirac",
"version": "v8r8-pre4",
"used_projects": {
"project": [
[ "Dirac", "v6r17p20",
[ "bin", "python", "lib" ]
],
[ "LHCbGrid", "v11r7",
[ "bin", "python", "lib" ]
]
]
}
}
......@@ -38,8 +38,8 @@ 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 )
glob_data.update( loadConfig( jsonMetadataDir ) )
try:
localconfig = getattr( options, 'cmtconfig' )
......@@ -47,11 +47,11 @@ except:
print "cmtconfig not defined"
sys.exit( 0 )
log.info( "Loading projectConfig.json from %s" % jsonMetadataDir )
log.info( "Loading heptools.json from %s" % 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 ) )
glob_data.update( loadConfig( jsonMetadataDir, 'heptools.json' ) )
configfile = os.path.join( jsonMetadataDir, 'projectConfigConcat.json' )
with open( configfile, 'w' ) as f:
......
{
"heptools": {
"binary_tag": "$CMTCONFIG",
"version": "88",
"packages": [
[ "Python", "2.7.10",
[ "bin", "lib" ]
],
[ "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" ]
],
[ "m2crypto", "0.25.1",
[ "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
{
"heptools": {
"binary_tag": "$CMTCONFIG",
"version": "88",
"packages": [
[ "Python", "2.7.10",
[ "bin", "lib" ]
],
[ "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" ]
],
[ "m2crypto", "0.25.1",
[ "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",
"name": "LHCbDirac",
"version": "v8r8-pre1",
"used_projects": {
"project": [
[ "Dirac", "v6r17p19",
[ "bin", "python", "lib" ]
],
[ "ipython_genutils", "0.1.0",
[ "LHCbGrid", "v11r7",
[ "bin", "python", "lib" ]
]
]
}
}
\ 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