Commit graph

38 commits

Author SHA1 Message Date
Jelle Spijker
cee219f65b Merge branch 'main' into GH-12582_fix_uninstall_by_other
# Conflicts:
#	packaging/NSIS/Ultimaker-Cura.nsi.jinja
2022-07-21 15:24:57 +02:00
Jelle Spijker
470bb7300c
Update documentation
Clarify why the last two items are removed from the list
2022-07-18 10:35:55 +02:00
j.spijker@ultimaker.com
b896f1124a Use Ultimaker Cura as default start menu folder
Contributes to CURA-9459
2022-07-15 14:11:16 +02:00
j.spijker@ultimaker.com
b7316f4503 Use full version in app_name
This should ensure that each Cura version, either release, prerelease or development
Will be installed completely separate from earlier versions

Contributes to CURA-9459
2022-07-15 13:25:03 +02:00
j.spijker@ultimaker.com
82c6035754 Remove the InstallDirRegKey
This should ensure that the default directory will always falls back to
`"$PROGRAMFILES64\${APP_NAME}"` where `APP_NAME` is:
`{{ app_name }} {{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}`

Contributes to CURA-9459
2022-07-15 13:07:21 +02:00
j.spijker@ultimaker.com
f1a6c54414 Fixed nsis build script
Contributes to CURA-9365
2022-07-15 12:03:51 +02:00
j.spijker@ultimaker.com
409c079d8f
Simplified nsis script
Contributes to CURA-9365
2022-07-14 14:47:58 +02:00
j.spijker@ultimaker.com
b0f9c6bb28
Use the full app name
I believe this should ensure that specific
folders and location will then have a unique
path for this app in the registry, which
should make the install path version specific

Contributes to CURA-9365
2022-07-14 12:47:39 +02:00
c.lamboo
19d62da737 Possible fix for Cura crashing on Zorin OS 16
Appearently the `QT_STYLE_OVERRIDE` variable is set for some users, crashing Cura. Unset variable `QT_STYLE_OVERRIDE` as a precaution

https://github.com/Ultimaker/Cura/issues/12343
2022-07-11 00:05:15 +02:00
Remco Burema
562184166e Make it possible for another user to uninstall.
Users other than the original installer, can't easily uninstall, even if they have the rights. This should be possible. Users without the rights can still try to start the program, but would then need permission and get kicked out. 'HKCU' is a shorthand referring _only_ to the current user. 'HKCR' is a shorthand that refers _both_ to the current user _and_ the local machine. Most (except one) of the registry keys in the old setup (with CPack) where 'installed' to the latter, only one, which doesn't even seem to exist anymore in the new setup, refrered to the former. In short: This commit should restore the ability to uninstall Cura from any sufficiently elevated account to do such action, as was done by the 'old' buildsystem.

should fix Ultimaker/Cura#12582
2022-07-08 15:59:04 +02:00
jellespijker
bfd1c6eea5 Use correct env variable MAC_NOTARIZE_PASS
Contributes to CURA-9365
2022-07-06 11:37:11 +02:00
jellespijker
4344ef066f Fixed paths for the dmg_sign_notarize script
Contributes to CURA-9365
2022-07-06 10:50:01 +02:00
j.spijker@ultimaker.com
feebf6d003 uniform name on macos
Contributes to CURA-9365
2022-07-06 08:32:05 +02:00
j.spijker@ultimaker.com
bee2b22edf uniform name on linux
Contributes to CURA-9365
2022-07-06 07:51:24 +02:00
jellespijker
67d840f505 Revert "Deal with missing build version number"
This reverts commit d91b93b3d7.
2022-07-05 14:13:42 +02:00
Ghostkeeper
d91b93b3d7
Deal with missing build version number
Makes it a bit more messy and weird, but that's what you get when your script has 16 parameters, I guess.

Contributes to issue CURA-9365.
2022-07-05 11:51:44 +02:00
j.spijker@ultimaker.com
5e8b137926 Moved AppImage result parallel to Ultimaker-Cura
Contributes to CURA-9365
2022-07-01 14:15:07 +02:00
j.spijker@ultimaker.com
8a3d94d2b9 Install and use the appimagetool
Can be set as an env variable in the script

