From 3e5a120d0743564caea17f1da2dee487fe25e69d Mon Sep 17 00:00:00 2001 From: Subhamoy Biswas Date: Tue, 17 Dec 2024 22:30:06 +0530 Subject: [PATCH] (ci/cd): separated macOS arch specific copy scripts --- copyMacFiles.aarch64.js | 24 +++++++++++++++++++++++ copyMacFiles.js => copyMacFiles.x86_64.js | 4 ++-- src-tauri/tauri.macos.conf.json | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 copyMacFiles.aarch64.js rename copyMacFiles.js => copyMacFiles.x86_64.js (92%) diff --git a/copyMacFiles.aarch64.js b/copyMacFiles.aarch64.js new file mode 100644 index 0000000..c7ff7e7 --- /dev/null +++ b/copyMacFiles.aarch64.js @@ -0,0 +1,24 @@ +import fs from 'fs'; +import path from 'path'; +import { fileURLToPath } from 'url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); + +const msghostSrc = path.join(__dirname, 'src-tauri', 'target', 'aarch64-apple-darwin', 'release', 'pytubepp-helper-msghost'); +const msghostDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost'); +const autostartSrc = path.join(__dirname, 'src-tauri', 'target', 'aarch64-apple-darwin', 'release', 'pytubepp-helper-autostart'); +const autostartDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart'); +const autostartPlistSrc = path.join(__dirname, 'src-tauri', 'autostart', 'pytubepp-helper-autostart.plist'); +const autostartPlistDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart.plist'); +const msghostManifestMacChromeSrc = path.join(__dirname, 'src-tauri', 'msghost-manifest', 'macos', 'chrome', 'com.neosubhamoy.pytubepp.helper.json'); +const msghostManifestMacChromeDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost.json'); +const msghostManifestMacFirefoxSrc = path.join(__dirname, 'src-tauri', 'msghost-manifest', 'macos', 'firefox', 'com.neosubhamoy.pytubepp.helper.json'); +const msghostManifestMacFirefoxDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost-moz.json'); + +fs.copyFileSync(msghostSrc, msghostDest); +fs.copyFileSync(autostartSrc, autostartDest); +fs.copyFileSync(autostartPlistSrc, autostartPlistDest); +fs.copyFileSync(msghostManifestMacChromeSrc, msghostManifestMacChromeDest); +fs.copyFileSync(msghostManifestMacFirefoxSrc, msghostManifestMacFirefoxDest); +console.log('Files copied successfully'); \ No newline at end of file diff --git a/copyMacFiles.js b/copyMacFiles.x86_64.js similarity index 92% rename from copyMacFiles.js rename to copyMacFiles.x86_64.js index 8c82ce8..f92acd0 100644 --- a/copyMacFiles.js +++ b/copyMacFiles.x86_64.js @@ -5,9 +5,9 @@ import { fileURLToPath } from 'url'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); -const msghostSrc = path.join(__dirname, 'src-tauri', 'target', 'release', 'pytubepp-helper-msghost'); +const msghostSrc = path.join(__dirname, 'src-tauri', 'target', 'x86_64-apple-darwin', 'release', 'pytubepp-helper-msghost'); const msghostDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost'); -const autostartSrc = path.join(__dirname, 'src-tauri', 'target', 'release', 'pytubepp-helper-autostart'); +const autostartSrc = path.join(__dirname, 'src-tauri', 'target', 'x86_64-apple-darwin', 'release', 'pytubepp-helper-autostart'); const autostartDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart'); const autostartPlistSrc = path.join(__dirname, 'src-tauri', 'autostart', 'pytubepp-helper-autostart.plist'); const autostartPlistDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart.plist'); diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index bf1a237..80a25b8 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -1,7 +1,7 @@ { "build": { "beforeDevCommand": "[[ -n \"$TARGET_ARCH\" ]] && ARCH=\"$TARGET_ARCH\" || ARCH=\"$(uname -m | sed 's/^arm64$/aarch64/')-apple-darwin\" && cargo build --target=$ARCH --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --target=$ARCH --manifest-path=./src-tauri/autostart/Cargo.toml && npm run dev", - "beforeBuildCommand": "[[ -n \"$TARGET_ARCH\" ]] && ARCH=\"$TARGET_ARCH\" || ARCH=\"$(uname -m | sed 's/^arm64$/aarch64/')-apple-darwin\" && cargo build --release --target=$ARCH --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --target=$ARCH --manifest-path=./src-tauri/autostart/Cargo.toml && node copyMacFiles.js && npm run build", + "beforeBuildCommand": "[[ -n \"$TARGET_ARCH\" ]] && ARCH=\"$TARGET_ARCH\" || ARCH=\"$(uname -m | sed 's/^arm64$/aarch64/')-apple-darwin\" && cargo build --release --target=$ARCH --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --target=$ARCH --manifest-path=./src-tauri/autostart/Cargo.toml && node copyMacFiles.${ARCH}.js && npm run build", "devPath": "http://localhost:1422", "distDir": "../dist" },