Merge branch 'LBCORE-1168' into 'master'

Adapt to the new syntax of ProjectConfig.json



See merge request !89

LbUtils/python/LbUtils/LbRunConfigTools.py

@@ -102,7 +102,8 @@ class ManifestGenerator( object ):
             packagesConfig = heptoolsConfig.get('packages')
             if packagesConfig != None:
                 packages =  ET.SubElement(heptools, 'packages')
-                for (p, v, t) in packagesConfig:
+                for pack_info in packagesConfig:
+                    ( p, v, t ) = pack_info[0:3]
                     ET.SubElement(packages, 'package', attrib={ "name":p, "version":v})
 
         exttoolsConfig = self._config.get( 'exttools', None )
@@ -117,7 +118,8 @@ class ManifestGenerator( object ):
             packagesConfig = exttoolsConfig.get( 'packages' )
             if packagesConfig != None:
                 packages = ET.SubElement( exttools, 'packages' )
-                for ( p, v, t ) in packagesConfig:
+                for pack_info in packagesConfig:
+                    ( p, v, t ) = pack_info[0:3]
                     ET.SubElement( packages, 'package', attrib = { "name":p, "version":v} )
 
         usedProjectConfig = self._config.get( 'used_projects', None )
@@ -288,12 +290,14 @@ class XEnvGenerator(object):
 
             # Identify the python version from the packages
             pythonVersion = None
-            for p, v, t in exttoolsPackages:
+            for pack_info in exttoolsPackages:
+                ( p, v, t ) = pack_info[0:3]
                 if p.upper() == "PYTHON":
                     pythonVersion = '.'.join( v.split( '.' )[:2] )
 
             # Now add entries for the packages
-            for p, v, t in exttoolsPackages:
+            for pack_info in exttoolsPackages:
+                ( p, v, t ) = pack_info[0:3]
                 if "bin" in t:
                     add( "env:prepend", "PATH", "${{LCG_external_area}}/Grid/{p}/{v}/${{BINARY_TAG}}/bin".format( p = p, v = v ) )
                 if "lib" in t:
@@ -302,6 +306,15 @@ class XEnvGenerator(object):
                 if "python" in t:
                     add( "env:prepend", "PYTHONPATH", "${{LCG_external_area}}/Grid/{p}/{v}/${{BINARY_TAG}}/lib64/python${{PYTHON_VERSION_TWO}}/site-packages".format( p = p, v = v ) )
                     add( "env:prepend", "PYTHONPATH", "${{LCG_external_area}}/Grid/{p}/{v}/${{BINARY_TAG}}/lib/python${{PYTHON_VERSION_TWO}}/site-packages".format( p = p, v = v ) )
+                # Now checking if we have extra variables to set
+                # The 4rth argument should be a list of tuples with variables to set
+                if len( pack_info ) > 3:
+                    extra_var_list = pack_info[3]
+                    env_home_name = "%s_HOME" % p.upper()
+                    env_home_val = "${{LCG_external_area}}/Grid/{p}/{v}/${{BINARY_TAG}}".format( p = p, v = v )
+                    add( "env:set", env_home_name, env_home_val )
+                    for env_var in extra_var_list:
+                        add( "env:set", env_var[0], env_var[1] )
 
 #  <env:prepend variable="PATH">${LCG_releases_base}/LCG_83/pytools/1.9_python2.7/${BINARY_TAG}/bin</env:prepend>
 #  <env:prepend variable="PYTHONPATH">${LCG_releases_base}/LCG_83/pytools/1.9_python2.7/${BINARY_TAG}/lib/python2.7/site-packages</env:prepend>