diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index 34ccffe54b..b024d035a5 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -50,7 +50,7 @@ on: required: true type: boolean build_macos: - description: 'Build for MacOs' + description: 'Build for MacOS' default: true required: true type: boolean diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 0dc22f5f1e..fef4547891 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -310,7 +310,7 @@ jobs: - name: Create the MacOS pkg (Bash) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }} - run: python ../cura_inst/packaging/MacOs/build_macos.py . "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" + run: python ../cura_inst/packaging/MacOS/build_macos.py . "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" working-directory: dist - name: Upload the artifacts diff --git a/conanfile.py b/conanfile.py index b1ca074d74..9a2c1773ed 100644 --- a/conanfile.py +++ b/conanfile.py @@ -317,7 +317,7 @@ class CuraConan(ConanFile): self._generate_cura_version(Path(self.source_folder, "cura")) if self.options.devtools: - entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "MacOs", "cura.entitlements")) + entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self.generators_folder, entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"), icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), @@ -445,7 +445,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV self._generate_cura_version(Path(self._site_packages, "cura")) - entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOs", "cura.entitlements")) + entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self._base_dir, entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"), icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), diff --git a/packaging/MacOs/build_macos.py b/packaging/MacOS/build_macos.py similarity index 98% rename from packaging/MacOs/build_macos.py rename to packaging/MacOS/build_macos.py index b8513cb069..06880cf9b7 100644 --- a/packaging/MacOs/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -103,7 +103,7 @@ def create_pkg_installer(filename: str, dist_path: str) -> None: if __name__ == "__main__": parser = argparse.ArgumentParser(description = "Create installer for Cura.") - parser.add_argument("dist_path", type=str, help="Path to Pyinstaller dist folder") + parser.add_argument("dist_path", type = str, help="Path to Pyinstaller dist folder") parser.add_argument("filename", type = str, help = "Filename of the pkg (e.g. 'UltiMaker-Cura-5.1.0-beta-Macos-X64.pkg')") args = parser.parse_args() diff --git a/packaging/MacOs/cura.entitlements b/packaging/MacOS/cura.entitlements similarity index 100% rename from packaging/MacOs/cura.entitlements rename to packaging/MacOS/cura.entitlements diff --git a/packaging/MacOs/cura_background_dmg.png b/packaging/MacOS/cura_background_dmg.png similarity index 100% rename from packaging/MacOs/cura_background_dmg.png rename to packaging/MacOS/cura_background_dmg.png