cpp.js 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpp.js",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "type": "module",
   "bin": {

package/src/assets/CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
+set(CMAKE_CXX_STANDARD 17)
 project("${PROJECT_NAME}")
 set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
 
@@ -18,7 +19,7 @@ if (BUILD_BRIDGE)
 endif(BUILD_BRIDGE)
 
 set(SRC_FILES "${BUILD_SRC_FILES}" "${BRIDGE_SRC_FILES}")
-add_library("${PROJECT_NAME}" STATIC ${SRC_FILES})
+add_library("${PROJECT_NAME}" "${BUILD_TYPE}" ${SRC_FILES})
 
 if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "")
     target_link_libraries("${PROJECT_NAME}" "${DEPENDS_CMAKE_NAMES}")

package/src/functions/createWasm.js

@@ -11,7 +11,17 @@ export default function createWasm(compiler, options = {}) {
         compiler.config,
         options,
     );
-    return compiler2.compile();
+    return compiler2.compileToWasm();
+}
+
+export function getCmakeParams(compiler, options = {}) {
+    const compiler2 = new CppjsCompiler(
+        compiler.config,
+        options,
+    );
+
+    compiler2.prepare();
+    return compiler2.getCmakeParams(compiler.config.general.name, true, true);
 }
 
 function setPath(arr, dependency, type, filter = () => {}) {
@@ -41,11 +51,26 @@ class CppjsCompiler {
     constructor(config, options) {
         this.config = config;
         this.options = options;
+        this.pathType = 'absolute';
+        this.pathPrefix = '';
     }
 
-    compile() {
+    getPath(path) {
+        if (this.pathType === 'absolute') {
+            return getPathInfo(path, this.config.paths.base).absolute;
+        } else if (this.pathType === 'relative') {
+            return `${this.pathPrefix}${getPathInfo(path, this.config.paths.base).relative}`
+        }
+
+        return '';
+    }
+
+    compileToWasm() {
         pullDockerImage();
 
+        this.pathType = 'relative';
+        this.pathPrefix = '/live/';
+
         this.prepare();
         this.cmake(this.config.general.name, true, false);
         this.make();
@@ -63,7 +88,7 @@ class CppjsCompiler {
             `${this.config.paths.temp}/lib${this.config.general.name}.a`,
             `${this.config.paths.temp}/lib${this.config.general.name}bridge.a`,
             ...dependLibs,
-        ].filter(path => !!path.toString()).map(path => `/live/${getPathInfo(path, this.config.paths.base).relative}`);
+        ].filter(path => !!path.toString()).map(path => this.getPath(path));
 
         this.cc();
 
@@ -74,7 +99,7 @@ class CppjsCompiler {
         const sourceFilter = (d) => d === this.config || d.export.type === 'source';
         this.headerPathWithDepends = [];
         setPath(this.headerPathWithDepends, this.config, 'header', sourceFilter);
-        this.headerPathWithDepends = this.headerPathWithDepends.map(p => `/live/${getPathInfo(p, this.config.paths.base).relative}`).join(';');
+        this.headerPathWithDepends = this.headerPathWithDepends.map(p => this.getPath(p)).join(';');
 
         this.headerGlob = [];
         this.headerPathWithDepends.split(';').forEach(h => {
@@ -86,7 +111,7 @@ class CppjsCompiler {
 
         this.nativePathWithDepends = [];
         setPath(this.nativePathWithDepends, this.config, 'native', sourceFilter);
-        this.nativePathWithDepends = this.nativePathWithDepends.map(p => `/live/${getPathInfo(p, this.config.paths.base).relative}`).join(';');
+        this.nativePathWithDepends = this.nativePathWithDepends.map(p => this.getPath(p)).join(';');
 
         this.nativeGlob = [];
         this.nativePathWithDepends.split(';').forEach(h => {
@@ -102,47 +127,57 @@ class CppjsCompiler {
 
         this.pathsOfCmakeDepends = this.cmakeDepends
             .map(d => getParentPath(d.paths.cmake))
-            .map(p => `/live/${getPathInfo(p, this.config.paths.base).relative}`).join(';');
+            .map(p => this.getPath(p)).join(';');
         this.nameOfCmakeDepends = this.cmakeDepends.map(d => d.general.name).join(';');
     }
 
-    cmake(name, isBuildSource, isBuildBridge) {
+    getCmakeParams(name, isBuildSource, isBuildBridge) {
         const params = [];
         if (isBuildSource) params.push('-DBUILD_SOURCE=TRUE');
         if (isBuildBridge) params.push('-DBUILD_BRIDGE=TRUE');
 
-        const output = getPathInfo(this.config.paths.temp, this.config.paths.base);
-        const projectPath = getPathInfo(process.cwd(), this.config.paths.base);
-        const base = getBaseInfo(this.config.paths.base);
-
-        const cMakeParentPath = getParentPath(this.config.paths.cmake);
+        const output = this.getPath(this.config.paths.temp);
+        const projectPath = this.getPath(process.cwd());
 
-        const args = [
-            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `/live/${output.relative}`, getDockerImage(),
-            "emcmake", "cmake", "/cmake", '-DCMAKE_BUILD_TYPE=Release',
-            `-DBASE_DIR=/live/${projectPath.relative}`,
+        params.push(...[
+            `-DBASE_DIR=${projectPath}`,
             `-DNATIVE_GLOB=${this.nativeGlob.join(';')}`,
-            `-DHEADER_GLOB=${this.headerGlob.join(';')};`,
+            `-DHEADER_GLOB=${this.headerGlob.join(';')}`,
             `-DHEADER_DIR=${this.headerPathWithDepends}`,
             `-DDEPENDS_CMAKE_PATHS=${this.pathsOfCmakeDepends}`,
             `-DDEPENDS_CMAKE_NAMES=${this.nameOfCmakeDepends}`,
-            `-DCMAKE_INSTALL_PREFIX=/live/${output.relative}`, `-DBRIDGE_DIR=/live/${output.relative}/bridge`, `-DPROJECT_NAME=${name}`, ...params,
+            `-DBRIDGE_DIR=${output}/bridge`,
+        ]);
+
+        return params;
+    }
+
+    cmake(name, isBuildSource, isBuildBridge) {
+        const params = this.getCmakeParams(name, isBuildSource, isBuildBridge);
+
+        const output = this.getPath(this.config.paths.temp);
+        const base = getBaseInfo(this.config.paths.base);
+
+        const cMakeParentPath = getParentPath(this.config.paths.cmake);
+
+        const args = [
+            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `${output}`, getDockerImage(),
+            "emcmake", "cmake", "/cmake", '-DCMAKE_BUILD_TYPE=Release', '-DBUILD_TYPE=STATIC', `-DCMAKE_INSTALL_PREFIX=${output}`, `-DPROJECT_NAME=${name}`, ...params,
         ];
         const options = { cwd: this.config.paths.temp, stdio : 'pipe' };
         execFileSync("docker", args, options);
         return this.config.paths.temp;
     }
 
-
     make() {
-        const output = getPathInfo(this.config.paths.temp, this.config.paths.base);
+        const output = this.getPath(this.config.paths.temp);
         const base = getBaseInfo(this.config.paths.base);
 
         let cMakeParentPath = this.config.paths.cmake.split('/');
         cMakeParentPath.pop();
         cMakeParentPath = cMakeParentPath.join('/');
         const args = [
-            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `/live/${output.relative}`, getDockerImage(),
+            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `${output}`, getDockerImage(),
             "emmake", "make", "install"
         ];
         const options = { cwd: this.config.paths.temp, stdio : 'pipe' };
@@ -151,12 +186,11 @@ class CppjsCompiler {
     }
 
     cc() {
-        const input = getPathInfo(this.config.paths.temp, this.config.paths.base);
-        const output = getPathInfo(this.config.paths.temp, this.config.paths.base);
+        const output = this.getPath(this.config.paths.temp);
         const base = getBaseInfo(this.config.paths.base);
         const args = [
             "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${this.config.paths.cli}:/cli`, getDockerImage(),
-            "emcc", "-lembind", "-Wl,--whole-archive", ...this.libs, ...(this.options.cc || []), "-s", "WASM=1", "-s", "MODULARIZE=1", '-o', `/live/${output.relative}/${this.config.general.name}.js`, '--extern-post-js', '/cli/assets/extern-post.js'
+            "emcc", "-lembind", "-Wl,--whole-archive", ...this.libs, ...(this.options.cc || []), "-s", "WASM=1", "-s", "MODULARIZE=1", '-o', `${output}/${this.config.general.name}.js`, '--extern-post-js', '/cli/assets/extern-post.js'
         ];
         const options = { cwd: this.config.paths.temp, stdio : 'pipe' };
         execFileSync("docker", args, options);

package/src/index.js

@@ -1,6 +1,6 @@
 import createBridge from './functions/createBridge.js';
 import findOrCreateInterfaceFile from './functions/findOrCreateInterfaceFile.js';
-import createWasm from './functions/createWasm.js';
+import createWasm, { getCmakeParams } from './functions/createWasm.js';
 import getConfig from './utils/getConfig.js';
 
 export default class CppjsCompiler {
@@ -20,4 +20,8 @@ export default class CppjsCompiler {
     createWasm(options) {
         return createWasm(this, options);
     }
+
+    getCmakeParams() {
+        return getCmakeParams(this);
+    }
 }