Update python to 3.7, ruby to 2.5 and debian to buster. Disabled V8 from build step, it needs to be compiled like NodeJS (possibly in a different dockerfile or migrating all docker dependency management to Guix). Update swig to 4.0. Improve node port for handling already installed metacall (Guix).

viferga · viferga · commit bc178076395f · 2019-12-30T04:15:42.000-09:00
diff --git a/.env b/.env
@@ -24,4 +24,4 @@ COMPOSE_PROJECT_NAME='metacall'
 METACALL_PATH=/usr/local/metacall
 METACALL_NODE_BUILD_TYPE=Release
 METACALL_CORE_BUILD_TYPE=release
-METACALL_BASE_IMAGE=debian:stretch-slim
+METACALL_BASE_IMAGE=debian:buster-slim
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ This section describes all programming languages that **METACALL** supports, if
 | [NodeJS](https://nodejs.org/)                                      | [N API](https://nodejs.org/api/n-api.html)                                                   | **>= 8.11.1<sup>†</sup> <= 10.16.3** | node |
 | [JavaScript](https://developer.mozilla.org/bm/docs/Web/JavaScript) | [V8](https://v8.dev/)                                                                        |             **5.1.117**              |  js  |
 | [C#](https://dotnet.microsoft.com/)                                | [NetCore](https://github.com/dotnet/docs/blob/master/docs/core/tutorials/netcore-hosting.md) |    **>= 1.0.0-preview2 <= 2.2.8**    |  cs  |
-| [Ruby](https://ruby-lang.org/)                                     | [Ruby C API](https://silverhammermba.github.io/emberb/c/)                                    |          **>= 2.1 <= 2.3**           |  rb  |
+| [Ruby](https://ruby-lang.org/)                                     | [Ruby C API](https://silverhammermba.github.io/emberb/c/)                                    |          **>= 2.1 <= 2.5**           |  rb  |
 | [File](/source/loaders/file_loader)                                | **∅**                                                                                        |              **0.1.0**               | file |
 | [Mock](/source/loaders/mock_loader)                                | **∅**                                                                                        |              **0.1.0**               | mock |
 
@@ -591,13 +591,13 @@ The following platforms and architectures have been tested an work correctly wit
 |     Operative System      |    Architecture     |    Compiler     |                                              Build Status                                              |
 |:-------------------------:|:-------------------:|:---------------:|:------------------------------------------------------------------------------------------------------:|
 |    **`ubuntu:xenial`**    |     **`amd64`**     |    **`gcc`**    |                                                                                                        |
-| **`debian:stretch-slim`** |     **`amd64`**     | **`gcc:6.3.0`** | [![build](https://gitlab.com/metacall/core/badges/master/build.svg)](https://gitlab.com/metacall/core) |
+| **`debian:buster-slim`** |     **`amd64`**     | **`gcc:6.3.0`** | [![build](https://gitlab.com/metacall/core/badges/master/build.svg)](https://gitlab.com/metacall/core) |
 | **`debian:buster-slim`**  |     **`amd64`**     | **`gcc:8.2.0`** |                                                                                                        |
 |       **`windows`**       | **`x86`** **`x64`** |   **`msvc`**    |                                                                                                        |
 
 ### 7.1 Docker Support
 
-To provide a reproducible environment **METACALL** is also distributed under Docker on [DockerHub](https://hub.docker.com/r/metacall/core). Current images are based on `debian:stretch-slim` for `amd64` architecture.
+To provide a reproducible environment **METACALL** is also distributed under Docker on [DockerHub](https://hub.docker.com/r/metacall/core). Current images are based on `debian:buster-slim` for `amd64` architecture.
 
 For pulling the **METACALL** `latest` image containing the runtime, use:
 
diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
@@ -106,17 +106,17 @@ if(WIN32)
 	if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
 		# Disable optimizations
 		add_compile_options(/Od)
-	else()
+	else()
 		# Enable read-only string pooling
-		add_compile_options(/GF)
-
-		# Buffer Security Check
+		add_compile_options(/GF)
+
+		# Buffer Security Check
 		add_compile_options(/GS)
 
 		# Enable optimizations
 		add_compile_options(/O2)
 		add_compile_options(/Oi)
-		add_compile_options(/Oy)
+		add_compile_options(/Oy)
 	endif()
 endif()
 
diff --git a/deploy/packages/descriptor-metacall.json b/deploy/packages/descriptor-metacall.json
@@ -26,7 +26,7 @@
 	"files": [{
 		"includePattern": "artifacts/packages/(.*\\.deb)", "uploadPattern": "$1",
 			"matrixParams": {
-				"deb_distribution": "stretch",
+				"deb_distribution": "buster",
 				"deb_component": "main",
 				"deb_architecture": "amd64"
 			}
diff --git a/deploy/packages/descriptor-metacall.json.in b/deploy/packages/descriptor-metacall.json.in
@@ -27,7 +27,7 @@
 	"files": [{
 		"includePattern": "@DEPLOY_ARTIFACTS_PATH@/(.*\\.deb)", "uploadPattern": "$1",
 			"matrixParams": {
-				"deb_distribution": "stretch",
+				"deb_distribution": "buster",
 				"deb_component": "main",
 				"deb_architecture": "amd64"
 			}
diff --git a/deploy/packages/pack-metacall.cmake b/deploy/packages/pack-metacall.cmake
@@ -184,7 +184,7 @@ endif()
 set(CPACK_DEBIAN_PACKAGE_NAME				"${package_name}")
 set(CPACK_DEBIAN_PACKAGE_VERSION			"${CPACK_PACKAGE_VERSION}")
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE		"all")
-set(CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS	"bash (>= 4.4-5), curl (>= 7.52.1-5), libc6 (>= 2.24-11), libgcc1 (>= 1:6.3.0-18), libpython3.5 (>= 3.5.3-1), libruby (>= 1:2.3.3), libicu57 (>= 57.1-6), libunwind8 (>= 1.1-4.1)")
+set(CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS	"bash (>= 4.4-5), curl (>= 7.52.1-5), libc6 (>= 2.24-11), libgcc1 (>= 1:6.3.0-18), libpython3.7 (>= 3.7.3-2), libruby (>= 1:2.5.5), libicu57 (>= 57.1-6), libunwind8 (>= 1.1-4.1)")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER			"${package_maintainer}")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION		"${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
 set(CPACK_DEBIAN_PACKAGE_SECTION			"devel")
@@ -203,7 +203,7 @@ set(CPACK_RPM_PACKAGE_NAME								"${package_name}")
 set(CPACK_RPM_PACKAGE_VERSION							"${CPACK_PACKAGE_VERSION}")
 set(CPACK_RPM_PACKAGE_RELEASE							1)
 set(CPACK_RPM_PACKAGE_ARCHITECTURE						"x86_64")
-set(CPACK_RPM_PACKAGE_REQUIRES							"bash >= 4.4, curl >= 7.52.1, libc6 >= 2.24, libgcc1 >= 6.3.0, libpython3.5 >= 3.5.3, libruby >= 2.3.3, libicu57 >= 57.1, libunwind8 >= 1.1-4.1")
+set(CPACK_RPM_PACKAGE_REQUIRES							"bash >= 4.4, curl >= 7.52.1, libc6 >= 2.24, libgcc1 >= 6.3.0, libpython3.7 >= 3.7.3, libruby >= 2.5.5, libicu57 >= 57.1, libunwind8 >= 1.1-4.1")
 set(CPACK_RPM_PACKAGE_PROVIDES							"")
 set(CPACK_RPM_PACKAGE_VENDOR							"${package_vendor}")
 set(CPACK_RPM_PACKAGE_LICENSE							"Apache License Version 2.0")
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
         METACALL_BASE_IMAGE: $METACALL_BASE_IMAGE
         METACALL_PATH: $METACALL_PATH
         METACALL_TOOLS_PATH: $METACALL_PATH/tools
-        METACALL_INSTALL_OPTIONS: root base python ruby netcore2 v8rep51 nodejs file rapidjson funchook swig pack # coverage
+        METACALL_INSTALL_OPTIONS: root base python ruby netcore2 nodejs file rapidjson funchook swig pack # v8rep51 coverage
     environment:
       DEBIAN_FRONTEND: noninteractive
       LTTNG_UST_REGISTER_TIMEOUT: 0
@@ -60,7 +60,7 @@ services:
       args:
         METACALL_PATH: $METACALL_PATH
         METACALL_BUILD_TYPE: $METACALL_CORE_BUILD_TYPE
-        METACALL_BUILD_OPTIONS: root python ruby netcore2 v8 nodejs file examples distributable tests scripts ports dynamic install pack # coverage
+        METACALL_BUILD_OPTIONS: root python ruby netcore2 nodejs file examples distributable tests scripts ports dynamic install pack # v8 coverage
     environment:
       DEBIAN_FRONTEND: noninteractive
       LTTNG_UST_REGISTER_TIMEOUT: 0
@@ -83,7 +83,7 @@ services:
       args:
         METACALL_PATH: $METACALL_PATH
         METACALL_BASE_IMAGE: $METACALL_BASE_IMAGE
-        METACALL_RUNTIME_OPTIONS: root base python ruby netcore2 v8 nodejs file ports clean
+        METACALL_RUNTIME_OPTIONS: root base python ruby netcore2 nodejs file ports clean # v8
     environment:
       DEBIAN_FRONTEND: noninteractive
       LTTNG_UST_REGISTER_TIMEOUT: 0
diff --git a/source/ports/CMakeLists.txt b/source/ports/CMakeLists.txt
@@ -100,7 +100,7 @@ list(APPEND CMAKE_SWIG_FLAGS
 
 add_subdirectory(cs_port)
 add_subdirectory(d_port)
-add_subdirectory(go_port)
+# add_subdirectory(go_port) # TODO: Integrate it with CMake properly and with Docker
 add_subdirectory(java_port)
 add_subdirectory(js_port)
 add_subdirectory(lua_port)
diff --git a/source/ports/java_port/CMakeLists.txt b/source/ports/java_port/CMakeLists.txt
@@ -101,11 +101,9 @@ foreach(file ${interfaces} ${headers} ${sources})
 	)
 endforeach()
 
-swig_add_module(${target}
-	java
-	${interfaces}
-	${headers}
-	${sources}
+swig_add_library(${target}
+	LANGUAGE java
+	SOURCES ${interfaces} ${headers} ${sources}
 )
 
 #
diff --git a/source/ports/js_port/CMakeLists.txt b/source/ports/js_port/CMakeLists.txt
@@ -100,11 +100,9 @@ foreach(file ${interfaces} ${headers} ${sources})
 	)
 endforeach()
 
-swig_add_module(${target}
-	javascript
-	${interfaces}
-	${headers}
-	${sources}
+swig_add_library(${target}
+	LANGUAGE javascript
+	SOURCES ${interfaces} ${headers} ${sources}
 )
 
 set_property(TARGET ${target} PROPERTY SWIG_USE_LIBRARY_INCLUDE_DIRECTORIES TRUE)
diff --git a/source/ports/node_port/.gitignore b/source/ports/node_port/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 build
+installPath.js
diff --git a/source/ports/node_port/.npmignore b/source/ports/node_port/.npmignore
@@ -1,3 +1,4 @@
 CMakeLists.txt
 source/*
 include/*
+installPath.js
diff --git a/source/ports/node_port/CMakeLists.txt b/source/ports/node_port/CMakeLists.txt
@@ -233,6 +233,7 @@ install(TARGETS ${target}
 # Files
 install(FILES
 	${CMAKE_CURRENT_SOURCE_DIR}/index.js
+	${CMAKE_CURRENT_SOURCE_DIR}/addon.js
 	${CMAKE_CURRENT_SOURCE_DIR}/package.json
 	${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
 	${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
diff --git a/source/ports/node_port/addon.js b/source/ports/node_port/addon.js
@@ -20,14 +20,14 @@
 
 'use strict';
 
-const Path = require('path');
+const path = require('path');
 
 /* Load MetaCall addon */
 module.exports = (() => {
 	let installPath = '';
 
 	try {
-		installPath = require('./installPath');
+		installPath = require(path.resolve(__dirname, './installPath.js'));
 	} catch (e) {
 		if (e.code !== 'MODULE_NOT_FOUND') {
 			throw e;
@@ -36,14 +36,14 @@ module.exports = (() => {
 
 	const LIBRARY_PATH = process.env.LOADER_LIBRARY_PATH || installPath;
 
-	const paths = [
-		Path.join(__dirname, 'build'),
+	const folders = [
+		path.join(__dirname, 'build'),
 		__dirname,
 		process.cwd(),
 		LIBRARY_PATH,
-		Path.join(LIBRARY_PATH, 'build'),
-		Path.join(LIBRARY_PATH, 'node_modules', 'metacall'),
-		Path.join(LIBRARY_PATH, 'node_modules', 'metacall', 'build'),
+		path.join(LIBRARY_PATH, 'build'),
+		path.join(LIBRARY_PATH, 'node_modules', 'metacall'),
+		path.join(LIBRARY_PATH, 'node_modules', 'metacall', 'build'),
 		'/usr/local/lib',
 	];
 
@@ -54,16 +54,16 @@ module.exports = (() => {
 
 	/* Set NODE_PATH for finding metacall lib */
 	/*
-	process.env.NODE_PATH = `${process.env.NODE_PATH}:${paths.join(':')}`;
+	process.env.NODE_PATH = `${process.env.NODE_PATH}:${folders.join(':')}`;
 	Module._initPaths();
 	*/
 
 	/* Load addon */
 	return (() => {
-		for (let path of paths) {
+		for (let folder of folders) {
 			for (let name of names) {
 				try {
-					const port = require(Path.join(path, `${name}.node`));
+					const port = require(path.join(folder, `${name}.node`));
 
 					if (port) {
 						return port;
diff --git a/source/ports/node_port/index.js b/source/ports/node_port/index.js
@@ -20,19 +20,19 @@
 
 'use strict';
 
-const Module = require('module');
-const Path = require('path');
-const Addon = require(path.resolve(__dirname, './addon.js'));
+const mod = require('module');
+const path = require('path');
+const addon = require(path.resolve(__dirname, './addon.js'));
 
-const node_require = Module.prototype.require;
+const node_require = mod.prototype.require;
 
 const metacall_require = (tag, name) => {
 	// TODO: Inspect the current handle and append it to an object mocking the function calls with metacall
-	return Addon.metacall_load_from_file(tag, [ name ]);
+	return addon.metacall_load_from_file(tag, [ name ]);
 };
 
 /* Monkey patch require for simplifying load */
-Module.prototype.require = function (id) {
+mod.prototype.require = function (id) {
 
 	const tags = {
 		mock: 'mock',
@@ -62,7 +62,7 @@ Module.prototype.require = function (id) {
 /* Debug logs */
 if (process.env['NODE_ENV'] === 'debug')
 {
-	Addon.metacall_logs();
+	addon.metacall_logs();
 }
 
 /* Export the API */
@@ -72,7 +72,7 @@ module.exports = {
 			throw Error('Function name should be of string type.');
 		}
 
-		return Addon.metacall(name, ...args);
+		return addon.metacall(name, ...args);
 	},
 
 	metacall_load_from_file: (tag, paths) => {
@@ -84,11 +84,11 @@ module.exports = {
 			throw Error('Paths should be an array with file names and paths to be loaded by the loader.');
 		}
 
-		return Addon.metacall_load_from_file(tag, paths);
+		return addon.metacall_load_from_file(tag, paths);
 	},
 
 	metacall_inspect: () => {
-		const json_data = Addon.metacall_inspect();
+		const json_data = addon.metacall_inspect();
 
 		if (json_data !== undefined) {
 			const json = JSON.parse(json_data);
@@ -101,6 +101,6 @@ module.exports = {
 
 	/* TODO: Remove this from user or provide better ways of configuring logs */
 	metacall_logs: () => {
-		Addon.metacall_logs();
+		addon.metacall_logs();
 	},
 };
diff --git a/source/ports/node_port/package-lock.json b/source/ports/node_port/package-lock.json
diff --git a/source/ports/py_port/CMakeLists.txt b/source/ports/py_port/CMakeLists.txt
@@ -14,7 +14,7 @@ if(NOT PYTHONLIBS_FOUND)
 	return()
 endif()
 
-set(Python_ADDITIONAL_VERSIONS 3.5)
+set(Python_ADDITIONAL_VERSIONS 3.7)
 
 find_package(PythonInterp REQUIRED)
 
@@ -107,13 +107,16 @@ foreach(file ${interfaces} ${headers} ${sources})
 	)
 endforeach()
 
-swig_add_module(${target}
-	python
-	${interfaces}
-	${headers}
-	${sources}
+swig_add_library(${target}
+	LANGUAGE python
+	SOURCES ${interfaces} ${headers} ${sources}
 )
 
+# # Disable warnings as errors
+# set(SWIG_COMPILE_FLAGS "-w")
+# set_property(TARGET ${SWIG_MODULE_${target}_REAL_NAME} PROPERTY SWIG_GENERATED_COMPILE_OPTIONS "${SWIG_COMPILE_FLAGS}")
+# set_property(TARGET ${SWIG_MODULE_${target}_REAL_NAME} PROPERTY GENERATED_COMPILE_OPTIONS "${SWIG_COMPILE_FLAGS}")
+
 #
 # Dependecies
 #
diff --git a/source/ports/py_port/interface/py_port/py_port_impl.i b/source/ports/py_port/interface/py_port/py_port_impl.i
@@ -60,7 +60,7 @@ extern "C" {
 			SWIG_fail;
 		}
 	%#elif PY_MAJOR_VERSION == 3
-		buffer_str = PyUnicode_AsUTF8AndSize($input, &length);
+		buffer_str = (char *)PyUnicode_AsUTF8AndSize($input, &length);
 
 		if (buffer_str == NULL)
 		{
@@ -136,7 +136,7 @@ extern "C" {
 						SWIG_fail;
 					}
 				%#elif PY_MAJOR_VERSION == 3
-					str = PyUnicode_AsUTF8AndSize(object_str, &length);
+					str = (char *)PyUnicode_AsUTF8AndSize(object_str, &length);
 
 					if (str == NULL)
 					{
@@ -196,7 +196,7 @@ extern "C" {
 	size_t args_size, args_count;
 
 	/* Format string */
-	$1 = PyUnicode_AsUTF8($input);
+	$1 = (char *)PyUnicode_AsUTF8($input);
 
 	/* Variable length arguments */
 	args_size = PyTuple_Size(varargs);
diff --git a/source/ports/py_port/package/README.rst b/source/ports/py_port/package/README.rst
@@ -48,6 +48,8 @@ Example
 
    metacall('multiply', 3, 4); # 12
 
+Running the example:
+
 .. code:: console
 
    metacall py main.py
diff --git a/source/ports/rb_port/CMakeLists.txt b/source/ports/rb_port/CMakeLists.txt
@@ -92,11 +92,9 @@ foreach(file ${interfaces} ${headers} ${sources})
 	)
 endforeach()
 
-swig_add_module(${target}
-	ruby
-	${interfaces}
-	${headers}
-	${sources}
+swig_add_library(${target}
+	LANGUAGE ruby
+	SOURCES ${interfaces} ${headers} ${sources}
 )
 
 #
diff --git a/source/scripts/python/frontend/CMakeLists.txt b/source/scripts/python/frontend/CMakeLists.txt
@@ -8,7 +8,7 @@ py_project(frontend 0.1.0)
 # External dependencies
 #
 
-set(Python_ADDITIONAL_VERSIONS 3.5)
+set(Python_ADDITIONAL_VERSIONS 3.7)
 
 find_package(PythonInterp REQUIRED)
 
diff --git a/source/scripts/python/model/requirements.txt b/source/scripts/python/model/requirements.txt
diff --git a/source/tests/py_django_integration_test/CMakeLists.txt b/source/tests/py_django_integration_test/CMakeLists.txt
diff --git a/tools/base/hooks/env b/tools/base/hooks/env
diff --git a/tools/core/Dockerfile b/tools/core/Dockerfile
diff --git a/tools/core/hooks/env b/tools/core/hooks/env
diff --git a/tools/dev/hooks/env b/tools/dev/hooks/env
diff --git a/tools/metacall-configure.sh b/tools/metacall-configure.sh
diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh
diff --git a/tools/metacall-runtime.sh b/tools/metacall-runtime.sh

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"files": [{`
`27`	`27`	`"includePattern": "artifacts/packages/(.*\\.deb)", "uploadPattern": "$1",`
`28`	`28`	`"matrixParams": {`
`29`		`- "deb_distribution": "stretch",`
	`29`	`+ "deb_distribution": "buster",`
`30`	`30`	`"deb_component": "main",`
`31`	`31`	`"deb_architecture": "amd64"`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"files": [{`
`28`	`28`	`"includePattern": "@DEPLOY_ARTIFACTS_PATH@/(.*\\.deb)", "uploadPattern": "$1",`
`29`	`29`	`"matrixParams": {`
`30`		`- "deb_distribution": "stretch",`
	`30`	`+ "deb_distribution": "buster",`
`31`	`31`	`"deb_component": "main",`
`32`	`32`	`"deb_architecture": "amd64"`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,11 +101,9 @@ foreach(file ${interfaces} ${headers} ${sources})`
`101`	`101`	`)`
`102`	`102`	`endforeach()`
`103`	`103`
`104`		`-swig_add_module(${target}`
`105`		`- java`
`106`		`- ${interfaces}`
`107`		`- ${headers}`
`108`		`- ${sources}`
	`104`	`+swig_add_library(${target}`
	`105`	`+ LANGUAGE java`
	`106`	`+ SOURCES ${interfaces} ${headers} ${sources}`
`109`	`107`	`)`
`110`	`108`
`111`	`109`	`#`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,9 @@ foreach(file ${interfaces} ${headers} ${sources})`
`100`	`100`	`)`
`101`	`101`	`endforeach()`
`102`	`102`
`103`		`-swig_add_module(${target}`
`104`		`- javascript`
`105`		`- ${interfaces}`
`106`		`- ${headers}`
`107`		`- ${sources}`
	`103`	`+swig_add_library(${target}`
	`104`	`+ LANGUAGE javascript`
	`105`	`+ SOURCES ${interfaces} ${headers} ${sources}`
`108`	`106`	`)`
`109`	`107`
`110`	`108`	`set_property(TARGET ${target} PROPERTY SWIG_USE_LIBRARY_INCLUDE_DIRECTORIES TRUE)`