Improve and update Python to 3.9, change some naming conventions, add -rdynamic for backtrace symbols in shared objects.

viferga · viferga · commit 693d3414a45e · 2021-09-10T13:00:27.000+02:00
diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
@@ -205,7 +205,7 @@ if (PROJECT_OS_FAMILY MATCHES "unix")
 	# Debug symbols
 	if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
 		add_compile_options(-g)
-		add_compile_options(-rdynamic)
+		add_link_options(-rdynamic)
 	endif()
 
 	# Optimizations
diff --git a/source/loaders/CMakeLists.txt b/source/loaders/CMakeLists.txt
@@ -18,8 +18,8 @@ option(OPTION_BUILD_LOADERS_LLVM "Build LLVM 11 loader plugin." OFF)
 option(OPTION_BUILD_LOADERS_LUA "Build LuaJIT2 v2.1 (OpenResty fork) loader plugin." OFF)
 option(OPTION_BUILD_LOADERS_MOCK "Build mock loader loader plugin." ON)
 option(OPTION_BUILD_LOADERS_NODE "Build NodeJS v12.21.0 JavaScript Runtime loader plugin." OFF)
-option(OPTION_BUILD_LOADERS_PY "Build Python 3.7 C API loader plugin." OFF)
-option(OPTION_BUILD_LOADERS_RB "Build Ruby 2.5 C API loader plugin." OFF)
+option(OPTION_BUILD_LOADERS_PY "Build Python 3.9 C API loader plugin." OFF)
+option(OPTION_BUILD_LOADERS_RB "Build Ruby 2.7 C API loader plugin." OFF)
 option(OPTION_BUILD_LOADERS_RPC "Build cURL Remote Procedure Call loader plugin." OFF)
 option(OPTION_BUILD_LOADERS_TS "Build TypeScript 3.9.7 Runtime loader plugin." OFF)
 option(OPTION_BUILD_LOADERS_WASM "Build WebAssembly Virtual Machine loader plugin." OFF)
@@ -39,8 +39,8 @@ add_subdirectory(llvm_loader) # LLVM Compiler Infrastructure
 add_subdirectory(lua_loader) # LuaJIT2 v2.1 (OpenResty fork) Runtime
 add_subdirectory(mock_loader) # Mock loader plugin without dependencies (core testing)
 add_subdirectory(node_loader) # NodeJS v12.21.0 JavaScript Runtime
-add_subdirectory(py_loader) # Python 3.7 C API
-add_subdirectory(rb_loader) # Ruby 2.5 C API
+add_subdirectory(py_loader) # Python 3.9 C API
+add_subdirectory(rb_loader) # Ruby 2.7 C API
 add_subdirectory(rpc_loader) # cURL Remote Procedure Call
 add_subdirectory(ts_loader) # TypeScript 3.9.7
 add_subdirectory(wasm_loader) # WebAssembly Virtual Machine
diff --git a/source/ports/py_port/CMakeLists.txt b/source/ports/py_port/CMakeLists.txt
@@ -6,8 +6,7 @@ endif()
 #
 # External dependencies
 #
-
-set(Python_ADDITIONAL_VERSIONS 3.7)
+set(Python_ADDITIONAL_VERSIONS 3)
 
 find_package(PythonInterp REQUIRED)
 
diff --git a/source/ports/py_port/setup.py b/source/ports/py_port/setup.py
@@ -81,6 +81,7 @@
 		'Programming Language :: Python :: 3.6',
 		'Programming Language :: Python :: 3.7',
 		'Programming Language :: Python :: 3.8',
+		'Programming Language :: Python :: 3.9',
 	],
 
 	# Keywords
diff --git a/source/ports/py_port/tox.ini b/source/ports/py_port/tox.ini
@@ -23,15 +23,16 @@ basepython =
 	py36: python3.6
 	py37: python3.7
 	py38: python3.8
+	py39: python3.9
 deps =
 	check-manifest
-	{py27,py33,py34,py35,py36,py37,py38}: readme_renderer
+	{py27,py33,py34,py35,py36,py37,py38,py39}: readme_renderer
 	flake8
 	pytest
 commands =
 	check-manifest --ignore tox.ini,tests*
 	# py26 doesn't have "setup.py check"
-	{py27,py33,py34,py35,py36,py37,py38}: python setup.py check -m -r -s
+	{py27,py33,py34,py35,py36,py37,py38,py39}: python setup.py check -m -r -s
 	flake8 .
 	py.test tests
 [flake8]
diff --git a/source/scripts/python/CMakeLists.txt b/source/scripts/python/CMakeLists.txt
@@ -32,4 +32,4 @@ add_subdirectory(host)
 add_subdirectory(s1)
 add_subdirectory(s2)
 add_subdirectory(withoutfunctions)
-add_subdirectory(wasm_test)
+add_subdirectory(wasm)
diff --git a/source/scripts/python/frontend/CMakeLists.txt b/source/scripts/python/frontend/CMakeLists.txt
@@ -2,7 +2,7 @@
 # External dependencies
 #
 
