better universal build (#384)

* make universal build of pg * better universal app solution * cleanup * cleanup
openframeworks · Jul 13, 2023 · 7d3112c · 7d3112c
1 parent f393fe6
commit 7d3112c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -17,7 +17,7 @@
     "start": "electron .",
     "build": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --all --overwrite --electron-version=24.1.2",
     "build:osx": "echo 'DEPRECATED: build:osx is deprecated. please use build:macos instead' && npm run build:macos",
-    "build:macos": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='app' --ignore='readme.md' --prune --overwrite --electron-version=24.1.2 --platform=darwin --arch=universal",
+    "build:macos": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=24.1.2 --platform=darwin --arch=universal --x64ArchFiles=Contents/Resources/app/app/projectGenerator",
     "build:macos-m1": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=24.1.2 --platform=darwin --arch=arm64",
     "build:linux32": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=24.1.2 --platform=linux --arch=ia32",
     "build:linux64": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=24.1.2 --platform=linux --arch=x64",

diff --git a/scripts/osx/buildPG.sh b/scripts/osx/buildPG.sh
@@ -209,21 +209,25 @@ import_certificate
 cd ${pg_root}/frontend
 npm update
 npm install > /dev/null
+
+#annoying fix to build universal app
+#see https://github.com/electron/electron-packager/issues/1226
+#see https://github.com/openframeworks/projectGenerator/issues/376
+sed -i bak 's/...comboOpts.osxUniversal,/...comboOpts.osxUniversal,x64ArchFiles:comboOpts.x64ArchFiles,/g' node_modules/electron-packager/src/universal.js
+
 npm run build:macos > /dev/null
-cp -r app dist/projectGenerator-darwin-universal/projectGenerator.app/Contents/Resources/app/
 if [ -d "${pg_root}/projectGenerator-osx" ]; then
 	rm -rf ${pg_root}/projectGenerator-osx
 fi
-mv dist/projectGenerator-darwin-universal ${pg_root}/projectGenerator-osx
+cp dist/projectGenerator-darwin-universal ${pg_root}/projectGenerator-osx
 package_app osx
 
 cd ${pg_root}/frontend
-npm run build:macos > /dev/null
-cp -r app dist/projectGenerator-darwin-universal/projectGenerator.app/Contents/Resources/app/
-if [ -d "${pg_root}/projectGenerator-ios" ]; then
-	rm -rf ${pg_root}/projectGenerator-ios
-fi
-mv dist/projectGenerator-darwin-universal ${pg_root}/projectGenerator-ios
+#npm run build:macos > /dev/null
+#if [ -d "${pg_root}/projectGenerator-ios" ]; then
+#	rm -rf ${pg_root}/projectGenerator-ios
+#fi
+cp dist/projectGenerator-darwin-universal ${pg_root}/projectGenerator-ios
 package_app ios
 
 #cd ${pg_root}/frontend