diff --git a/.github/workflows/build-app-wxpython.yml b/.github/workflows/build-app-wxpython.yml index 5f0057a4a..9270dcdfe 100644 --- a/.github/workflows/build-app-wxpython.yml +++ b/.github/workflows/build-app-wxpython.yml @@ -60,7 +60,8 @@ jobs: - name: Prepare Assets (--prepare-assets) run: > /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 Build-Project.command - --run-as-individual-steps --prepare-assets --reset-dmg-cache + --run-as-individual-steps --reset-dmg-cache + --prepare-assets - name: Prepare Application (--prepare-application) run: > @@ -68,32 +69,26 @@ jobs: --application-signing-identity "${{ env.ORG_MAC_DEVELOPER_ID_APPLICATION_IDENTITY }}" --notarization-apple-id "${{ env.ORG_MAC_NOTARIZATION_APPLE_ID }}" --notarization-password "${{ env.ORG_MAC_NOTARIZATION_PASSWORD }}" --notarization-team-id "${{ env.ORG_MAC_NOTARIZATION_TEAM_ID }}" --git-branch "${{ env.branch }}" --git-commit-url "${{ env.commiturl }}" --git-commit-date "${{ env.commitdate }}" - --reset-pyinstaller-cache --analytics-key "${{ env.ANALYTICS_KEY }}" --analytics-endpoint "${{ env.ANALYTICS_SITE }}" - --prepare-application + --reset-pyinstaller-cache --run-as-individual-steps + --prepare-application - name: Prepare Package (--prepare-package) run: > /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 Build-Project.command --installer-signing-identity "${{ env.ORG_MAC_DEVELOPER_ID_INSTALLER_IDENTITY }}" --notarization-apple-id "${{ env.ORG_MAC_NOTARIZATION_APPLE_ID }}" --notarization-password "${{ env.ORG_MAC_NOTARIZATION_PASSWORD }}" --notarization-team-id "${{ env.ORG_MAC_NOTARIZATION_TEAM_ID }}" + --run-as-individual-steps --prepare-package - --run-as-individual-steps - - - name: Prepare AutoPkg (--prepare-autopkg) - run: > - /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 Build-Project.command - --prepare-autopkg - --run-as-individual-steps - name: Prepare Update Shim (--prepare-shim) run: > /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 Build-Project.command --application-signing-identity "${{ env.ORG_MAC_DEVELOPER_ID_APPLICATION_IDENTITY }}" --notarization-apple-id "${{ env.ORG_MAC_NOTARIZATION_APPLE_ID }}" --notarization-password "${{ env.ORG_MAC_NOTARIZATION_PASSWORD }}" --notarization-team-id "${{ env.ORG_MAC_NOTARIZATION_TEAM_ID }}" - --prepare-shim --run-as-individual-steps + --prepare-shim - name: Prepare App for Upload run: /bin/mv ./dist/OpenCore-Patcher.app.zip ./OpenCore-Patcher-GUI.app.zip diff --git a/.gitignore b/.gitignore index e8b28230f..e2da836c2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ __pycache__/ /payloads/update.sh /payloads/OpenCore-Patcher.app /.x86_64_venv +*afdesign~lock~ diff --git a/Build-Project.command b/Build-Project.command index 8dd9eeb20..320de7f71 100644 --- a/Build-Project.command +++ b/Build-Project.command @@ -11,13 +11,12 @@ import plistlib from pathlib import Path -from ci_tooling.build_module import ( +from ci_tooling.build_modules import ( application, disk_images, package, sign_notarize, - shim, - autopkg + shim ) from opencore_legacy_patcher import constants @@ -50,13 +49,14 @@ def main() -> None: parser.add_argument("--reset-pyinstaller-cache", action="store_true", help="Clean PyInstaller Cache", default=False) # CI/CD Parameters for individual steps + # If not specified, will run all steps parser.add_argument("--run-as-individual-steps", action="store_true", help="CI: Run as individual steps", default=False) - parser.add_argument("--prepare-assets", action="store_true", help="CI: Prepare Assets", default=False) parser.add_argument("--prepare-application", action="store_true", help="CI: Prepare Application", default=False) parser.add_argument("--prepare-package", action="store_true", help="CI: Prepare Package", default=False) # CI/CD Parameters for additional steps - parser.add_argument("--prepare-autopkg", action="store_true", help="CI: Prepare AutoPkg Assets", default=False) + # If not specified, will not run additional steps + parser.add_argument("--prepare-assets", action="store_true", help="CI: Prepare Assets", default=False) parser.add_argument("--prepare-shim", action="store_true", help="CI: Prepare Update Shim", default=False) # Analytics Parameters @@ -66,7 +66,6 @@ def main() -> None: # Help parser.add_argument("--help", action="store_true", help="Show this help message and exit", default=False) - # Parse Arguments args = parser.parse_args() @@ -80,7 +79,7 @@ def main() -> None: os.chdir(Path(__file__).resolve().parent) - if (args.run_as_individual_steps is False) or (args.run_as_individual_steps and args.prepare_assets): + if (args.prepare_assets): # Prepare workspace disk_images.GenerateDiskImages(args.reset_dmg_cache).generate() @@ -137,16 +136,13 @@ def main() -> None: notarization_team_id=args.notarization_team_id, ).sign_and_notarize() - # Build AutoPkg-Assets.pkg - if args.prepare_autopkg: - # TODO: Migrate AutoPkg to Python - autopkg.GenerateAutoPkg().generate() - # Create Update Shim if args.prepare_shim: shim.GenerateShim().generate() if Path("dist/OpenCore-Patcher.app").exists(): - Path("dist/OpenCore-Patcher.app").rename("dist/OpenCore-Patcher-Core.app") + if Path("dist/OpenCore-Patcher (Original).app").exists(): + Path("dist/OpenCore-Patcher (Original).app").unlink() + Path("dist/OpenCore-Patcher.app").rename("dist/OpenCore-Patcher (Original).app") Path("dist/OpenCore-Patcher (Shim).app").rename("dist/OpenCore-Patcher.app") # Update app version in Info.plist diff --git a/ci_tooling/autopkg/AutoPkg-Assets-Setup.pkgproj b/ci_tooling/autopkg/AutoPkg-Assets-Setup.pkgproj deleted file mode 100644 index 4f8cb3b41..000000000 --- a/ci_tooling/autopkg/AutoPkg-Assets-Setup.pkgproj +++ /dev/null @@ -1,988 +0,0 @@ - - - - - PACKAGES - - - MUST-CLOSE-APPLICATION-ITEMS - - MUST-CLOSE-APPLICATIONS - - PACKAGE_FILES - - DEFAULT_INSTALL_LOCATION - / - HIERARCHY - - CHILDREN - - - CHILDREN - - GID - 80 - PATH - Applications - PATH_TYPE - 0 - PERMISSIONS - 509 - TYPE - 1 - UID - 0 - - - CHILDREN - - - CHILDREN - - - CHILDREN - - - BUNDLE_CAN_DOWNGRADE - - BUNDLE_POSTINSTALL_PATH - - PATH_TYPE - 0 - - BUNDLE_PREINSTALL_PATH - - PATH_TYPE - 0 - - CHILDREN - - GID - 80 - PATH - ../../dist/OpenCore-Patcher.app - PATH_TYPE - 1 - PERMISSIONS - 493 - TYPE - 3 - UID - 0 - - - GID - 80 - PATH - Dortania - PATH_TYPE - 2 - PERMISSIONS - 509 - TYPE - 2 - UID - 0 - - - GID - 80 - PATH - Application Support - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Automator - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Documentation - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Extensions - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Filesystems - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Frameworks - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Input Methods - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Internet Plug-Ins - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Keyboard Layouts - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - - CHILDREN - - GID - 0 - PATH - ../../payloads/Launch Services/com.dortania.opencore-legacy-patcher.auto-patch.plist - PATH_TYPE - 1 - PERMISSIONS - 420 - TYPE - 3 - UID - 0 - - - GID - 0 - PATH - LaunchAgents - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - LaunchDaemons - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - PreferencePanes - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Preferences - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 80 - PATH - Printers - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - PrivilegedHelperTools - PATH_TYPE - 0 - PERMISSIONS - 1005 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - QuickLook - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - QuickTime - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Screen Savers - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Scripts - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Services - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Widgets - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - GID - 0 - PATH - Library - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - - CHILDREN - - GID - 0 - PATH - Shared - PATH_TYPE - 0 - PERMISSIONS - 1023 - TYPE - 1 - UID - 0 - - - GID - 80 - PATH - Users - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - GID - 0 - PATH - / - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - PAYLOAD_TYPE - 0 - PRESERVE_EXTENDED_ATTRIBUTES - - SHOW_INVISIBLE - - SPLIT_FORKS - - TREAT_MISSING_FILES_AS_WARNING - - VERSION - 5 - - PACKAGE_SCRIPTS - - POSTINSTALL_PATH - - PATH - postinstall.sh - PATH_TYPE - 1 - - PREINSTALL_PATH - - PATH - preinstall.sh - PATH_TYPE - 1 - - RESOURCES - - - PACKAGE_SETTINGS - - AUTHENTICATION - 1 - CONCLUSION_ACTION - 0 - FOLLOW_SYMBOLIC_LINKS - - IDENTIFIER - com.dortania.pkg.AutoPkg-Assets - LOCATION - 0 - NAME - AutoPkg-Assets - OVERWRITE_PERMISSIONS - - PAYLOAD_SIZE - -1 - REFERENCE_PATH - - RELOCATABLE - - USE_HFS+_COMPRESSION - - VERSION - 1.0 - - TYPE - 0 - UUID - 4312D78E-7981-41F2-A0E9-5C7E11AC61C5 - - - PROJECT - - PROJECT_COMMENTS - - NOTES - - - - PROJECT_PRESENTATION - - BACKGROUND - - APPAREANCES - - DARK_AQUA - - LIGHT_AQUA - - - SHARED_SETTINGS_FOR_ALL_APPAREANCES - - - INSTALLATION TYPE - - HIERARCHIES - - INSTALLER - - LIST - - - CHILDREN - - DESCRIPTION - - OPTIONS - - HIDDEN - - STATE - 1 - - PACKAGE_UUID - 4312D78E-7981-41F2-A0E9-5C7E11AC61C5 - TITLE - - TYPE - 0 - UUID - B3E23E4E-EF8D-4C21-933E-03C8187D415B - - - REMOVED - - - - MODE - 0 - - INSTALLATION_STEPS - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewIntroductionController - INSTALLER_PLUGIN - Introduction - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewReadMeController - INSTALLER_PLUGIN - ReadMe - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewLicenseController - INSTALLER_PLUGIN - License - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewDestinationSelectController - INSTALLER_PLUGIN - TargetSelect - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewInstallationTypeController - INSTALLER_PLUGIN - PackageSelection - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewInstallationController - INSTALLER_PLUGIN - Install - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewSummaryController - INSTALLER_PLUGIN - Summary - LIST_TITLE_KEY - InstallerSectionTitle - - - INTRODUCTION - - LOCALIZATIONS - - - LANGUAGE - English - VALUE - - PATH - intro.txt - PATH_TYPE - 1 - - - - - LICENSE - - LOCALIZATIONS - - MODE - 0 - - README - - LOCALIZATIONS - - - SUMMARY - - LOCALIZATIONS - - - TITLE - - LOCALIZATIONS - - - LANGUAGE - English - VALUE - AutoPkg-Assets - - - - - PROJECT_REQUIREMENTS - - LIST - - - BEHAVIOR - 3 - DICTIONARY - - IC_REQUIREMENT_FILES_CONDITION - 1 - IC_REQUIREMENT_FILES_DISK_TYPE - 0 - IC_REQUIREMENT_FILES_LIST - - /System/Library/CoreServices/OpenCore-Legacy-Patcher.plist - - IC_REQUIREMENT_FILES_SELECTOR - 0 - - IC_REQUIREMENT_CHECK_TYPE - 1 - IDENTIFIER - fr.whitebox.Packages.requirement.files - MESSAGE - - - LANGUAGE - English - VALUE - AutoPkg-Assets.pkg should never be used by end-users manually, please use the OpenCore-Patcher.app listed on Github - - - NAME - Files - STATE - - - - BEHAVIOR - 3 - DICTIONARY - - IC_REQUIREMENT_OS_DISK_TYPE - 0 - IC_REQUIREMENT_OS_DISTRIBUTION_TYPE - 0 - IC_REQUIREMENT_OS_MINIMUM_VERSION - 110000 - - IC_REQUIREMENT_CHECK_TYPE - 1 - IDENTIFIER - fr.whitebox.Packages.requirement.os - MESSAGE - - NAME - Operating System - STATE - - - - RESOURCES - - ROOT_VOLUME_ONLY - - - PROJECT_SETTINGS - - BUILD_FORMAT - 0 - BUILD_PATH - - PATH - ../../dist - PATH_TYPE - 1 - - EXCLUDED_FILES - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - .DS_Store - TYPE - 0 - - - PROTECTED - - PROXY_NAME - Remove .DS_Store files - PROXY_TOOLTIP - Remove ".DS_Store" files created by the Finder. - STATE - - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - .pbdevelopment - TYPE - 0 - - - PROTECTED - - PROXY_NAME - Remove .pbdevelopment files - PROXY_TOOLTIP - Remove ".pbdevelopment" files created by ProjectBuilder or Xcode. - STATE - - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - CVS - TYPE - 1 - - - REGULAR_EXPRESSION - - STRING - .cvsignore - TYPE - 0 - - - REGULAR_EXPRESSION - - STRING - .cvspass - TYPE - 0 - - - REGULAR_EXPRESSION - - STRING - .svn - TYPE - 1 - - - REGULAR_EXPRESSION - - STRING - .git - TYPE - 1 - - - REGULAR_EXPRESSION - - STRING - .gitignore - TYPE - 0 - - - PROTECTED - - PROXY_NAME - Remove SCM metadata - PROXY_TOOLTIP - Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems. - STATE - - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - classes.nib - TYPE - 0 - - - REGULAR_EXPRESSION - - STRING - designable.db - TYPE - 0 - - - REGULAR_EXPRESSION - - STRING - info.nib - TYPE - 0 - - - PROTECTED - - PROXY_NAME - Optimize nib files - PROXY_TOOLTIP - Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles. - STATE - - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - Resources Disabled - TYPE - 1 - - - PROTECTED - - PROXY_NAME - Remove Resources Disabled folders - PROXY_TOOLTIP - Remove "Resources Disabled" folders. - STATE - - - - SEPARATOR - - - - NAME - AutoPkg-Assets - PAYLOAD_ONLY - - TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING - - - - TYPE - 0 - VERSION - 2 - - diff --git a/ci_tooling/autopkg/PkgBackground.png b/ci_tooling/autopkg/PkgBackground.png new file mode 100644 index 000000000..c02f2a2e8 Binary files /dev/null and b/ci_tooling/autopkg/PkgBackground.png differ diff --git a/ci_tooling/autopkg/intro.txt b/ci_tooling/autopkg/intro.txt deleted file mode 100644 index f73db5a02..000000000 --- a/ci_tooling/autopkg/intro.txt +++ /dev/null @@ -1,7 +0,0 @@ -DO NOT RUN AUTOPKG-ASSETS MANUALLY! - -THIS CAN BREAK YOUR SYSTEM'S INSTALL! - -This package should only ever be invoked by the Patcher itself, never downloaded or run by the user. Download the OpenCore-Patcher.app on the Github Repository. - -https://github.com/dortania/OpenCore-Legacy-Patcher/releases/ \ No newline at end of file diff --git a/ci_tooling/build_module/autopkg.py b/ci_tooling/build_module/autopkg.py deleted file mode 100644 index 8fb172182..000000000 --- a/ci_tooling/build_module/autopkg.py +++ /dev/null @@ -1,17 +0,0 @@ -from pathlib import Path - -from opencore_legacy_patcher.support import subprocess_wrapper - -class GenerateAutoPkg: - - def __init__(self) -> None: - self._package_build_bin = "/usr/local/bin/packagesbuild" - self._autopkg_config = "./ci_tooling/autopkg/AutoPkg-Assets-Setup.pkgproj" - - - def generate(self) -> None: - """ - Generate AutoPkg Assets - """ - print("Generating AutoPkg Assets") - subprocess_wrapper.run_and_verify([self._package_build_bin, self._autopkg_config]) \ No newline at end of file diff --git a/ci_tooling/build_module/application.py b/ci_tooling/build_modules/application.py similarity index 100% rename from ci_tooling/build_module/application.py rename to ci_tooling/build_modules/application.py diff --git a/ci_tooling/build_module/disk_images.py b/ci_tooling/build_modules/disk_images.py similarity index 97% rename from ci_tooling/build_module/disk_images.py rename to ci_tooling/build_modules/disk_images.py index d736005b5..9cd0a316a 100644 --- a/ci_tooling/build_module/disk_images.py +++ b/ci_tooling/build_modules/disk_images.py @@ -1,3 +1,6 @@ +""" +disk_images.py: Fetch and generate disk images (Universal-Binaries.dmg, payloads.dmg) +""" import subprocess diff --git a/ci_tooling/build_module/package.py b/ci_tooling/build_modules/package.py similarity index 73% rename from ci_tooling/build_module/package.py rename to ci_tooling/build_modules/package.py index f38d523cb..0c2297a62 100644 --- a/ci_tooling/build_module/package.py +++ b/ci_tooling/build_modules/package.py @@ -1,3 +1,7 @@ +""" +package.py: Generate packages (Installer, Uninstaller, AutoPkg-Assets) +""" + import macos_pkg_builder from opencore_legacy_patcher import constants @@ -15,6 +19,10 @@ class GeneratePackage: "./dist/OpenCore-Patcher.app": "/Library/Application Support/Dortania/OpenCore-Patcher.app", "./ci_tooling/privileged_helper_tool/com.dortania.opencore-legacy-patcher.privileged-helper": "/Library/PrivilegedHelperTools/com.dortania.opencore-legacy-patcher.privileged-helper", } + self._autopkg_files = { + "./payloads/Launch Services/com.dortania.opencore-legacy-patcher.auto-patch.plist": "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist", + } + self._autopkg_files.update(self._files) def _generate_installer_welcome(self) -> str: @@ -84,4 +92,19 @@ class GeneratePackage: pkg_file_structure=self._files, pkg_title="OpenCore Legacy Patcher", pkg_welcome=self._generate_installer_welcome(), - ).build() is True \ No newline at end of file + ).build() is True + + print("Generating AutoPkg-Assets.pkg") + assert macos_pkg_builder.Packages( + pkg_output="./dist/AutoPkg-Assets.pkg", + pkg_bundle_id="com.dortania.pkg.AutoPkg-Assets", + pkg_version=constants.Constants().patcher_version, + pkg_allow_relocation=False, + pkg_as_distribution=True, + pkg_background="./ci_tooling/autopkg/PkgBackground.png", + pkg_preinstall_script="./ci_tooling/autopkg/preinstall.sh", + pkg_postinstall_script="./ci_tooling/autopkg/postinstall.sh", + pkg_file_structure=self._autopkg_files, + pkg_title="AutoPkg Assets", + pkg_welcome="# DO NOT RUN AUTOPKG-ASSETS MANUALLY!\n\n## THIS CAN BREAK YOUR SYSTEM'S INSTALL!\n\nThis package should only ever be invoked by the Patcher itself, never downloaded or run by the user. Download the OpenCore-Patcher.pkg on the Github Repository.\n\n[OpenCore Legacy Patcher GitHub Release](https://github.com/dortania/OpenCore-Legacy-Patcher/releases/)", + ).build() is True diff --git a/ci_tooling/build_module/shim.py b/ci_tooling/build_modules/shim.py similarity index 96% rename from ci_tooling/build_module/shim.py rename to ci_tooling/build_modules/shim.py index e8f564fa0..cec6e07e1 100644 --- a/ci_tooling/build_module/shim.py +++ b/ci_tooling/build_modules/shim.py @@ -1,4 +1,6 @@ - +""" +shim.py: Generate Update Shim +""" from pathlib import Path diff --git a/ci_tooling/build_module/sign_notarize.py b/ci_tooling/build_modules/sign_notarize.py similarity index 97% rename from ci_tooling/build_module/sign_notarize.py rename to ci_tooling/build_modules/sign_notarize.py index 198cbaf6d..22900e840 100644 --- a/ci_tooling/build_module/sign_notarize.py +++ b/ci_tooling/build_modules/sign_notarize.py @@ -1,3 +1,7 @@ +""" +sign_notarize.py: Sign and Notarize a file +""" + import mac_signing_buddy import macos_pkg_builder diff --git a/ci_tooling/installation_pkg/PkgBackground-Source-File.afdesign b/ci_tooling/installation_pkg/PkgBackground-Source-File.afdesign index df52c0c73..85d57821e 100644 Binary files a/ci_tooling/installation_pkg/PkgBackground-Source-File.afdesign and b/ci_tooling/installation_pkg/PkgBackground-Source-File.afdesign differ