Fixed to local build scripts, especially for building for mac on mac

inkle · May 15, 2024 · b9a3dd1 · b9a3dd1
1 parent 323d15d
commit b9a3dd1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/BUILD_FOR_MAC.command b/BUILD_FOR_MAC.command
@@ -1,6 +1,7 @@
 cd "`dirname "$0"`"
 
 # Clean
+rm -rf Inky-darwin-x64/
 rm -rf Inky-darwin-arm64/
 rm ReleaseUpload/Inky_mac.dmg
 
@@ -11,13 +12,13 @@ rm ReleaseUpload/Inky_mac.dmg
 ./resources/makeIcns.command
 
 # Mac
-npm exec @electron/packager app Inky --platform=darwin --arch=arm64 --icon=./resources/Icon.icns --extend-info=./resources/info.plist --app-bundle-id=com.inkle.inky --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_win.exe" --overwrite
+npm exec -- @electron/packager app Inky --platform=darwin --arch=x64 --overwrite --icon=resources/Icon.icns --extend-info=resources/info.plist --app-bundle-id=com.inkle.inky --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_win.exe"
 
 # Create a DMG
 # Requires appdmg: npm install -g appdmg
 # https://www.npmjs.com/package/appdmg
 mkdir -p ReleaseUpload
-npm exec appdmg resources/appdmg.json ReleaseUpload/Inky_mac.dmg
+npm exec -- appdmg resources/appdmg.json ReleaseUpload/Inky_mac.dmg
 
 # Remove .icns again
 rm resources/Icon.icns
diff --git a/BUILD_PACKAGE.command b/BUILD_PACKAGE.command
@@ -2,6 +2,7 @@ cd "`dirname "$0"`"
 
 # Clean
 rm -rf Inky-darwin-x64/
+rm -rf Inky-darwin-arm64/
 rm -rf Inky-win32-x64/
 rm -rf Inky-win32-ia32/
 rm -rf Inky-linux-x64/
@@ -14,16 +15,16 @@ rm -rf ReleaseUpload
 ( cd app && npm install )
 
 # Mac
-npm exec electron-packager app Inky --platform=darwin --arch=x64 --icon=resources/Icon.icns --extend-info=resources/info.plist --app-bundle-id=com.inkle.inky --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_win.exe"
+npm exec -- @electron/packager app Inky --platform=darwin --arch=x64 --overwrite --icon=resources/Icon.icns --extend-info=resources/info.plist --app-bundle-id=com.inkle.inky --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_win.exe"
 
 # Windows 64 bit (requires Wine - `brew install wine`)
-npm exec electron-packager app Inky --platform=win32  --arch=x64 --icon=resources/Icon1024.png.ico --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_mac" --win32metadata.ProductName="Inky" --win32metadata.CompanyName="inkle Ltd" --win32metadata.FileDescription="Inky" --win32metadata.OriginalFilename="Inky" --win32metadata.InternalName="Inky"
+npm exec -- @electron/packager app Inky --platform=win32  --arch=x64 --icon=resources/Icon1024.png.ico --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_mac" --win32metadata.ProductName="Inky" --win32metadata.CompanyName="inkle Ltd" --win32metadata.FileDescription="Inky" --win32metadata.OriginalFilename="Inky" --win32metadata.InternalName="Inky"
 
 # Windows 32 bit
-npm exec electron-packager app Inky --platform=win32  --arch=ia32 --icon=resources/Icon1024.png.ico --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_mac" --win32metadata.ProductName="Inky" --win32metadata.CompanyName="inkle Ltd" --win32metadata.FileDescription="Inky" --win32metadata.OriginalFilename="Inky" --win32metadata.InternalName="Inky"
+npm exec -- @electron/packager app Inky --platform=win32  --arch=ia32 --icon=resources/Icon1024.png.ico --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_mac" --win32metadata.ProductName="Inky" --win32metadata.CompanyName="inkle Ltd" --win32metadata.FileDescription="Inky" --win32metadata.OriginalFilename="Inky" --win32metadata.InternalName="Inky"
 
 # Linux
-npm exec electron-packager app Inky --platform=linux --arch=x64 --icon=resources/Icon.icns --extend-info=resources/info.plist --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_mac"
+npm exec -- @electron/packager app Inky --platform=linux --arch=x64 --icon=resources/Icon.icns --extend-info=resources/info.plist --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_mac"
 
 # Create a zip files ready for upload on Windows/Linux
 mkdir -p ReleaseUpload
@@ -32,7 +33,7 @@ zip -r ReleaseUpload/Inky_windows_32.zip Inky-win32-ia32
 zip -r ReleaseUpload/Inky_linux.zip Inky-linux-x64
 
 # On Mac, create a DMG
-npm exec appdmg resources/appdmg.json ReleaseUpload/Inky_mac.dmg
+npm exec -- appdmg resources/appdmg.json ReleaseUpload/Inky_mac.dmg
 
 # Remove .icns again
 rm resources/Icon.icns
diff --git a/resources/appdmg.json b/resources/appdmg.json
@@ -4,7 +4,7 @@
   "background": "appdmg-background.png",
   "icon-size": 95,
   "contents": [
-    { "x": 107, "y": 92, "type": "file", "path": "../Inky-darwin-arm64/Inky.app" },
+    { "x": 107, "y": 92, "type": "file", "path": "../Inky-darwin-x64/Inky.app" },
     { "x": 345, "y": 92, "type": "link", "path": "/Applications" }
   ]
 }