3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Installer was replacing any previous cura version when installing. Casuing strange install locations. Now it will only replace cura version with the exact same CURA_CONAN_VERSION

Browse source 
CURA-6867
This commit is contained in:
Joey de l'Arago 2023-01-13 10:18:33 +01:00
parent 0f683d301a
commit 65bf56e9fa
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/cura-installer.yml vendored
View file

@ -310,7 +310,7 @@ jobs:
- name: Create the MacOS dmg and/or pkg (Bash) - name: Create the MacOS dmg and/or 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 ../cura_inst . "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" run: python ../cura_inst/packaging/MacOS/build_macos.py ../cura_inst . $CURA_CONAN_VERSION "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}"
working-directory: dist working-directory: dist
- name: Upload the artifacts - name: Upload the artifacts

15
packaging/MacOS/build_macos.py
View file

@ -27,12 +27,13 @@ def build_dmg(source_path: str, dist_path: str, filename: str) -> None:
subprocess.run(arguments) subprocess.run(arguments)
def build_pkg(dist_path: str, app_filename: str, component_filename: str, installer_filename: str) -> None: def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_version: str, installer_filename: str) -> None:
""" Builds and signs the pkg installer. """ Builds and signs the pkg installer.
@param dist_path: Path to put output pkg in @param dist_path: Path to put output pkg in
@param app_filename: name of the .app file to bundle inside the pkg @param app_filename: name of the .app file to bundle inside the pkg
@param component_filename: Name of the pkg component package to bundle the app in @param component_filename: Name of the pkg component package to bundle the app in
@param cura_version: The version is used when automatically replacing existing versions with the installer.
@param installer_filename: Name of the installer that contains the component package @param installer_filename: Name of the installer that contains the component package
""" """
pkg_build_executable = os.environ.get("PKG_BUILD_EXECUTABLE", "pkgbuild") pkg_build_executable = os.environ.get("PKG_BUILD_EXECUTABLE", "pkgbuild")
@ -43,6 +44,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, instal
pkg_build_arguments = [ pkg_build_arguments = [
pkg_build_executable, pkg_build_executable,
"--identifier", ULTIMAKER_CURA_DOMAIN, "--identifier", ULTIMAKER_CURA_DOMAIN,
"--version", cura_version,
"--component", "--component",
Path(dist_path, app_filename), Path(dist_path, app_filename),
Path(dist_path, component_filename), Path(dist_path, component_filename),
@ -99,7 +101,7 @@ def notarize_file(dist_path: str, filename: str) -> None:
subprocess.run(notarize_arguments) subprocess.run(notarize_arguments)
def create_pkg_installer(filename: str, dist_path: str) -> None: def create_pkg_installer(filename: str, dist_path: str, cura_version: str) -> None:
""" Creates a pkg installer from {filename}.app called {filename}-Installer.pkg """ Creates a pkg installer from {filename}.app called {filename}-Installer.pkg
The final package structure is UltiMaker-Cura-XXX-Installer.pkg[UltiMaker-Cura.pkg[UltiMaker-Cura.app]]. The outer The final package structure is UltiMaker-Cura-XXX-Installer.pkg[UltiMaker-Cura.pkg[UltiMaker-Cura.app]]. The outer
@ -114,7 +116,7 @@ def create_pkg_installer(filename: str, dist_path: str) -> None:
cura_component_package_name = f"{filename_stem}-Component.pkg" # This is a component package that is nested inside the installer, it contains the UltiMaker-Cura.app file cura_component_package_name = f"{filename_stem}-Component.pkg" # This is a component package that is nested inside the installer, it contains the UltiMaker-Cura.app file
app_name = "UltiMaker-Cura.app" # This is the app file that will end up in your applications folder app_name = "UltiMaker-Cura.app" # This is the app file that will end up in your applications folder
build_pkg(dist_path, app_name, cura_component_package_name, filename) build_pkg(dist_path, app_name, cura_component_package_name, cura_version, filename)
notarize = bool(os.environ.get("NOTARIZE_INSTALLER", "FALSE")) notarize = bool(os.environ.get("NOTARIZE_INSTALLER", "FALSE"))
if notarize: if notarize:
@ -138,13 +140,14 @@ def create_dmg(filename: str, dist_path: str, source_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("source_path", type = str, help="Path to Pyinstaller source folder") parser.add_argument("source_path", type = str, help = "Path to Pyinstaller source folder")
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("cura_version", type = str, help="The version of cura")
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()
if Path(args.filename).suffix == ".pkg": if Path(args.filename).suffix == ".pkg":
create_pkg_installer(args.filename, args.dist_path) create_pkg_installer(args.filename, args.dist_path, args.cura_version)
elif Path(args.filename).suffix == ".dmg": elif Path(args.filename).suffix == ".dmg":
create_dmg(args.filename, args.dist_path, args.source_path) create_dmg(args.filename, args.dist_path, args.source_path)
else: else: