From 3a5ecff18c444eddc4eeb1de6c404a4b44081c60 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sat, 29 Apr 2017 23:16:31 +0200
Subject: cmake/MSYS2: Only install a fixed list of Python extensions (instead
 of all extensions that happen to be installed on the build system)

(bzr r15650)
---
 CMakeScripts/InstallMSYS2.cmake | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'CMakeScripts/InstallMSYS2.cmake')

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index bff09cabf..8d31aca46 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -173,7 +173,7 @@ if(WIN32)
     FILES_MATCHING
     PATTERN "*gtk30.mo"
     PATTERN "*gtkspell3.mo")
-    
+
   install(DIRECTORY ${MINGW_PATH}/share/poppler
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share)
 
@@ -234,5 +234,27 @@ if(WIN32)
     ${MINGW_BIN}/libpython2.7.dll
     DESTINATION ${CMAKE_INSTALL_PREFIX})
   install(DIRECTORY ${MINGW_LIB}/python2.7
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+    PATTERN "python2.7/site-packages" EXCLUDE)
+
+  set(site_packages "lib/python2.7/site-packages")
+  # Python packages installed via pacman
+  set(packages "python2-lxml" "python2-numpy")
+  foreach(package ${packages})
+    list_files_pacman(${package} paths)
+    install_list(FILES ${paths}
+      ROOT ${MINGW_PATH}
+      INCLUDE ${site_packages} # only include content from "site-packages" (we might consider to install everything)
+    )
+  endforeach()
+  # Python packages installed via pip
+  set(packages "coverage" "pyserial" "scour" "six")
+  foreach(package ${packages})
+    list_files_pip(${package} paths)
+    install_list(FILES ${paths}
+      ROOT ${MINGW_PATH}/${site_packages}
+      DESTINATION ${site_packages}/
+      EXCLUDE "^\\.\\.\\/" # exclude content in parent directories (notably scripts installed to /bin)
+    )
+  endforeach()
 endif()
\ No newline at end of file
-- 
cgit v1.2.3


From a42c31431619e71e4da2166fdb28ac49f5ffc365 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sat, 29 Apr 2017 23:45:55 +0200
Subject: cmake: Do not build/install folders (data,modules,plugins) They're
 empty, are only created on Windows and seem to be completely unused

(bzr r15651)
---
 CMakeScripts/InstallMSYS2.cmake | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'CMakeScripts/InstallMSYS2.cmake')

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 8d31aca46..c6690bbe9 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -27,6 +27,9 @@ if(WIN32)
 	LGPL2.1.txt
     DESTINATION ${CMAKE_INSTALL_PREFIX})
 
+  install(DIRECTORY doc
+    DESTINATION ${CMAKE_INSTALL_PREFIX})
+
   # mingw dlls
   install(FILES
     ${MINGW_BIN}/LIBEAY32.dll
@@ -142,23 +145,6 @@ if(WIN32)
       DESTINATION ${CMAKE_INSTALL_PREFIX})
   endif()
 
-  # Setup application data directories, poppler files, locales, icons and themes
-  file(MAKE_DIRECTORY
-    data
-    doc
-    modules
-    plugins)
-
-  install(DIRECTORY
-    data
-    doc
-    modules
-    plugins
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
-    PATTERN hicolor/index.theme EXCLUDE   # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV.
-    PATTERN CMakeLists.txt EXCLUDE
-    PATTERN *.am EXCLUDE)
-
   # Install hicolor/index.theme to avoid bug 1635207
   install(FILES
     ${MINGW_PATH}/share/icons/hicolor/index.theme
-- 
cgit v1.2.3