Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit e7e0aa2

Browse files
committed
The statement templates files were not copied on ./setup.py install
...damn setuptools...
1 parent 5410f26 commit e7e0aa2

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

python/CMakeLists.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Sources
22
file(GLOB SOURCES_PY "${CMAKE_CURRENT_SOURCE_DIR}/*.py")
3+
set(MANIFEST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST.in")
34

45
# find all the python modules
56
file(GLOB_RECURSE __INIT__PYS "${CMAKE_CURRENT_SOURCE_DIR}/**/__init__.py")
@@ -42,6 +43,7 @@ file(MAKE_DIRECTORY ${BIN_DIRECTORY})
4243
file(WRITE "${BIN_DIRECTORY}/__init__.py" "")
4344

4445
# Compute the target file paths
46+
set(MANIFEST_FILE_TGT "${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.in")
4547
string(REGEX
4648
REPLACE "${CMAKE_CURRENT_SOURCE_DIR}"
4749
"${SOURCES_MODULE}"
@@ -68,6 +70,10 @@ set(CPP_EXECUTABLES "${BIN_DIRECTORY}/task-maker")
6870
set(FRONTEND_LIB "${SOURCES_MODULE}/task_maker_frontend.so")
6971

7072
# Copy all the files
73+
add_custom_command(OUTPUT ${MANIFEST_FILE_TGT}
74+
COMMAND ${CMAKE_COMMAND} -E copy ${MANIFEST_FILE}
75+
${MANIFEST_FILE_TGT}
76+
DEPENDS "${MANIFEST_FILE}")
7177
add_custom_command(OUTPUT ${SOURCES_PY_TGT}
7278
COMMAND ${CMAKE_COMMAND} -E copy ${SOURCES_PY}
7379
${SOURCES_MODULE}
@@ -143,14 +149,6 @@ add_custom_command(OUTPUT ${BIN_DIRECTORY}/task-maker
143149
${BIN_DIRECTORY}
144150
DEPENDS task-maker)
145151

146-
foreach(module_name ${PY_MODULES})
147-
string(REPLACE "/"
148-
"."
149-
setup_module_name
150-
${module_name})
151-
set(SETUP_PY_MODULES "${SETUP_PY_MODULES}, 'task_maker.${setup_module_name}'")
152-
endforeach()
153-
154152
# generate setup.py
155153
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in ${SETUP_PY})
156154
execute_process(COMMAND chmod 555 ${SETUP_PY})
@@ -160,6 +158,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.py.in ${VERSION_PY})
160158

161159
add_custom_target(module_files ALL
162160
DEPENDS ${MODULES_TGT}
161+
${MANIFEST_FILE_TGT}
163162
${STATEMENTS_TEMPLATES_DST_DIR}
164163
${REQUIREMENTS_TXT_TGT}
165164
"${TESTS_TASKS_TGT}"

python/MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
recursive-include task_maker/statements/templates *

python/setup.py.in

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
#!/usr/bin/env python3
22
import os
3-
from setuptools import setup
3+
from setuptools import setup, find_packages
44

55
os.chdir(os.path.dirname(os.path.abspath(__file__)))
66

77
setup(
88
name='task_maker',
99
version='${PROJECT_VERSION}',
10-
packages=[
11-
'task_maker', 'task_maker.bin' ${SETUP_PY_MODULES}
12-
],
10+
packages=find_packages() + ["task_maker.bin"],
1311
zip_safe=False,
1412
package_data={
1513
'task_maker.bin': ['*'],
16-
'task_maker.statements.templates': ['*'],
17-
'task_maker': ['*.so']
14+
'task_maker': ['*.so'],
1815
},
16+
include_package_data=True,
1917
entry_points={
2018
"console_scripts": [
2119
"task-maker = task_maker.task_maker:main",

0 commit comments

Comments
 (0)