From 45de27baba451376a2b2cd418dd488abb4db0c31 Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Date: Sun, 22 Sep 2013 00:03:02 +0200 Subject: [PATCH] Scripting build tools moved and renamed --- pcbnew/CMakeLists.txt | 10 +++++----- .../extract_docstrings.py} | 0 .../fix_swig_imports.py} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename scripting/{extract-docstrings.py => build_tools/extract_docstrings.py} (100%) rename scripting/{fixswigimports.py => build_tools/fix_swig_imports.py} (100%) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 2d757b7fec..234759b819 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -312,7 +312,7 @@ if( KICAD_SCRIPTING ) COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/docstrings/docstrings.i # this makes docstrings.i available if it doesn't exist COMMAND ${SWIG_EXECUTABLE} ${SWIG_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx scripting/pcbnew.i - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripting/fixswigimports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripting/build_tools/fix_swig_imports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -372,9 +372,9 @@ if( DOXYGEN_FOUND ) add_custom_target( xml-to-docstrings COMMAND ${CMAKE_COMMAND} -E remove_directory docstrings COMMAND ${CMAKE_COMMAND} -E make_directory docstrings - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripting/extract-docstrings.py pcbnew.py doxygen-xml/xml docstrings + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripting/build_tools/extract_docstrings.py pcbnew.py doxygen-xml/xml docstrings - COMMAND ${CMAKE_COMMAND} -E remove pcbnew.py # force removal so it will be recreated later + COMMAND ${CMAKE_COMMAND} -E remove pcbnew.py # force removal so it will be recreated later with the new docstrings COMMENT "building docstring files" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS pcbnew.py @@ -515,7 +515,7 @@ install( TARGETS pcbnew if( KICAD_SCRIPTING ) add_custom_target( FixSwigImportsScripting ALL - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripting/fixswigimports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripting/build_tools/fix_swig_imports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py DEPENDS pcbnew COMMENT "Fixing swig_import_helper in Kicad scripting" ) @@ -525,7 +525,7 @@ endif() if( KICAD_SCRIPTING_MODULES ) add_custom_target( FixSwigImportsModuleScripting ALL - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripting/fixswigimports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripting/build_tools/fix_swig_imports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py DEPENDS _pcbnew COMMENT "Fixing swig_import_helper in Kicad scripting modules" ) diff --git a/scripting/extract-docstrings.py b/scripting/build_tools/extract_docstrings.py similarity index 100% rename from scripting/extract-docstrings.py rename to scripting/build_tools/extract_docstrings.py diff --git a/scripting/fixswigimports.py b/scripting/build_tools/fix_swig_imports.py similarity index 100% rename from scripting/fixswigimports.py rename to scripting/build_tools/fix_swig_imports.py