sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename staged plugin install rules to use dashes, not underscores

Browse Source 
See http://lists.osgeo.org/pipermail/qgis-developer/2013-March/024759.html
This commit is contained in:
Sandro Santilli 2013-03-11 12:16:06 +01:00
parent 6741cff5b0
commit aba568b96a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
python/plugins/CMakeLists.txt
View File

@ -2,19 +2,19 @@
# will function when app is run from build directory # will function when app is run from build directory
# When staging all plugins, use the following make targets: # When staging all plugins, use the following make targets:
# staged_plugins - stage plugins (usually after repo pull/build and project make) # staged-plugins - stage plugins (usually after repo pull/build and project make)
# staged_plugins_pyc - stage and byte-compile all Python scripts # staged-plugins-pyc - stage and byte-compile all Python scripts
# clean_staged_plugins - removes the plugins directory and all contents # clean-staged-plugins - removes the plugins directory and all contents
# #
# When developing on a plugin, use the following make targets: # When developing on a plugin, use the following make targets:
# staged_[plugin_dir_name] - stage specific plugin, regenerating any changed resources # staged-[plugin_dir_name] - stage specific plugin, regenerating any changed resources
# clean_staged_[plugin_dir_name] - removes the plugin directory and its contents # clean-staged-[plugin_dir_name] - removes the plugin directory and its contents
# #
# NOTE: regular project 'make install' is unaffected # NOTE: regular project 'make install' is unaffected
ADD_CUSTOM_TARGET(staged_plugins) ADD_CUSTOM_TARGET(staged-plugins)
ADD_CUSTOM_TARGET(staged_plugins_pyc DEPENDS staged_plugins ADD_CUSTOM_TARGET(staged-plugins-pyc DEPENDS staged-plugins
COMMAND ${PYTHON_EXECUTABLE} -m compileall -q "${PYTHON_OUTPUT_DIRECTORY}/plugins" COMMAND ${PYTHON_EXECUTABLE} -m compileall -q "${PYTHON_OUTPUT_DIRECTORY}/plugins"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Byte-compiling staged Python plugins..." COMMENT "Byte-compiling staged Python plugins..."
@ -23,13 +23,13 @@ ADD_CUSTOM_TARGET(staged_plugins_pyc DEPENDS staged_plugins
# plugins can also be staged with CMake option at build time # plugins can also be staged with CMake option at build time
IF(WITH_STAGED_PLUGINS) IF(WITH_STAGED_PLUGINS)
IF(WITH_PY_COMPILE) IF(WITH_PY_COMPILE)
ADD_CUSTOM_TARGET(staged_plugins_on_build ALL DEPENDS staged_plugins_pyc) ADD_CUSTOM_TARGET(staged-plugins-on-build ALL DEPENDS staged-plugins-pyc)
ELSE(WITH_PY_COMPILE) ELSE(WITH_PY_COMPILE)
ADD_CUSTOM_TARGET(staged_plugins_on_build ALL DEPENDS staged_plugins) ADD_CUSTOM_TARGET(staged-plugins-on-build ALL DEPENDS staged-plugins)
ENDIF(WITH_PY_COMPILE) ENDIF(WITH_PY_COMPILE)
ENDIF(WITH_STAGED_PLUGINS) ENDIF(WITH_STAGED_PLUGINS)
ADD_CUSTOM_TARGET(clean_staged_plugins ADD_CUSTOM_TARGET(clean-staged-plugins
COMMAND ${CMAKE_COMMAND} -E remove_directory ${PYTHON_OUTPUT_DIRECTORY}/plugins COMMAND ${CMAKE_COMMAND} -E remove_directory ${PYTHON_OUTPUT_DIRECTORY}/plugins
) )
@ -39,33 +39,33 @@ MACRO (PLUGIN_INSTALL plugin subdir )
INSTALL(FILES ${ARGN} DESTINATION ${QGIS_DATA_DIR}/python/plugins/${plugin}/${subdir}) INSTALL(FILES ${ARGN} DESTINATION ${QGIS_DATA_DIR}/python/plugins/${plugin}/${subdir})
STRING(REPLACE "/" "_" subdir_sane "${subdir}") STRING(REPLACE "/" "_" subdir_sane "${subdir}")
IF(WITH_STAGED_PLUGINS) IF(WITH_STAGED_PLUGINS)
ADD_CUSTOM_TARGET(${plugin}_${subdir_sane} DEPENDS ${ARGN}) ADD_CUSTOM_TARGET(${plugin}-${subdir_sane} DEPENDS ${ARGN})
ELSE(WITH_STAGED_PLUGINS) ELSE(WITH_STAGED_PLUGINS)
ADD_CUSTOM_TARGET(${plugin}_${subdir_sane} ALL DEPENDS ${ARGN}) ADD_CUSTOM_TARGET(${plugin}-${subdir_sane} ALL DEPENDS ${ARGN})
ENDIF(WITH_STAGED_PLUGINS) ENDIF(WITH_STAGED_PLUGINS)
# for staged plugin install (to run from build directory) # for staged plugin install (to run from build directory)
ADD_CUSTOM_TARGET(${plugin}_${subdir_sane}_stageinstall DEPENDS ${ARGN}) ADD_CUSTOM_TARGET(${plugin}-${subdir_sane}-stageinstall DEPENDS ${ARGN})
ADD_CUSTOM_COMMAND(TARGET ${plugin}_${subdir_sane}_stageinstall ADD_CUSTOM_COMMAND(TARGET ${plugin}-${subdir_sane}-stageinstall
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_OUTPUT_DIRECTORY}/plugins/${plugin}/${subdir} COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_OUTPUT_DIRECTORY}/plugins/${plugin}/${subdir}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
FOREACH(file ${ARGN}) FOREACH(file ${ARGN})
ADD_CUSTOM_COMMAND(TARGET ${plugin}_${subdir_sane}_stageinstall ADD_CUSTOM_COMMAND(TARGET ${plugin}-${subdir_sane}-stageinstall
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${file}\" ${PYTHON_OUTPUT_DIRECTORY}/plugins/${plugin}/${subdir} COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${file}\" ${PYTHON_OUTPUT_DIRECTORY}/plugins/${plugin}/${subdir}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
#COMMENT "copying ${file} to ${PYTHON_OUTPUT_DIRECTORY}/plugins/${plugin}/${subdir}" #COMMENT "copying ${file} to ${PYTHON_OUTPUT_DIRECTORY}/plugins/${plugin}/${subdir}"
) )
ENDFOREACH(file) ENDFOREACH(file)
ADD_DEPENDENCIES(staged_plugins ${plugin}_${subdir_sane}_stageinstall) ADD_DEPENDENCIES(staged-plugins ${plugin}-${subdir_sane}-stageinstall)
IF(TARGET staged_${plugin}) IF(TARGET staged_${plugin})
ADD_DEPENDENCIES(staged_${plugin} ${plugin}_${subdir_sane}_stageinstall) ADD_DEPENDENCIES(staged_${plugin} ${plugin}-${subdir_sane}-stageinstall)
ELSE(TARGET staged_${plugin}) ELSE(TARGET staged_${plugin})
ADD_CUSTOM_TARGET(staged_${plugin} DEPENDS ${plugin}_${subdir_sane}_stageinstall) ADD_CUSTOM_TARGET(staged_${plugin} DEPENDS ${plugin}-${subdir_sane}-stageinstall)
ADD_CUSTOM_TARGET(clean_staged_${plugin} ADD_CUSTOM_TARGET(clean-staged-${plugin}
COMMAND ${CMAKE_COMMAND} -E remove_directory ${PYTHON_OUTPUT_DIRECTORY}/plugins/${plugin} COMMAND ${CMAKE_COMMAND} -E remove_directory ${PYTHON_OUTPUT_DIRECTORY}/plugins/${plugin}
) )
ENDIF(TARGET staged_${plugin}) ENDIF(TARGET staged_${plugin})