-set(Python_ADDITIONAL_VERSIONS 3.7)
+set(Python_ADDITIONAL_VERSIONS 3)
 
 find_package(PythonInterp REQUIRED)
 
diff --git a/source/scripts/python/wasm/CMakeLists.txt b/source/scripts/python/wasm/CMakeLists.txt
@@ -2,4 +2,4 @@
 # Configure python project
 #
 
-py_project(wasm_test 0.1.0)
+py_project(wasm 0.1.0)
diff --git a/source/scripts/python/wasm/depends/__init__.py b/source/scripts/python/wasm/depends/__init__.py
@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-import wasm_test
+import wasm
diff --git a/source/scripts/python/wasm/source/wasm.py b/source/scripts/python/wasm/source/wasm.py
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
@@ -107,8 +107,6 @@ add_subdirectory(dynlink_test)
 add_subdirectory(detour_test)
 add_subdirectory(serial_test)
 add_subdirectory(configuration_test)
-add_subdirectory(py_django_integration_test)
-add_subdirectory(py_loader_port_test)
 add_subdirectory(rb_loader_parser_test)
 add_subdirectory(loader_path_test)
 add_subdirectory(metacall_logs_test)
@@ -157,6 +155,8 @@ add_subdirectory(metacall_python_model_test)
 add_subdirectory(metacall_python_pointer_test)
 add_subdirectory(metacall_python_reentrant_test)
 add_subdirectory(metacall_python_varargs_test)
+add_subdirectory(metacall_python_django_integration_test)
+add_subdirectory(metacall_python_loader_port_test)
 add_subdirectory(metacall_python_port_test)
 add_subdirectory(metacall_python_port_https_test)
 add_subdirectory(metacall_python_callback_test)
diff --git a/source/tests/metacall_python_django_integration_test/CMakeLists.txt b/source/tests/metacall_python_django_integration_test/CMakeLists.txt
@@ -9,7 +9,7 @@ endif()
 
 find_package(PythonLibs 3 REQUIRED)
 
-set(Python_ADDITIONAL_VERSIONS 3.7)
+set(Python_ADDITIONAL_VERSIONS 3)
 
 find_package(PythonInterp REQUIRED)
 
@@ -31,7 +31,7 @@ endif()
 #
 
 # Target name
-set(target py-django-integration-test)
+set(target metacall-python-django-integration-test)
 message(STATUS "Test ${target}")
 
 #
@@ -55,7 +55,7 @@ set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
 
 set(sources
 	${source_path}/main.cpp
-	${source_path}/py_django_integration_test.cpp
+	${source_path}/metacall_python_django_integration_test.cpp
 )
 
 # Group source files
diff --git a/source/tests/metacall_python_django_integration_test/data/client.py.in b/source/tests/metacall_python_django_integration_test/data/client.py.in
diff --git a/source/tests/metacall_python_django_integration_test/data/django_file.txt b/source/tests/metacall_python_django_integration_test/data/django_file.txt
diff --git a/source/tests/metacall_python_django_integration_test/data/test.py.in b/source/tests/metacall_python_django_integration_test/data/test.py.in
diff --git a/source/tests/metacall_python_django_integration_test/source/main.cpp b/source/tests/metacall_python_django_integration_test/source/main.cpp
diff --git a/source/tests/metacall_python_django_integration_test/source/metacall_python_django_integration_test.cpp b/source/tests/metacall_python_django_integration_test/source/metacall_python_django_integration_test.cpp
@@ -23,12 +23,12 @@
 #include <metacall/metacall.h>
 #include <metacall/metacall_loaders.h>
 
-class py_django_integration_test : public testing::Test
+class metacall_python_django_integration_test : public testing::Test
 {
 public:
 };
 
-TEST_F(py_django_integration_test, DefaultConstructor)
+TEST_F(metacall_python_django_integration_test, DefaultConstructor)
 {
 	metacall_print_info();
 
diff --git a/source/tests/metacall_python_loader_port_test/CMakeLists.txt b/source/tests/metacall_python_loader_port_test/CMakeLists.txt
@@ -32,7 +32,7 @@ set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
 
 set(sources
 	${source_path}/main.cpp
-	${source_path}/py_loader_port_test.cpp
+	${source_path}/metacall_python_loader_port_test.cpp
 )
 
 # Group source files
diff --git a/source/tests/metacall_python_loader_port_test/source/main.cpp b/source/tests/metacall_python_loader_port_test/source/main.cpp
diff --git a/source/tests/metacall_python_loader_port_test/source/metacall_python_loader_port_test.cpp b/source/tests/metacall_python_loader_port_test/source/metacall_python_loader_port_test.cpp
@@ -23,7 +23,7 @@
 #include <metacall/metacall.h>
 #include <metacall/metacall_loaders.h>
 
-class py_loader_port_test : public testing::Test
+class metacall_python_loader_port_test : public testing::Test
 {
 public:
 };
@@ -42,7 +42,7 @@ void *callback_host(size_t argc, void *args[], void *data)
 	return metacall_value_create_int(25);
 }
 
