GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,579 Commits 287 Branches 260 Tags
Commit Graph

151 Commits

Author SHA1 Message Date
j.spijker@ultimaker.com
e8c9df1794 Add internal build options 
This will add the keyword `internal` to the build metadata such that
it is easier to distinguish between normal Cura builds and internal
builds with private data.
 2022-08-10 12:36:41 +02:00
j.spijker@ultimaker.com
c1ae1872d0 Make sure build and generate steps are present 
Contributes to CURA-8831
 2022-08-03 17:49:13 +02:00
j.spijker@ultimaker.com
cf548613ca Add cura env to Run environments 
Contributes to CURA-8831
 2022-08-03 08:51:41 +02:00
j.spijker@ultimaker.com
f95b22404a fix base_dir for venv when running from source 
Contributes to CURA-8831
 2022-08-03 08:51:41 +02:00
j.spijker@ultimaker.com
e4feae414b Build pyarcus and pysavitar shared 
Contributes to CURA-8828, CURA-8829 and CURA-8831
 2022-08-03 08:51:41 +02:00
j.spijker@ultimaker.com
89de2b1fae Set the Cura Version also when running from source 2022-07-27 12:03:51 +02:00
jspijker
79fe069d20 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 10:34:45 +02:00
j.spijker@ultimaker.com
3609871ba6 Use umbase 0.1.5 
Contributes to CURA-9365
 2022-07-19 10:33:04 +02:00
jspijker
2b4b110b38 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 09:54:18 +02:00
j.spijker@ultimaker.com
1c3a46c9e2 Use empty string for channel if channel is undefined 
Contributes to CURA-9365
 2022-07-19 09:52:54 +02:00
j.spijker@ultimaker.com
cd303b4e6f Make sure all dynamic libs are copied to the dist 
Solve it dynamically in the Ultimaker-Cura.spec,
Such that we can copy files manually (OpenSSL shared)
to the bin/Script folder after the cura install step.

Contributes to CURA-9342
 2022-07-18 11:34:21 +02:00
j.spijker@ultimaker.com
8f1ad7e6b4
Use umbase 0.1.4 
Contributes to CURA-9365
 2022-07-14 18:21:55 +02:00
j.spijker@ultimaker.com
3ea7dd8565
Use umbase 0.1.4 
Contributes to CURA-9365
 2022-07-14 18:21:23 +02:00
j.spijker@ultimaker.com
7068c87130
Add copied openssl 1.1.1l binaries to pyinstall binaries 
Contributes to CURA-9342
 2022-07-14 10:38:59 +02:00
j.spijker@ultimaker.com
82904ccd3f Fix version if version is None 
Contributes to CURA-9365
 2022-07-07 20:04:38 +02:00
j.spijker@ultimaker.com
c22999c314 handle local packages correctly 
Contributes to CURA-9365
 2022-07-07 19:49:04 +02:00
j.spijker@ultimaker.com
4d98ba3540 Fixed missing qoutes 
Contributes to CURA-9365
 2022-07-07 07:07:32 +02:00
j.spijker@ultimaker.com
c100f68f58 Add missing info.plist 
2ce60de673/packaging/Info.plist.in (L5)

Contributes to CURA-9365
 2022-07-07 05:58:58 +02:00
j.spijker@ultimaker.com
48539bb7f8
Only convert path to string 
Contributes to CURA-9365
 2022-07-06 14:28:43 +02:00
j.spijker@ultimaker.com
c9587c3d21
convert to posixpath string 
Contributes to CURA-9365
 2022-07-06 14:17:53 +02:00
j.spijker@ultimaker.com
db8ec3994e
Add conan_install_info.json to the builds 
Should help with debugging, We could maybe even use it
later on to update the about page and/or logs

If you want to create a package you should also
pass the `--json <venv_path>/conan_install_info.json` to
the install command.

Contributes to CURA-9365
 2022-07-06 13:54:44 +02:00
j.spijker@ultimaker.com
2ee58e24bc Don't strip binaries 
On some Linux systems it fails due to an invalid Elf handle.
Stripping the binaries on Linux/MacOS is a likely culprit.
Disabling this option seems a save choice at least for now.

Contributes to CURA-9365
 2022-07-06 07:37:46 +02:00
jellespijker
8a14406c63 Add dynamic libs from lib path to binaries 
Should fix missing protoc on MacOS

Contributes to CURA-9365
 2022-07-05 22:34:19 +02:00
jellespijker
fd7c5abdc0 Set build version to 0 if build version is '' 
Contributes to CURA-9365
 2022-07-05 14:13:05 +02:00
jellespijker
e226dc5030 Also copy build libs 
Hoping this fixes the missing protoc

Contributes to CURA-9365
 2022-07-04 16:45:07 +02:00
jellespijker
08c11f0c28 Use correct bundle id 
Contributes to CURA-9365
 2022-07-04 16:00:13 +02:00
jellespijker
3d422e1e29 Copy libs to lib_dir 
Contributes to CURA-9365
 2022-07-04 13:51:09 +02:00
j.spijker@ultimaker.com
5bc61324ee Also use dylib of cpython 
Contributes to CURA-9365
 2022-07-04 12:04:48 +02:00
j.spijker@ultimaker.com
cbedbbb0bd Remove brackets around env var name 
Contributes to CURA-9365
 2022-07-01 11:33:18 +02:00
j.spijker@ultimaker.com
2fd1309bee Add missing file name 
Contributes to CURA-9365
 2022-07-01 10:50:08 +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
c.lamboo
0580814352 Fix passing macos flag to jinja 
CURA-9365
 2022-07-01 09:56:40 +02:00
j.spijker@ultimaker.com
ac2fbbf791 Collect all PyQt6-Qt6 dll's for Win and place them in the root 
Quick fix, we should probably work with hooks in the future

Contributes to CURA-9365
 2022-07-01 09:24:57 +02:00
j.spijker@ultimaker.com
b5e0ae8ff9 fixes for Macos 
Contributes to CURA-9365
 2022-07-01 09:07:38 +02:00
Jelle Spijker
ff321409c5 Revert "Clean the install folder first" 
This reverts commit 627bd929c4cce3bac7c4c4a7cdb93e0198752563.
 2022-07-01 08:56:06 +02:00
j.spijker@ultimaker.com
5d057db298 Use BUNDLE app for Macos 
Contributes to CURA-9365

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
 2022-07-01 08:05:32 +02:00
j.spijker@ultimaker.com
627bd929c4 Clean the install folder first 
Handy for debugging

Contributes to CURA-9365
 2022-07-01 07:46:57 +02:00
j.spijker@ultimaker.com
1f629b9e48 Fixes escaped path's on Windows 
Why is it that the Path is converted to single \
for the icon and entry_point but not for the binaries?

Contributes to CURA-9365
 2022-07-01 07:43:11 +02:00
j.spijker@ultimaker.com
7bc71070fd Remove quotes around None value 
Contributes to CURA-9365
 2022-07-01 07:25:28 +02:00
j.spijker@ultimaker.com
dec5609459 Set strip to True for Mac and Linux 
Contributes to CURA-9365
 2022-07-01 07:09:31 +02:00
j.spijker@ultimaker.com
f5789433ce Add target architecture for Macos 
We should extend this Arm support in the future

Contributes to CURA-9365
 2022-07-01 07:00:34 +02:00
j.spijker@ultimaker.com
87a521159e Add osx_bundle_identifier 
Contributes to CURA-9365
 2022-07-01 06:52:19 +02:00
j.spijker@ultimaker.com
f3ebf98440 Only use upx on Windows 
Contributes to CURA-9365
 2022-07-01 06:37:34 +02:00
j.spijker@ultimaker.com
3fe0f26e94 explicit cast from Path to str 
Contributes to CURA-9365
 2022-07-01 06:33:50 +02:00
j.spijker@ultimaker.com
2ea78a3ef6 use package resource folder 
Contributes to CURA-9365
 2022-07-01 06:20:26 +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
e9cbad1164 Allow for pyinstaller to sign the files on MacOS 
Contributes to CURA-9365
 2022-07-01 05:34:52 +02:00
j.spijker@ultimaker.com
cc8f0d3001 Add conan binaries to binaries 
Contributes to CURA-9365
 2022-07-01 05:25:25 +02:00
Jelle Spijker
7dc4266b09
single qoutes 2022-07-01 00:29:15 +02:00
Jelle Spijker
36bcb97dbb
place qoutes around path 2022-07-01 00:09:22 +02:00