Skip to content
This repository has been archived by the owner on Dec 9, 2022. It is now read-only.

[WIP] Rework cura-build to separate dependencies and provide signing targets #75

Merged
merged 104 commits into from
Feb 16, 2017
Merged

[WIP] Rework cura-build to separate dependencies and provide signing targets #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
bb88701
Start splitting things into Environment and Build bits
awhiemstra Jul 13, 2016
4623966
Add separate files for individual projects
awhiemstra Jul 19, 2016
5d73e5d
Add project files for Cura, CuraEngine and Uranium
awhiemstra Jul 19, 2016
9dace7e
Refactor python module find files to use a common function
awhiemstra Jul 19, 2016
180bb68
Add a file to find cx_Freeze python module
awhiemstra Jul 19, 2016
07527e8
Add a project file for cura-binary-data
awhiemstra Jul 19, 2016
aa58e69
Introduce a SetProjectDependencies macro and use it for Cura
awhiemstra Jul 19, 2016
ee89d34
Introduce a packaging step and add includes for Linux and OSX
awhiemstra Jul 19, 2016
06b5987
Move setup_* files into the packaging directory
awhiemstra Jul 19, 2016
7ecfce5
Introduce a signing step and a signing file for Linux
awhiemstra Jul 19, 2016
6666a74
Ensure project dependencies are set properly
awhiemstra Jul 21, 2016
ceef674
Add a working cx_Freeze script for Linux
awhiemstra Jul 21, 2016
0dbdf64
Start on some preliminary work to support creating AppImages
awhiemstra Jul 21, 2016
7df432c
Add a simple build platform detection file
awhiemstra Jul 21, 2016
beba423
Add project files for Doodle3d and Post Processing plugins
awhiemstra Jul 21, 2016
6fa51a5
Add a placeholder signing file for OSX
awhiemstra Jul 21, 2016
49f3d53
Fix setting Cura version
awhiemstra Jul 21, 2016
4109e99
Require cx_Freeze 5.0
awhiemstra Jul 21, 2016
d1ad449
Fix up OSX project file to use cx_Freeze
awhiemstra Jul 21, 2016
373ffb7
Add a placeholder signing file for Linux
awhiemstra Jul 21, 2016
beafda4
Use cx_freeze's library detection to detect and include dependencies
awhiemstra Jul 21, 2016
9443ba7
Remove obsolete files
awhiemstra Jul 22, 2016
798ace4
Implement a simple version of FindAppImageKit.cmake
awhiemstra Jul 22, 2016
55c818f
Properly setup Linux packaging to generate a correct AppImage
awhiemstra Jul 22, 2016
b4f6f3e
Add GPG signing and SHA-1 sum generation for Linux
awhiemstra Jul 22, 2016
a049be6
Initialize BUILD_* to OFF
awhiemstra Jul 25, 2016
acf2c6e
Use the right variable name to check if Python was found
awhiemstra Jul 26, 2016
755b6ff
Ensure we set CMAKE_PREFIX_PATH to the right path for OSX to find the…
awhiemstra Jul 26, 2016
5e677b9
Implement packaging for OSX with cx_Freeze
awhiemstra Jul 26, 2016
a0a6e62
Move cura.icns to packaging/
awhiemstra Jul 28, 2016
e4ddc7f
Remove commented code
awhiemstra Jul 28, 2016
f3cb21c
Finish up creating an app bundle for OSX
awhiemstra Jul 28, 2016
b1b52ed
Create a .dmg in the signing step
awhiemstra Jul 28, 2016
057df46
Make signing on OSX work properly
awhiemstra Aug 11, 2016
13ffa3d
escape char in CMakeLists.txt
jackha Aug 22, 2016
71602f2
Code style: Whitespace around binary operators
Ghostkeeper Sep 5, 2016
3438663
Use CMAKE_PREFIX_PATH to determine locations from the build environment
awhiemstra Sep 6, 2016
0ffac17
Fix prefix_path for uranium
awhiemstra Sep 6, 2016
225ded7
Fix prefix path for Doodle3D plugin
awhiemstra Sep 7, 2016
e50325d
Remove qt.conf on OSX since it is not needed after all and causes sig…
awhiemstra Sep 12, 2016
3cfabdd
Fix OSX Plist file so signing on OSX 10.11 works properly
awhiemstra Sep 12, 2016
941f3dc
Add functionality to include project files from a separate directory.
awhiemstra Sep 12, 2016
7a5c6af
Add missing modules to OSX setup file
awhiemstra Sep 22, 2016
a5c4c5d
Add "packaging" module that some other module is complaining about
awhiemstra Sep 22, 2016
bd41f31
Include entire pkg_resources since just packaging does not seems enough
awhiemstra Sep 22, 2016
36e2005
Remove pkg_resources again from packages
awhiemstra Sep 22, 2016
9745b34
Add fdm_materials as an extra project
awhiemstra Sep 27, 2016
c54671f
Append to CMAKE_MODULE_PATH instead of replacing it
awhiemstra Sep 27, 2016
39b0d12
Force master for fdm_materials for now
awhiemstra Sep 27, 2016
3da4bd2
Fix copy command for Linux desktop file/icon
awhiemstra Oct 17, 2016
551a7d4
Properly include Qt and QML plugins
awhiemstra Oct 17, 2016
357e8aa
Add missing commas
awhiemstra Oct 17, 2016
f0bb01a
Add missing serial/zeroconf and do not exclude libssl
awhiemstra Oct 17, 2016
d12fa8e
Include CuraEngine when building an executable from Python files
awhiemstra Oct 17, 2016
f1db025
Add missing comma
awhiemstra Oct 17, 2016
d0ccef3
Add LD_LIBRARY_PATH to startup script so CuraEngine starts
awhiemstra Oct 17, 2016
cb5adc7
Add missing numpy-stl package
awhiemstra Oct 20, 2016
062cdc7
Add UM3NetworkPrinting plugin
awhiemstra Oct 20, 2016
d26bcdc
Use the right branch for fdm_materials
awhiemstra Oct 20, 2016
4bbf6d7
Remove libcrypto.so.10 from the excluded libraries
awhiemstra Oct 20, 2016
fad9d5d
Add two more libraries to the list of excluded libraries on Linux
awhiemstra Oct 20, 2016
3994fb1
Add QT_XKB_CONFIG_ROOT export to the start script
awhiemstra Oct 24, 2016
c01de68
CMake: Making it a NONE-type project
thopiekar Oct 25, 2016
b41c36c
CuraEngine: Appending generator and add Protobuf hack
thopiekar Oct 25, 2016
c4d2b22
Uranium: Only ask for Qt5 on non-Windows OSs
thopiekar Oct 25, 2016
b1321af
CuraEngine: Updating workaround for static build
thopiekar Oct 26, 2016
5dd810c
Batch: Updating env* scripts for Python 3.5
thopiekar Oct 27, 2016
b13c568
NSIS: Merging FileAssociation from diverged master
thopiekar Oct 27, 2016
c5d0005
README.md: Updating list of Windows dependencies
thopiekar Oct 27, 2016
022508b
Merge branch 'master-environment_split-windows-support' of https://gi…
thopiekar Oct 27, 2016
ecc99cc
CMake: Making sure CMAKE_PREFIX_PATH is absolute
thopiekar Oct 27, 2016
10f416b
Windows: Updating setup_win32.py.in script
thopiekar Oct 27, 2016
0b96ed4
gitignore: Adding Eclipse+PyDev
thopiekar Oct 27, 2016
2f2862a
gitignore: Remove ignoring deb files
thopiekar Oct 27, 2016
e777e2e
packaging: Adding initial script for Windows
thopiekar Oct 27, 2016
abdb75b
signing: Adding initial script for Windows
thopiekar Oct 27, 2016
b74c602
README.md: Merging old environment_split instructions
thopiekar Oct 27, 2016
33372d8
Adding old ExtraRepository.cmake script
thopiekar Oct 27, 2016
08788ed
signing: Windows: Fixes on signtool.exe usage
thopiekar Nov 1, 2016
f8174e2
Merge branch 'master-environment_split-windows-support' of https://gi…
thopiekar Nov 1, 2016
f34d553
README: Remove dependency on Protobuf's python binding
thopiekar Nov 11, 2016
292f18b
Windows: Making unsigned builds non-fatal
thopiekar Nov 11, 2016
464603e
NSIS: Adding X3D association
thopiekar Nov 11, 2016
4f50035
NSIS: Sorting file association by alphabet
thopiekar Nov 11, 2016
d2a8d3c
Windows: setup.py.in: Remove superfluous lines
thopiekar Nov 11, 2016
71ed5b3
Packaging: Windows: Depend on projects
thopiekar Nov 11, 2016
dc02432
Windows: Moving NSIS instructions to packaging
thopiekar Nov 11, 2016
2d2a18b
Windows: Adding additional notes
thopiekar Nov 11, 2016
f76f5df
Windows: Adding FindSigntool and using it
thopiekar Nov 11, 2016
f657c12
Windows: Renaming sign_installer to signing_installer
thopiekar Nov 11, 2016
f57fd4a
Windows: Using CPACK_SYSTEM_NAME
thopiekar Nov 11, 2016
4ddccc4
Windows: Correcting typo
thopiekar Nov 11, 2016
c9a01fb
NSIS: Removing orphaned variable
thopiekar Nov 15, 2016
6b63253
Revert "Windows: setup.py.in: Remove superfluous lines"
thopiekar Nov 16, 2016
57346fa
Windows: Correctly install plugins directory
thopiekar Nov 16, 2016
6c3c305
Remove numpy-stl from Linux build
awhiemstra Nov 29, 2016
5ca3316
Remove "fonts" dir from installed files
awhiemstra Nov 30, 2016
7c4eb0f
Make sure to call cx_Freeze with LD_LIBRARY_PATH set
awhiemstra Nov 30, 2016
8483f9d
Revert "Remove numpy-stl from Linux build"
awhiemstra Nov 30, 2016
d5c038d
Disable numpy-stl again
awhiemstra Nov 30, 2016
5a6ce23
Remove UM3 Network Printing project file since it has been merged
awhiemstra Dec 15, 2016
79ac548
Add an option to enable Cura's debug mode
awhiemstra Feb 13, 2017
d5270b6
Add missing QOpenGLFunction_4_1_Core to build
awhiemstra Feb 16, 2017
a7a4893
Merge pull request #89 from thopiekar/master-environment_split-window…
awhiemstra Feb 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ _CPack_Packages/
cmake_install.cmake
/inst/

# CMake - Debian
*.deb

# Various files
*.pyc
*kdev*
__pycache__
Expand All @@ -25,3 +23,7 @@ build
resources/i18n/en
resources/i18n/x-test
.DS_Store

# Eclipse+PyDev
.project
.pydevproject
Loading