-TEST_F(py_loader_port_test, DefaultConstructor)
+TEST_F(metacall_python_loader_port_test, DefaultConstructor)
 {
 	metacall_print_info();
 
diff --git a/source/tests/metacall_wasm_python_port_test/source/metacall_wasm_python_port_test.cpp b/source/tests/metacall_wasm_python_port_test/source/metacall_wasm_python_port_test.cpp
@@ -38,8 +38,9 @@ class metacall_wasm_python_port_test : public testing::Test
 
 TEST_F(metacall_wasm_python_port_test, CallWasmFromPython)
 {
-	const char *script = "wasm_test.py";
+	const char *scripts[] = {
+		"wasm.py"
+	};
 
-	ASSERT_EQ(0, metacall_load_from_file("py", &script, 1, NULL));
-	ASSERT_EQ(0, metacall_destroy());
+	ASSERT_EQ(0, metacall_load_from_file("py", scripts, 1, NULL));
 }
diff --git a/tools/metacall-configure.sh b/tools/metacall-configure.sh
@@ -140,9 +140,7 @@ sub_configure() {
 
 	# Python
 	if [ $BUILD_PYTHON = 1 ]; then
-		BUILD_STRING="$BUILD_STRING \
-			-DPYTHON_EXECUTABLE=/usr/bin/python3.7 \
-			-DOPTION_BUILD_LOADERS_PY=On"
+		BUILD_STRING="$BUILD_STRING -DOPTION_BUILD_LOADERS_PY=On"
 
 		if [ $BUILD_SCRIPTS = 1 ]; then
 			BUILD_STRING="$BUILD_STRING -DOPTION_BUILD_SCRIPTS_PY=On"
diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh
@@ -344,7 +344,7 @@ sub_metacall(){
 		NETCORE_VERSION=0
 	fi
 
-	cmake -Wno-dev ../ -DPYTHON_EXECUTABLE=/usr/bin/python3.7 -DOPTION_BUILD_EXAMPLES=off -DOPTION_BUILD_LOADERS_PY=on -DOPTION_BUILD_LOADERS_RB=on -DOPTION_BUILD_LOADERS_CS=on -DOPTION_BUILD_LOADERS_JS=on -DCMAKE_BUILD_TYPE=Release -DDOTNET_CORE_PATH=/usr/share/dotnet/shared/Microsoft.NETCore.App/$NETCORE_VERSION/
+	cmake -Wno-dev ../ -DOPTION_BUILD_EXAMPLES=off -DOPTION_BUILD_LOADERS_PY=on -DOPTION_BUILD_LOADERS_RB=on -DOPTION_BUILD_LOADERS_CS=on -DOPTION_BUILD_LOADERS_JS=on -DCMAKE_BUILD_TYPE=Release -DDOTNET_CORE_PATH=/usr/share/dotnet/shared/Microsoft.NETCore.App/$NETCORE_VERSION/
 	make
 	make test && echo "test ok!"
 
diff --git a/tools/metacall-runtime.sh b/tools/metacall-runtime.sh
@@ -56,7 +56,7 @@ sub_apt(){
 sub_python(){
 	echo "configure python"
 	cd $ROOT_DIR
-	sub_apt_install_hold python3 libpython3.7
+	sub_apt_install_hold python3 libpython3.9
 }
 
 # Ruby
diff --git a/tools/runtime/Dockerfile b/tools/runtime/Dockerfile
@@ -88,7 +88,7 @@ COPY --from=builder /usr/local/lib/*.so /usr/local/lib/*.so* /usr/local/lib/*.dl
 COPY --from=builder /usr/local/lib/node_modules/ /usr/local/lib/node_modules/
 
 # Copy python dependencies (and port) from builder
-COPY --from=builder /usr/local/lib/python3.7/dist-packages/metacall/ /usr/local/lib/python3.7/dist-packages/metacall/
+COPY --from=builder /usr/local/lib/python3.9/dist-packages/metacall/ /usr/local/lib/python3.9/dist-packages/metacall/
 
 # Copy headers from builder
 COPY --from=builder /usr/local/include/metacall /usr/local/include/metacall

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ endif()`
`6`	`6`	`#`
`7`	`7`	`# External dependencies`
`8`	`8`	`#`
`9`		`-`
`10`		`-set(Python_ADDITIONAL_VERSIONS 3.7)`
	`9`	`+set(Python_ADDITIONAL_VERSIONS 3)`
`11`	`10`
`12`	`11`	`find_package(PythonInterp REQUIRED)`
`13`	`12`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# External dependencies`
`3`	`3`	`#`
`4`	`4`
`5`		`-set(Python_ADDITIONAL_VERSIONS 3.7)`
	`5`	`+set(Python_ADDITIONAL_VERSIONS 3)`
`6`	`6`
`7`	`7`	`find_package(PythonInterp REQUIRED)`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`	`# Configure python project`
`3`	`3`	`#`
`4`	`4`
`5`		`-py_project(wasm_test 0.1.0)`
	`5`	`+py_project(wasm 0.1.0)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/usr/bin/env python3`
`2`	`2`
`3`		`-import wasm_test`
	`3`	`+import wasm`