Commit graph

121 commits

Author SHA1 Message Date
Jelle Spijker
84116c8cc1
Simplified copy of resources
Contributes to CURA-10550
2023-04-28 16:09:40 +02:00
Jelle Spijker
2e0ba5cadf
Update Cura svg icon
Contributes to CURA-10550

Co-authored-by: Lorenzo Romagnoli <lorenzo.romagnoli@ultimaker.com>
2023-04-28 13:42:33 +02:00
Jelle Spijker
fa51b1bcfc
Use system agnostic paths 2023-04-28 13:33:48 +02:00
Leandro Heck
e612341f7f Add back the original image. Something was complaining about it. 2023-03-24 14:41:53 -03:00
Leandro Heck
9f9e218ef4 Add extra icons and fix their paths 2023-03-24 14:31:03 -03:00
Leandro Heck
f5b53f8065 Add icon svg 2023-03-23 22:54:01 -03:00
Jelle Spijker
da435f25f8
Change Shebang from Bourne to Bash
Should fix #14741
2023-03-22 07:27:36 +01:00
Joey de l'Arago
e834cce32a Pass the app name into the build_macos script so that it matches the app name used in UltiMaker-Cura.spec.jinja 2023-01-16 15:29:38 +01:00
Joey de l'Arago
36d3662750 Merge branch 'main' into CURA-6867_pkg_for_macos 2023-01-16 13:53:14 +01:00
Joey de l'Arago
7eb75f01d7 Merge remote-tracking branch 'origin/CURA-6867_pkg_for_macos' into CURA-6867_pkg_for_macos 2023-01-16 10:22:18 +01:00
Joey de l'Arago
902f4ef02e
Update packaging/MacOS/build_macos.py
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2023-01-16 10:22:06 +01:00
Joey de l'Arago
cf4752aa0b Mention dmg in arg parser.
Fix spelling

CURA-6867
2023-01-16 10:21:04 +01:00
Jelle Spijker
24cb9e16a8 Use auto generated shortcut Guid
This should remove the short-cuts

Contributes to CURA-9157
2023-01-13 15:43:04 +01:00
Joey de l'Arago
c04cc7809a Only use end of cura version for identifier. The "/" is an illegal character in the distribution.xml
CURA-6867
2023-01-13 13:38:10 +01:00
Jelle Spijker
5542eec0c4 Allow for uninstall of previous same major.minor.path versions
Contributes to CURA-9157
2023-01-13 11:39:34 +01:00
Jelle Spijker
df5544444d Still show the uninstall feature in the CE edition
Contributes to CURA-9157
2023-01-13 11:39:01 +01:00
Joey de l'Arago
6ca4af399a Use different identifier for different versions so that they don't replace eachother.
CURA-6867
2023-01-13 11:33:43 +01:00
Joey de l'Arago
65bf56e9fa 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
CURA-6867
2023-01-13 10:18:33 +01:00
Joey de l'Arago
0f683d301a Remove double .dmg at the end of file name.
Fix typo in msi_instaler

CURA-6867
2023-01-13 09:26:54 +01:00
Jelle Spijker
dc2a8ffc60 Uninstall previous versions as a feature
Contributes to CURA-9157
2023-01-12 17:14:27 +01:00
Joey de l'Arago
116d2b9ce5 Add source path back to macOs installer for fetching dmg background image
CURA-6867
2023-01-12 16:19:24 +01:00
Joey de l'Arago
3a24ab1bee Merge branch 'main' into CURA-6867_pkg_for_macos 2023-01-12 15:25:32 +01:00
Joey de l'Arago
05e1f57324 Revert dmg deprecation
CURA-6867
2023-01-12 13:24:28 +01:00
Jelle Spijker
8e9289fd11 Disable ICE validation
https://stackoverflow.com/questions/1064580/wix-3-0-throws-error-217-while-being-executed-by-continuous-integration

