Merge pull request #10 from vincentdchan/feat/linux-compitable

feat: linux compatible

Author: vincentdchan

bundle-utils/src/string/UString.cpp

@@ -725,12 +725,7 @@ template <typename T> Q_ALWAYS_INLINE T qFromUnaligned(const void *src)
 {
     T dest;
     const size_t size = sizeof(T);
-#if __has_builtin(__builtin_memcpy)
-    __builtin_memcpy
-#else
-    memcpy
-#endif
-            (&dest, src, size);
+    ::memcpy(&dest, src, size);
     return dest;
 }
 

jetpack-cli/CMakeLists.txt

@@ -9,4 +9,21 @@ target_include_directories(${PROJECT_NAME} PRIVATE
         "../esparser/src"
         "../jetpack/src/"
         )
-target_link_libraries(${PROJECT_NAME} PRIVATE jetpack)
+
+set(CLI_LIBS "")
+
+if (UNIX AND NOT EMSCRIPTEN)
+
+    if (APPLE)
+        execute_process(COMMAND uname -m OUTPUT_VARIABLE MACHINE_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+        message("CLI ARCH: ${MACHINE_ARCH}")
+        set(CLI_LIBS ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/mac/${MACHINE_ARCH}/libjemalloc.a)
+    else()
+
+	set(CLI_LIBS "-lpthread -ldl ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/linux/libjemalloc_pic.a" )
+
+    endif()
+
+ENDIF()
+
+target_link_libraries(${PROJECT_NAME} PRIVATE jetpack ${CLI_LIBS})

jetpack/CMakeLists.txt

@@ -96,13 +96,14 @@ if (UNIX AND NOT EMSCRIPTEN)
         execute_process(COMMAND uname -m OUTPUT_VARIABLE MACHINE_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
         message("ARCH: ${MACHINE_ARCH}")
 
-        target_link_libraries(jetpack ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/mac/${MACHINE_ARCH}/libjemalloc.a)
+        target_link_libraries(jetpack-test ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/mac/${MACHINE_ARCH}/libjemalloc.a)
         target_link_libraries(jetpackd ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/mac/${MACHINE_ARCH}/libjemalloc.2.${DYLIB_SUFFIX})
 
     else()
 
+	message("linux jemalloc")
         SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -pthread)
-        link_libraries(${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/linux/libjemalloc.a)
+        target_link_libraries(jetpack-test -ldl ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/linux/libjemalloc_pic.a)
 
     endif()
 

npm/CMakeLists.txt

@@ -1,5 +1,5 @@
 project (jetpp)
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.13)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -15,12 +15,13 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 
 link_directories("${CMAKE_CURRENT_SOURCE_DIR}/../cmake-build-release/jetpack/")
 
+
+IF(APPLE)
 target_link_libraries(
   ${PROJECT_NAME}
   ${CMAKE_JS_LIB}
   "${CMAKE_CURRENT_SOURCE_DIR}/../cmake-build-release/jetpack/libjetpackd.dylib")
 
-IF(APPLE)
 execute_process(COMMAND uname -m OUTPUT_VARIABLE MACHINE_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 message("ARCH: ${MACHINE_ARCH}")
 
@@ -41,4 +42,25 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release
     COMMENT "Running CRC32 check..."
 )
+ELSEIF(UNIX)
+message("Linux")
+
+target_link_libraries(
+  ${PROJECT_NAME}
+  ${CMAKE_JS_LIB}
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake-build-release/jetpack/libjetpack.a"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake-build-release/bundle-utils/libbundle-utils.a"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake-build-release/esparser/libesparser.a"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake-build-release/third_party/fmt/libfmt.a"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/jemalloc/lib/linux/libjemalloc_pic.a"
+  )
+
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND
+      cp "${CMAKE_CURRENT_SOURCE_DIR}/../cmake-build-release/jetpack/libjetpackd.so" ./
+    COMMAND
+      cp "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/jemalloc/lib/linux/libjemalloc.so.2" ./
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release
+)
+
 ENDIF()

npm/package.json

@@ -1,10 +1,13 @@
 {
   "name": "jetpp",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "main": "index.js",
   "author": "Vincent Chan",
   "license": "MIT",
   "bin": {
     "jetpp": "./index.js"
+  },
+  "scripts": {
+    "install": "node scripts/download_lib.js"
   }
 }

npm/scripts/download_lib.js

@@ -14,10 +14,13 @@ const downloadChecksumUrl = name => `${downloadUrl(name)}.SHA256`;
 
 const libsName = [
   'jetpp.node',
-  'libjetpackd.dylib',
-  'libjemalloc.2.dylib',
 ];
 
+if (platform === 'darwin') {
+  libsName.push('libjetpackd.dylib');
+  libsName.push('libjemalloc.2.dylib');
+}
+
 function getDownloadPath(name) {
   const tmpDir = os.tmpdir();
   const projectDir = path.join(tmpDir, version, 'jetpack-node');