Contributes to CURA-9365
2022-07-01 13:01:16 +02:00
Ghostkeeper
8b8220c45d
Fix path to icon file
The script got moved. It looks in the directory relative to __file__ for the icon and other files. Those other files also got moved, but the icons were placed in a centrally stored location. So the path needs to be updated to the new relative path.

Contributes to issue CURA-9409.
2022-07-01 12:03:24 +02:00
j.delarago
6693354bf7 Merge remote-tracking branch 'origin/5.1' into 5.1 2022-07-01 11:46:51 +02:00
j.delarago
578e9969ca Change source so packaging script can be run from root
CURA-9365
2022-07-01 11:46:44 +02:00
j.spijker@ultimaker.com
085868d692 Copy the packaging scripts/resources and set GH env
Contributes to CURA-9365
2022-07-01 10:32:12 +02:00
j.delarago
4ed16881ac Update environment variables
CURA-8849
2022-07-01 10:04:38 +02:00
j.spijker@ultimaker.com
5b771e39d7 Install start menu shortcuts globally
Use "SetShellVarContext all" so that NSIS installs windows start menu shortcuts globally.
Docs: https://nsis.sourceforge.io/Docs/Chapter4.html#setshellvarcontext

Fixes #12449
Closes Ultimaker/cura-build-environment#147

Contributes to CURA-9365

Co-authored-by: KeenRivals <6865789+KeenRivals@users.noreply.github.com>
2022-07-01 08:19:27 +02:00
j.spijker@ultimaker.com
721aff4255 Ported nsis scripts and resource from cura-build-environment
Contributes to CURA-9365
2022-07-01 06:18:43 +02:00
j.spijker@ultimaker.com
dc8c9bb276 Moved MacOS dmg to dedicated folder
Contributes to CURA-9365
2022-07-01 05:39:22 +02:00
j.spijker@ultimaker.com
9801402638 Moved AppImage files to dedicated folder
Contributes to CURA-9365
2022-07-01 05:37:08 +02:00
j.delarago
c08aa5b765 Move icons to icons folder
Update dmg building script

CURA-9365
2022-06-30 17:41:38 +02:00
j.delarago
afa899cf21 Add dmg building script 😎
CURA-9365
2022-06-30 15:08:46 +02:00
j.spijker@ultimaker.com
a2da68d806 Updated mapping of pyinstaller metadata
Contributes to CURA-9365
2022-06-30 14:49:07 +02:00
Ghostkeeper
72b1097c9a
Add auxiliary files needed for AppImage
AppRun is the file that gets packaged inside of the AppImage that bootstraps the application.
The AppImage can only have one icon, so we use the largest sample we have available.
The appdata.xml contains some metadata.

Contributes to issue CURA-9409.
2022-06-30 14:43:52 +02:00
Ghostkeeper
047d7b1b19
Provision desktop file with Jinja to put in version number
This way the Desktop file for the AppImage knows the version number, and the appimage itself knows it too.

Contributes to issue CURA-9409.
2022-06-30 14:43:51 +02:00
Ghostkeeper
c2f3161fb6
Allow providing dist_path and version via command line arguments
Previously you had to call the script from the dist path specifically, using the cwd as a parameter. Now you can provide a different path, allowing you to call this script from any location.
Also the version number used to be hard-coded. Now that can be provided by the caller.

Contributes to issue CURA-9409.
2022-06-30 14:43:51 +02:00
c.lamboo
394942e2cf Move resources for mac dmg creation
CURA-9365
2022-06-30 14:34:22 +02:00
Ghostkeeper
648c1e95db
Add main function to make it easier to call this
Contributes to issue CURA-9409.
2022-06-30 11:48:56 +02:00
Ghostkeeper
f3fd2d6f80
Fix calling subprocesses
We shouldn't unpack the list. The first argument is allowed to be a list. If we unpack it, it'll override other arguments to the call function that would be the wrong type then (buffer size).

Contributes to issue CURA-9409.
2022-06-30 11:48:56 +02:00
Ghostkeeper
254edfd3ec
Fix deleting old files if they exist
Rmdir crashes when it needs to delete just one file, annoyingly.

Contributes to issue CURA-9409.
2022-06-30 11:48:56 +02:00
Ghostkeeper
970e0d8395
Add script to package and sign AppImages
This has not been tested yet at all.

Contributes to issue CURA-9409.
2022-06-30 11:48:55 +02:00