Contribute to CURA-9157
2023-01-11 16:46:27 +01:00
Joey de l'Arago
50c4f777ab Fix Cura being moved on install
CURA-6867
2023-01-11 16:08:06 +01:00
Jelle Spijker
e31c2735dc Document Wix arguments
Contribute to CURA-9157
2023-01-11 15:36:57 +01:00
Casper Lamboo
5d4b6a0249
Merge pull request #14260 from Ultimaker/CURA-9157
Cura 9157
2023-01-11 14:18:22 +01:00
Joey de l'Arago
9ae3bc37dc Rename MacOs -> MacOS
CURA-6867
2023-01-11 13:27:26 +01:00
Joey de l'Arago
11b2c94988 Remove build installer check.
CURA-6867
2023-01-11 13:03:16 +01:00
Joey de l'Arago
a80390efb3 Make building easier without signing identity.
CURA-6867
2023-01-11 12:07:12 +01:00
Joey de l'Arago
ddb4547598 Use path to join paths
CURA-6867
2023-01-11 11:57:51 +01:00
Jelle Spijker
4740172dcc Fix the file association
AnusNeukendeFlapperendePapegaaienDrol

Contribute to CURA-9157
2023-01-10 17:34:27 +01:00
Jelle Spijker
f99aeb9182 Set product code based app_name and version
This might fix upgrading of alpha versions

Contribute to CURA-9157
2023-01-10 17:00:09 +01:00
Jelle Spijker
81cb75ebd7 Allow for custom location installation
Contribute to CURA-9157
2023-01-10 16:59:17 +01:00
Jelle Spijker
fdfdc90a1a Fix file association
At least an attempt to.

Contribute to CURA-9157
2023-01-10 15:26:21 +01:00
Jelle Spijker
79c7f820e4 Fix file association
At least an attempt to.

Contribute to CURA-9157
2023-01-10 14:56:30 +01:00
Jelle Spijker
dc946b7444 Fix Firewall exception
Both Cura and CuraEngine are now added to the firewall for 127.0.0.1

No more bugging the user on initial startup

Contribute to CURA-9157
2023-01-10 11:59:02 +01:00
Joey de l'Arago
b96c0dce39 Remove source path from build_macos.py because it is unused.
Refactor filename because it now includes the extension.

The component now has -Component.pkg instead of the installer usincg -Installer.pkg. They must have different names but now the input filename is used to upload the artifacts.

CURA-6867
2023-01-10 10:11:27 +01:00
Joey de l'Arago
43b672834b Deprecate DMG building.
CURA-6867
2023-01-10 09:29:49 +01:00
Joey de l'Arago
db501f5eed Merge branch 'main' into CURA-6867_pkg_for_macos
# Conflicts:
#	.github/workflows/cura-installer.yml
2023-01-10 09:19:01 +01:00
Jelle Spijker
1367056e7a Replace tab with spaces
Contribute to CURA-9157
2023-01-09 15:49:53 +01:00
Jelle Spijker
a97c7e982b Fix typo Enterprise
Contribute to CURA-9157
2023-01-09 15:49:36 +01:00
Jelle Spijker
2727370bc8 Add UltiMaker-Cura.exe to firewall exception
Contribute to CURA-9157
2023-01-09 14:45:22 +01:00
Jelle Spijker
120c393032 Use company in comment
Contribute to CURA-9157
2023-01-09 14:39:18 +01:00
Jelle Spijker
38b4d8f2c4 Ignore self reg warning 2023-01-06 20:59:32 +01:00
Jelle Spijker
127b4b7976 fix typing 2023-01-06 13:31:12 +01:00
Jelle Spijker
eddbc799ac Merge remote-tracking branch 'origin/main' into CURA-9157_msi_installer 2023-01-06 10:57:39 +01:00
sree
b118a1b1b5 Use ARGV0 to invoke other binaries inside AppImage 2023-01-03 20:51:56 -05:00
Casper Lamboo
a5b0542f8a Merge remote-tracking branch 'origin/CURA-9157_msi_installer' into CURA-9157_msi_installer 2023-01-02 22:34:07 +01:00
Remco Burema
5b8bac6a61 Attempt to set file associations and fire-wall exceptions.
The fire-wall exceptions work, but the device needs to be restarted. Is that worth it?

A more important problem is that windows overhauled the file associations a few years ago. The approach here doesn't work (but is at least consistent with how it worked before, so it might work for Windows < 10 or unupdated). The current go-to approach is the one used by firefox, and it happens after the installer, at first start-up of the program.

part of CURA-9157
2022-12-29 18:06:53 +01:00