GaudiKernel/src/Util/genconf.cpp

@@ -419,7 +419,7 @@ int main( int argc, char** argv )
   if ( EXIT_SUCCESS == sc && !vm.count( "no-init" ) ) {
     // create an empty __init__.py file in the output dir
     std::fstream initPy( ( out / fs::path( "__init__.py" ) ).string(), std::ios_base::out | std::ios_base::trunc );
-    initPy << "## Hook for " << pkgName << " genConf module\n" << flush;
+    initPy << "__path__ = __import__('pkgutil').extend_path(__path__, __name__)\n" << flush;
   }
 
   {

cmake/GaudiProjectConfig.cmake

@@ -748,49 +748,17 @@ main()")
     set(project_build_environment ${project_build_environment} ${_pack_env})
 
     # we need special handling of PYTHONPATH and PATH for the build-time environment
-    set(_has_config NO)
-    set(_has_python NO)
-    if(EXISTS ${CMAKE_BINARY_DIR}/${package}/genConf OR TARGET ${_pack}ConfUserDB)
+    if(EXISTS ${CMAKE_SOURCE_DIR}/${package}/python)
       set(project_build_environment ${project_build_environment}
-          PREPEND PYTHONPATH ${CMAKE_BINARY_DIR}/${package}/genConf)
-      set(_has_config YES)
+          PREPEND PYTHONPATH \${${_proj}_PROJECT_ROOT}/${package}/python)
     endif()
 
-    if(EXISTS ${CMAKE_SOURCE_DIR}/${package}/python)
+    # It is important that genConf comes first in PYTHONPATH (i.e. is prepended
+    # second), so that its special generated __init__.py is found, which then
+    # allows for the user module in ${package}/python to be found.
+    if(EXISTS ${CMAKE_BINARY_DIR}/${package}/genConf OR TARGET ${_pack}ConfUserDB)
       set(project_build_environment ${project_build_environment}
-          PREPEND PYTHONPATH \${${_proj}_PROJECT_ROOT}/${package}/python)
-      set(_has_python YES)
-    endif()
-
-    if(_has_config AND _has_python)
-      # we need to add a special fake __init__.py that allow import of modules
-      # from different copies of the package
-      get_filename_component(packname ${package} NAME)
-      # find python packages in the python directory of the subdir
-      file(GLOB_RECURSE pypacks
-           RELATIVE ${CMAKE_SOURCE_DIR}/${package}/python
-           ${CMAKE_SOURCE_DIR}/${package}/python/*/__init__.py)
-      # sanitize the list (we only need the directory name)
-      string(REPLACE "//" "/" pypacks "${pypacks}")
-      string(REPLACE "/__init__.py" "" pypacks "${pypacks}")
-      #message(STATUS "pypacks -> ${pypacks}")
-      # add the top package if it was not found
-      set(pypacks ${packname} ${pypacks})
-      list(REMOVE_DUPLICATES pypacks)
-      # create all the __init__.py files
-      foreach(pypack ${pypacks})
-        #message(STATUS "creating local ${pypack}/__init__.py")
-        file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/python/${pypack})
-        file(WRITE ${CMAKE_BINARY_DIR}/python/${pypack}/__init__.py "
-import os, sys
-__path__ = [d for d in [os.path.join(d, '${pypack}') for d in sys.path if d]
-            if (d.startswith('${CMAKE_BINARY_DIR}') or
-                d.startswith('${CMAKE_SOURCE_DIR}')) and
-               (os.path.exists(d) or 'python.zip' in d)]
-if os.path.exists('${CMAKE_SOURCE_DIR}/${package}/python/${pypack}/__init__.py'):
-    execfile('${CMAKE_SOURCE_DIR}/${package}/python/${pypack}/__init__.py')
-")
-      endforeach()
+          PREPEND PYTHONPATH ${CMAKE_BINARY_DIR}/${package}/genConf)
     endif()
 
     if(EXISTS ${CMAKE_SOURCE_DIR}/${package}/scripts)
@@ -811,8 +779,7 @@ if os.path.exists('${CMAKE_SOURCE_DIR}/${package}/python/${pypack}/__init__.py')
       PREPEND PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
       PREPEND LD_LIBRARY_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
       PREPEND ROOT_INCLUDE_PATH ${CMAKE_BINARY_DIR}/include
-      PREPEND PYTHONPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-      PREPEND PYTHONPATH ${CMAKE_BINARY_DIR}/python)
+      PREPEND PYTHONPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
   if(GAUDI_ATLAS)
     set(project_build_environment ${project_build_environment}
         PREPEND JOBOPTSEARCHPATH ${CMAKE_BINARY_DIR}/jobOptions
@@ -3166,7 +3133,7 @@ function(gaudi_generate_env_conf filename)
     set(data "${data}  <env:search_path>${val}</env:search_path>\n")
   endforeach()
   foreach(other_project ${used_gaudi_projects})
-    set(data "${data}  <env:include>${other_project}.xenv</env:include>\n")
+    set(data "${data}  <env:include>${other_project}-build.xenv</env:include>\n")
   endforeach()
   foreach(datapkg ${used_data_packages})
     get_filename_component(_xenv_file "${${datapkg}_XENV}" NAME)