Merge branch 'Flake8Fix-master-20190417' into 'master'

flake8_atlas fix, master branch (2019.04.17.)

See merge request atlas/athena!22747

Tools/PyUtils/CMakeLists.txt

@@ -18,17 +18,31 @@ find_package( ROOT COMPONENTS Core PyROOT Tree MathCore Hist RIO pthread )
 atlas_install_python_modules( python/*.py python/AthFile python/scripts python/flake8_atlas )
 atlas_install_scripts( bin/acmd.py bin/atl-gen-athena-d3pd-reader bin/checkFile.py bin/checkPlugins.py bin/checkSG.py bin/checkMetaSG.py bin/checkTP.py bin/checkxAOD.py bin/diff-athfile bin/diff-jobo-cfg.py bin/diffConfigs.py bin/diffPoolFiles.py bin/diffTAGTree.py bin/dlldep.py bin/dso-stats.py bin/dump-athfile.py bin/dumpAthfilelite.py bin/filter-and-merge-d3pd.py bin/getMetadata.py bin/get-tag-diff.py bin/gprof2dot bin/issues bin/magnifyPoolFile.py bin/merge-poolfiles.py bin/pep8.py bin/pool_extractFileIdentifier.py bin/pool_insertFileToCatalog.py bin/print_auditor_callgraph.py bin/pyroot.py bin/vmem-sz.py bin/meta-reader.py bin/lstags )
 
-# Install flake8 plugins using setuptools:
-add_custom_command( OUTPUT flake8_atlas.egg-info
+# Install flake8 plugins using setuptools.
+set( _flake8Dir
+   "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/flake8Install" )
+set( _flake8Stamp
+   "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/flake8.stamp" )
+add_custom_command( OUTPUT "${_flake8Stamp}"
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/python/flake8_atlas/setup.py
-   COMMAND ${CMAKE_BINARY_DIR}/atlas_build_run.sh
+   COMMAND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atlas_build_run.sh
    python ${CMAKE_CURRENT_SOURCE_DIR}/python/flake8_atlas/setup.py install
    --root /
-   --prefix ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
-   --install-lib ${CMAKE_PYTHON_OUTPUT_DIRECTORY} )
-
+   --prefix "${_flake8Dir}"
+   --install-lib "${_flake8Dir}/${CMAKE_INSTALL_PYTHONDIR}"
+   COMMAND ${CMAKE_COMMAND} -E copy_directory "${_flake8Dir}/"
+   "${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}"
+   COMMAND ${CMAKE_COMMAND} -E touch "${_flake8Stamp}"
+   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}"
+   COMMENT "Building/installing flake8..." )
 add_custom_target( flake8_atlas ALL
-   DEPENDS flake8_atlas.egg-info )
+   DEPENDS "${_flake8Stamp}" )
+install( DIRECTORY "${_flake8Dir}/"
+   DESTINATION .
+   USE_SOURCE_PERMISSIONS
+   OPTIONAL )
+unset( _flake8Dir )
+unset( _flake8Stamp )
 
 # Aliases:
 atlas_add_alias( checkFile "checkFile.py" )