Merge pull request elfmz#2436 from m32/master

python inside packaging

CMakeLists.txt

@@ -469,6 +469,10 @@ if (DEFINED PYTHON AND PYTHON)
         DESTINATION "lib/far2l/Plugins/python/plug/" USE_SOURCE_PERMISSIONS
         COMPONENT base FILES_MATCHING
         PATTERN "*")
+    install(DIRECTORY "${INSTALL_DIR}/Plugins/python/plug/plugins"
+        DESTINATION "lib/far2l/Plugins/python/plug/" USE_SOURCE_PERMISSIONS
+        COMPONENT base FILES_MATCHING
+        PATTERN "*")
 else()
     message(STATUS "${ColorRed}PYTHON plugin disabled, use -DPYTHON=yes if you need it${ColorNormal}")
     install(CODE "

README.md

@@ -123,9 +123,8 @@ See also [Community packages & binaries](#community_bins)
 * `libarchive-dev` (_optional_ - needed for better archives support in **multiarc**)
 * `libunrar-dev` (_optional_ - needed for RAR archives support in **multiarc**, see `UNRAR` command line option)
 * `libpcre2-dev` (_optional_ - needed for advanced custom archive formats support in **multiarc**)
-* `libpython3-dev` (_optional_ - needed for **python plugins** support, see `-DPYTHON` command line option)
-* `libffi-dev` (_optional_ - needed for **python plugins** support, see `-DPYTHON` command line option)
-* `python3-venv` (_optional_ - needed for **python plugins** support, see `-DPYTHON` command line option)
+* `python3-dev` (_optional_ - needed for **python plugins** support, see `-DPYTHON` command line option)
+* `python3-cffi` (_optional_ - needed for **python plugins** support, see `-DPYTHON` command line option)
 * `cmake` ( >= 3.2.2 )
 * `pkg-config`
 * `g++`
@@ -187,9 +186,8 @@ To eliminate libuchardet requirement to reduce far2l dependencies by cost of los
 
 To build with Python plugin: add argument `-DPYTHON=yes`
 but you must have installed additional packages within yours system:
-`libpython3-dev`,
-`libffi-dev`,
-`python3-venv`.
+`python3-dev`,
+`python3-cffi`.
 
 
 To control how RAR archives will be handled in multiarc:

dependencies.txt

@@ -12,4 +12,5 @@ libxml2-dev
 libarchive-dev
 libssh-dev
 
-python3
+python3-dev
+python3-cffi

packaging/CMakeLists.txt

@@ -47,6 +47,9 @@ endif(PCRE_FOUND)
 if(LibArchive_FOUND)
     LIST(APPEND PACKAGE_DEPENDENCIES libarchive13)
 endif(LibArchive_FOUND)
+IF (${PYTHON})
+    LIST(APPEND PACKAGE_DEPENDENCIES "python3, python3-cffi")
+ENDIF()
 
 string(REPLACE ";" ", " PACKAGE_DEPENDENCIES "${PACKAGE_DEPENDENCIES}")
 

python/CMakeLists.txt

@@ -41,9 +41,7 @@ set_target_properties(python PROPERTIES
 )
 
 add_custom_command(
-    #TARGET python POST_BUILD
     OUTPUT "${INSTALL_DIR}/Plugins/python/plug/far2l/far2lcffi.h"
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/configs
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/far2lcffi.h
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/far2lcffidefs.h
     DEPENDS ../far2l/far2sdk/farplug-wide.h
@@ -53,6 +51,13 @@ add_custom_command(
     DEPENDS ../WinPort/WinCompat.h
     DEPENDS ../WinPort/WinPort.h
     DEPENDS ../WinPort/WinPortDecl.h
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/configs" "${INSTALL_DIR}/Plugins/python"
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/src/prebuild.sh "${CMAKE_SOURCE_DIR}" "${INSTALL_DIR}/Plugins/python/plug/far2l/far2lcffi.h" "${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS}"
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/configs/plug/far2l" "${INSTALL_DIR}/Plugins/python/plug/far2l"
+    COMMAND "${CMAKE_SOURCE_DIR}/python/src/build.sh" "${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS}" "${CMAKE_SOURCE_DIR}" "${INSTALL_DIR}"
+    COMMAND cat "${CMAKE_SOURCE_DIR}/python/src/far2lcffidefs.h" >> "${INSTALL_DIR}/Plugins/python/plug/far2l/far2lcffi.h"
+)
+
+add_custom_command(
+    TARGET python POST_BUILD
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/configs/plug/plugins
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/configs/plug/plugins" "${INSTALL_DIR}/Plugins/python/plug/plugins"
 )

python/src/build.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+PREPROCESSOR=$1
+SRC=$2
+DST=$3
+${PREPROCESSOR} -E -P -xc \
+-I"${SRC}/far2l/far2sdk" -I"${SRC}/WinPort" "${SRC}/python/src/far2lcffi.h" \
+> "${DST}/Plugins/python/plug/far2l/far2lcffi.h"