Rename MacOs -> MacOS

CURA-6867
This commit is contained in:
Joey de l'Arago 2023-01-11 13:27:26 +01:00
parent 11b2c94988
commit 9ae3bc37dc
6 changed files with 5 additions and 5 deletions

View file

@ -50,7 +50,7 @@ on:
required: true required: true
type: boolean type: boolean
build_macos: build_macos:
description: 'Build for MacOs' description: 'Build for MacOS'
default: true default: true
required: true required: true
type: boolean type: boolean

View file

@ -310,7 +310,7 @@ jobs:
- name: Create the MacOS pkg (Bash) - name: Create the MacOS pkg (Bash)
if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }} 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 working-directory: dist
- name: Upload the artifacts - name: Upload the artifacts

View file

@ -317,7 +317,7 @@ class CuraConan(ConanFile):
self._generate_cura_version(Path(self.source_folder, "cura")) self._generate_cura_version(Path(self.source_folder, "cura"))
if self.options.devtools: 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, self._generate_pyinstaller_spec(location = self.generators_folder,
entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"), 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("\\", "\\\\"), 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")) 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, self._generate_pyinstaller_spec(location = self._base_dir,
entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"), 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("\\", "\\\\"), icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),

View file

@ -103,7 +103,7 @@ def create_pkg_installer(filename: str, dist_path: str) -> None:
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description = "Create installer for Cura.") 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')") 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() args = parser.parse_args()

View file

Before

Width:  |  Height:  |  Size: 381 KiB

After

Width:  |  Height:  |  Size: 381 KiB

Before After
Before After