Implement single binary for 10.10-12.0

.github/workflows/build-app-wxpython-offline.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Upload App to Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: OpenCore-Patcher.app (GUI Offline, macOS 10.13 and newer)
+          name: OpenCore-Patcher.app (GUI Offline)
           path: OpenCore-Patcher-wxPython.app.zip
       - name: Upload to Release
         if: github.event_name == 'release'
@@ -30,6 +30,6 @@ jobs:
           file: OpenCore-Patcher-wxPython.app.zip
           tag: ${{ github.ref }}
           file_glob: true
-          asset_name: OpenCore-Patcher.app (GUI Offline, macOS 10.13 and newer)
+          asset_name: OpenCore-Patcher.app (GUI Offline)
       - name: Validate OpenCore
         run: ./dist/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher --validate

.github/workflows/build-app-wxpython.yml

@@ -13,25 +13,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/pyinstaller OpenCore-Patcher-GUI.spec
-      - run: cp -r dist/OpenCore-Patcher.app dist/OpenCore-Patcher-Legacy.app
+      - run: python3 ./payloads/binary.py
-      - run: cp payloads/launcher.sh dist/OpenCore-Patcher-Legacy.app/Contents/MacOS/Launcher
-      - run: python3 merge_gui_legacy.py
       - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
-      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "dist/OpenCore-Patcher-Legacy.app"'
       - run: cd dist; zip -r ../OpenCore-Patcher-wxPython.app.zip OpenCore-Patcher.app
-      - run: cd dist; zip -r ../OpenCore-Patcher-wxPython-Legacy.app.zip OpenCore-Patcher-Legacy.app
       - run: ./../sign-wxpython.sh
       - name: Upload App to Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: OpenCore-Patcher.app (GUI, macOS 10.13 and newer)
+          name: OpenCore-Patcher.app (GUI)
           path: OpenCore-Patcher-wxPython.app.zip
-      - name: Upload Legacy App to Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: OpenCore-Patcher.app (GUI, macOS 10.12 and older)
-          path: OpenCore-Patcher-wxPython-Legacy.app.zip
-
       - name: Upload to Release
         if: github.event_name == 'release'
         uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
@@ -40,14 +30,4 @@ jobs:
           file: OpenCore-Patcher-wxPython.app.zip
           tag: ${{ github.ref }}
           file_glob: true
-          asset_name: OpenCore-Patcher.app (GUI, macOS 10.13 and newer)
+          asset_name: OpenCore-Patcher.app (GUI)
-      
-      - name: Upload Legacy to Release
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: OpenCore-Patcher-wxPython-Legacy.app.zip
-          tag: ${{ github.ref }}
-          file_glob: true
-          asset_name: OpenCore-Patcher.app (GUI, macOS 10.12 and older)

merge_gui.py

@@ -1,10 +0,0 @@
-# Updates build version in OCLP-GUI during CI builds
-# Copyright (C) 2021-2022 Mykola Grymalyuk
-import plistlib
-from pathlib import Path
-from resources import constants
-
-app_path = Path.cwd() / Path ("OpenCore Patcher.app/Contents/Info.plist")
-info = plistlib.load(Path(app_path).open("rb"))
-info["CFBundleShortVersionString"] = constants.Constants().patcher_version
-plistlib.dump(info, Path(app_path).open("wb"), sort_keys=True)

merge_gui_legacy.py

@@ -1,10 +0,0 @@
-# Updates build version in OCLP-GUI during CI builds
-# Copyright (C) 2021 Mykola Grymalyuk
-import plistlib
-from pathlib import Path
-from resources import constants
-
-app_path = Path.cwd() / Path ("dist/OpenCore-Patcher-Legacy.app/Contents/Info.plist")
-info = plistlib.load(Path(app_path).open("rb"))
-info["CFBundleExecutable"] = "Launcher"
-plistlib.dump(info, Path(app_path).open("wb"), sort_keys=True)

payloads/binary.py

@@ -0,0 +1,10 @@
+
+path = './dist/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher'
+find = b'\x00\x0D\x0A\x00'
+replace = b'\x00\x0A\x0A\x00'
+# Open file in binary mode
+with open(path, 'rb') as f:
+    data = f.read()
+    data = data.replace(find, replace)
+    with open(path, 'wb') as f:
+        f.write(data)