Skip to content

Make sure that our libOpenCOR DLL gets copied to preload/chunks on Windows #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agarny merged 4 commits into from
Jan 7, 2025
Merged

Make sure that our libOpenCOR DLL gets copied to preload/chunks on Windows #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7628ca1
Clean script: some minor improvements.
agarny Jan 7, 2025
00547a5
Make sure that our libOpenCOR DLL gets copied to `preload/chunks` on …
agarny Jan 7, 2025
4a728ca
Vite: only copy the libOpenCOR DLL on Windows.
agarny Jan 7, 2025
7a995d1
Don't copy our libOpenCOR DLL when packaging.
agarny Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions electron.vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { PrimeVueResolver } from '@primevue/auto-import-resolver'
import vue from '@vitejs/plugin-vue'
import { bytecodePlugin, defineConfig, externalizeDepsPlugin } from 'electron-vite'
import { join } from 'path'
import * as path from 'path'
import Components from 'unplugin-vue-components/vite'
import { normalizePath } from 'vite'
import { viteStaticCopy } from 'vite-plugin-static-copy'

export default defineConfig({
main: {
Expand All @@ -16,7 +18,26 @@ export default defineConfig({
plugins: [bytecodePlugin(), externalizeDepsPlugin()]
},
preload: {
plugins: [externalizeDepsPlugin()]
plugins: [
externalizeDepsPlugin(),
...(process.platform === 'win32' && process.env.npm_lifecycle_event !== 'build'
? [
viteStaticCopy({
targets: [
{
src: normalizePath(
path.resolve(
import.meta.dirname,
'out/libOpenCOR/libOpenCOR-0.0.0-Windows-Intel-Shared/bin/libOpenCOR.dll'
)
),
dest: 'chunks'
}
]
})
]
: [])
]
},
renderer: {
build: {
Expand All @@ -38,7 +59,7 @@ export default defineConfig({
],
server: {
fs: {
allow: [join(import.meta.dirname, '..')]
allow: [path.join(import.meta.dirname, '..')]
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"build": "pnpm build:libopencor && electron-vite build",
"build:libopencor": "cmake-js build -B Release -O out/libOpenCOR",
"build:web": "(cd ./src/renderer && vite build)",
"clean": "node res/clean.js dist node_modules out src/main/build src/renderer/components.d.ts src/renderer/dist src/renderer/node_modules",
"clean": "node res/clean.js",
"dev": "pnpm build:libopencor && electron-vite dev --watch",
"dev:web": "(cd ./src/renderer && vite dev)",
"format": "prettier --write . && clang-format -i src/libopencor/src/*",
Expand Down Expand Up @@ -77,6 +77,7 @@
"typescript-eslint": "^8.19.0",
"unplugin-vue-components": "^0.27.5",
"vite": "^5.4.11",
"vite-plugin-static-copy": "^2.2.0",
"vue": "^3.5.13",
"vue-tsc": "^2.2.0"
}
Expand Down
17 changes: 17 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 12 additions & 5 deletions res/clean.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import process from 'process'
import { existsSync, rmSync } from 'fs'
import * as fs from 'fs'

function clean(paths) {
for (const path of paths) {
if (existsSync(path)) {
rmSync(path, { recursive: true, force: true })
if (fs.existsSync(path)) {
fs.rmSync(path, { recursive: true, force: true })
}
}
}

clean(process.argv.slice(2))
clean([
'dist',
'node_modules',
'out',
'src/main/build',
'src/renderer/components.d.ts',
'src/renderer/dist',
'src/renderer/node_modules'
])
Loading