Removed unnecessary files from our packaged ASAR file.

Author: agarny

CMakeLists.txt

@@ -129,15 +129,36 @@ endif()
 
 # Link cmake-js and libOpenCOR to our Node.js add-on.
 
+if(WIN32)
+    set(LIBOPENCOR_DIR bin)
+    set(FULL_LIBOPENCOR_FILENAME ${CMAKE_PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+elseif(APPLE)
+    set(LIBOPENCOR_DIR lib)
+    set(FULL_LIBOPENCOR_FILENAME ${CMAKE_PROJECT_NAME}.${CMAKE_PROJECT_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+else()
+    set(LIBOPENCOR_DIR lib)
+    set(FULL_LIBOPENCOR_FILENAME ${CMAKE_PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${CMAKE_PROJECT_VERSION})
+endif()
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/Shared/${LIBOPENCOR_DIR}/${FULL_LIBOPENCOR_FILENAME}
+                                                 ${CMAKE_BINARY_DIR}/../${FULL_LIBOPENCOR_FILENAME})
+
 if(WIN32)
     set(LIBOPENCOR_FILENAME ${CMAKE_PROJECT_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX})
+
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/Shared/lib/${LIBOPENCOR_FILENAME}
+                                                     ${CMAKE_BINARY_DIR}/../${LIBOPENCOR_FILENAME})
 else()
-    set(LIBOPENCOR_FILENAME ${CMAKE_PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(LIBOPENCOR_FILENAME ${FULL_LIBOPENCOR_FILENAME})
 endif()
 
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
                       ${CMAKE_JS_LIB}
-                      ${CMAKE_BINARY_DIR}/Shared/lib/${LIBOPENCOR_FILENAME})
+                      ${CMAKE_BINARY_DIR}/../${LIBOPENCOR_FILENAME})
+
+add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${CMAKE_PROJECT_NAME}>
+                                                    ${CMAKE_BINARY_DIR}/../${CMAKE_PROJECT_NAME}.node)
 
 # Configure our splash screen.
 
@@ -152,4 +173,4 @@ endif()
 set(VERSION ${PROJECT_VERSION})
 
 configure_file(src/main/assets/splashscreen.html.in
-               ${CMAKE_BINARY_DIR}/splashscreen.html)
+               ${CMAKE_BINARY_DIR}/../splashscreen.html)

electron-builder.yml

@@ -3,7 +3,7 @@ productName: OpenCOR
 win:
   artifactName: ${productName}-${version}-Windows.${ext}
   extraFiles:
-    - from: 'out/libOpenCOR/Shared/bin/libOpenCOR.dll'
+    - from: 'out/libOpenCOR.dll'
       to: 'libOpenCOR.dll'
   target:
     - nsis
@@ -15,7 +15,7 @@ linux:
   category: Utility
   executableName: OpenCOR
   extraFiles:
-    - from: 'out/libOpenCOR/Shared/lib/libOpenCOR.so.0.0.0'
+    - from: 'out/libOpenCOR.so.0.0.0'
       to: 'libOpenCOR.so.0.0.0'
   target:
     - AppImage
@@ -32,7 +32,7 @@ mac:
   #    - APPLE_TEAM_ID: an id that can be found in the top right corner of https://developer.apple.com/account/resources/certificates/list.
   artifactName: ${productName}-${version}-macOS-${arch}.${ext}
   extraFiles:
-    - from: 'out/libOpenCOR/Shared/lib/libOpenCOR.0.0.0.dylib'
+    - from: 'out/libOpenCOR.0.0.0.dylib'
       to: 'Frameworks/libOpenCOR.0.0.0.dylib'
   target:
     - dmg

electron.vite.config.ts

@@ -25,7 +25,7 @@ export default defineConfig({
             viteStaticCopy({
               targets: [
                 {
-                  src: normalizePath(path.resolve(import.meta.dirname, 'out/libOpenCOR/Shared/bin/libOpenCOR.dll')),
+                  src: normalizePath(path.resolve(import.meta.dirname, 'out/libOpenCOR.dll')),
                   dest: 'chunks'
                 }
               ]

package.json

@@ -40,7 +40,7 @@
     "format": "prettier --log-level silent --write . && clang-format -i src/libopencor/src/*",
     "format:check": "prettier --log-level silent --check . && clang-format --dry-run -Werror src/libopencor/src/*",
     "lint": "eslint --fix .",
-    "package": "pnpm build && electron-builder",
+    "package": "pnpm build && node res/prepare-for-packaging.js && electron-builder",
     "publish:web": "pnpm publish ./src/renderer",
     "start": "pnpm build:libopencor && electron-vite preview",
     "start:web": "pnpm build:web && cd ./src/renderer && vite preview"

res/prepare-for-packaging.js

@@ -0,0 +1,4 @@
+import * as fs from 'fs'
+
+fs.rmSync('out/libOpenCOR', { recursive: true, force: true })
+fs.rmSync('out/libOpenCOR.node', { force: true })

src/main/SplashScreenWindow.ts

@@ -22,7 +22,7 @@ export class SplashScreenWindow extends ApplicationWindow {
       alwaysOnTop: true
     })
 
-    this.loadFile('./out/libOpenCOR/splashscreen.html').catch((err: unknown) => {
+    this.loadFile('./out/splashscreen.html').catch((err: unknown) => {
       console.error('Failed to load splash screen:', err)
     })
   }

src/main/assets/splashscreen.html.in

@@ -8,13 +8,13 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
     />
-    <link rel="stylesheet" href="../../src/main/assets/splashscreen.css" />
+    <link rel="stylesheet" href="../src/main/assets/splashscreen.css" />
   </head>
   <body>
     <table class="contents">
       <tr>
         <td class="logo" colspan="2">
-          <img class="logo" src="../../src/renderer/src/assets/logo.svg" />
+          <img class="logo" src="../src/renderer/src/assets/logo.svg" />
         </td>
       </tr>
       <tr>

src/preload/index.ts

@@ -1,5 +1,5 @@
 import { contextBridge, ipcRenderer } from 'electron'
-import loc from '../../out/libOpenCOR/Release/libOpenCOR.node'
+import loc from '../../out/libOpenCOR.node'
 import * as si from 'systeminformation'
 
 // Some bridging between our main process and renderer process.