-
Notifications
You must be signed in to change notification settings - Fork 116
[WIP] Rework cura-build to separate dependencies and provide signing targets #75
Commits on Jul 13, 2016
-
Configuration menu - View commit details
-
Copy full SHA for bb88701 - Browse repository at this point
Copy the full SHA bb88701View commit details
Commits on Jul 19, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 4623966 - Browse repository at this point
Copy the full SHA 4623966View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d73e5d - Browse repository at this point
Copy the full SHA 5d73e5dView commit details -
Refactor python module find files to use a common function
This way we can much more easily add find files for other modules
Configuration menu - View commit details
-
Copy full SHA for 9dace7e - Browse repository at this point
Copy the full SHA 9dace7eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 180bb68 - Browse repository at this point
Copy the full SHA 180bb68View commit details -
Configuration menu - View commit details
-
Copy full SHA for 07527e8 - Browse repository at this point
Copy the full SHA 07527e8View commit details -
Introduce a SetProjectDependencies macro and use it for Cura
Since otherwise we get errors about undefined targets because Cura is included before its dependency Uranium.
Configuration menu - View commit details
-
Copy full SHA for aa58e69 - Browse repository at this point
Copy the full SHA aa58e69View commit details -
Configuration menu - View commit details
-
Copy full SHA for ee89d34 - Browse repository at this point
Copy the full SHA ee89d34View commit details -
Configuration menu - View commit details
-
Copy full SHA for 06b5987 - Browse repository at this point
Copy the full SHA 06b5987View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7ecfce5 - Browse repository at this point
Copy the full SHA 7ecfce5View commit details
Commits on Jul 21, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 6666a74 - Browse repository at this point
Copy the full SHA 6666a74View commit details -
Configuration menu - View commit details
-
Copy full SHA for ceef674 - Browse repository at this point
Copy the full SHA ceef674View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0dbdf64 - Browse repository at this point
Copy the full SHA 0dbdf64View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7df432c - Browse repository at this point
Copy the full SHA 7df432cView commit details -
Configuration menu - View commit details
-
Copy full SHA for beba423 - Browse repository at this point
Copy the full SHA beba423View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6fa51a5 - Browse repository at this point
Copy the full SHA 6fa51a5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 49f3d53 - Browse repository at this point
Copy the full SHA 49f3d53View commit details -
Since 4.3 dumps all library files into the root dir
Configuration menu - View commit details
-
Copy full SHA for 4109e99 - Browse repository at this point
Copy the full SHA 4109e99View commit details -
Configuration menu - View commit details
-
Copy full SHA for d1ad449 - Browse repository at this point
Copy the full SHA d1ad449View commit details -
Configuration menu - View commit details
-
Copy full SHA for 373ffb7 - Browse repository at this point
Copy the full SHA 373ffb7View commit details -
Use cx_freeze's library detection to detect and include dependencies
This way we do not need to manually copy all those libraries
Configuration menu - View commit details
-
Copy full SHA for beafda4 - Browse repository at this point
Copy the full SHA beafda4View commit details
Commits on Jul 22, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 9443ba7 - Browse repository at this point
Copy the full SHA 9443ba7View commit details -
Implement a simple version of FindAppImageKit.cmake
Since we do not really need the complicated macro
Configuration menu - View commit details
-
Copy full SHA for 798ace4 - Browse repository at this point
Copy the full SHA 798ace4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 55c818f - Browse repository at this point
Copy the full SHA 55c818fView commit details -
Configuration menu - View commit details
-
Copy full SHA for b4f6f3e - Browse repository at this point
Copy the full SHA b4f6f3eView commit details
Commits on Jul 25, 2016
-
Configuration menu - View commit details
-
Copy full SHA for a049be6 - Browse repository at this point
Copy the full SHA a049be6View commit details
Commits on Jul 26, 2016
-
Configuration menu - View commit details
-
Copy full SHA for acf2c6e - Browse repository at this point
Copy the full SHA acf2c6eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 755b6ff - Browse repository at this point
Copy the full SHA 755b6ffView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5e677b9 - Browse repository at this point
Copy the full SHA 5e677b9View commit details
Commits on Jul 28, 2016
-
Configuration menu - View commit details
-
Copy full SHA for a0a6e62 - Browse repository at this point
Copy the full SHA a0a6e62View commit details -
Configuration menu - View commit details
-
Copy full SHA for e4ddc7f - Browse repository at this point
Copy the full SHA e4ddc7fView commit details -
Configuration menu - View commit details
-
Copy full SHA for f3cb21c - Browse repository at this point
Copy the full SHA f3cb21cView commit details -
Create a .dmg in the signing step
We need to sign all executables in the bundle before packaging. This allows us to do that.
Configuration menu - View commit details
-
Copy full SHA for b1b52ed - Browse repository at this point
Copy the full SHA b1b52edView commit details
Commits on Aug 11, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 057df46 - Browse repository at this point
Copy the full SHA 057df46View commit details
Commits on Aug 22, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 13ffa3d - Browse repository at this point
Copy the full SHA 13ffa3dView commit details
Commits on Sep 5, 2016
-
Code style: Whitespace around binary operators
Contributes to issue CURA-879.
Configuration menu - View commit details
-
Copy full SHA for 71602f2 - Browse repository at this point
Copy the full SHA 71602f2View commit details
Commits on Sep 6, 2016
-
Use CMAKE_PREFIX_PATH to determine locations from the build environment
This fixes dependency lookups in built projects
Configuration menu - View commit details
-
Copy full SHA for 3438663 - Browse repository at this point
Copy the full SHA 3438663View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ffac17 - Browse repository at this point
Copy the full SHA 0ffac17View commit details
Commits on Sep 7, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 225ded7 - Browse repository at this point
Copy the full SHA 225ded7View commit details
Commits on Sep 12, 2016
-
Configuration menu - View commit details
-
Copy full SHA for e50325d - Browse repository at this point
Copy the full SHA e50325dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3cfabdd - Browse repository at this point
Copy the full SHA 3cfabddView commit details -
Add functionality to include project files from a separate directory.
This replaces EXTRA_REPOSITORIES from the original cura-build.
Configuration menu - View commit details
-
Copy full SHA for 941f3dc - Browse repository at this point
Copy the full SHA 941f3dcView commit details
Commits on Sep 22, 2016
-
Add missing modules to OSX setup file
Since they are needed for plugins but cx_freeze does not find them. Contributes to CURA-879
Configuration menu - View commit details
-
Copy full SHA for 7a5c6af - Browse repository at this point
Copy the full SHA 7a5c6afView commit details -
Add "packaging" module that some other module is complaining about
Contributes to CURA-879
Configuration menu - View commit details
-
Copy full SHA for a5c4c5d - Browse repository at this point
Copy the full SHA a5c4c5dView commit details -
Include entire pkg_resources since just packaging does not seems enough
Contributes to CURA-879
Configuration menu - View commit details
-
Copy full SHA for bd41f31 - Browse repository at this point
Copy the full SHA bd41f31View commit details -
Remove pkg_resources again from packages
It turns out it was not needed after all, instead several modules needed a proper installation. Contributes to CURA-879
Configuration menu - View commit details
-
Copy full SHA for 36e2005 - Browse repository at this point
Copy the full SHA 36e2005View commit details
Commits on Sep 27, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 9745b34 - Browse repository at this point
Copy the full SHA 9745b34View commit details -
Configuration menu - View commit details
-
Copy full SHA for c54671f - Browse repository at this point
Copy the full SHA c54671fView commit details -
Force master for fdm_materials for now
Since we have no other branches
Configuration menu - View commit details
-
Copy full SHA for 39b0d12 - Browse repository at this point
Copy the full SHA 39b0d12View commit details
Commits on Oct 17, 2016
-
Fix copy command for Linux desktop file/icon
Since cmake -E copy does not actually take multiple arguments
Configuration menu - View commit details
-
Copy full SHA for 3da4bd2 - Browse repository at this point
Copy the full SHA 3da4bd2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 551a7d4 - Browse repository at this point
Copy the full SHA 551a7d4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 357e8aa - Browse repository at this point
Copy the full SHA 357e8aaView commit details -
Configuration menu - View commit details
-
Copy full SHA for f0bb01a - Browse repository at this point
Copy the full SHA f0bb01aView commit details -
Configuration menu - View commit details
-
Copy full SHA for d12fa8e - Browse repository at this point
Copy the full SHA d12fa8eView commit details -
Configuration menu - View commit details
-
Copy full SHA for f1db025 - Browse repository at this point
Copy the full SHA f1db025View commit details -
Configuration menu - View commit details
-
Copy full SHA for d0ccef3 - Browse repository at this point
Copy the full SHA d0ccef3View commit details
Commits on Oct 20, 2016
-
Since it is used by a plugin cx_Freeze does not find it
Configuration menu - View commit details
-
Copy full SHA for cb5adc7 - Browse repository at this point
Copy the full SHA cb5adc7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 062cdc7 - Browse repository at this point
Copy the full SHA 062cdc7View commit details -
Configuration menu - View commit details
-
Copy full SHA for d26bcdc - Browse repository at this point
Copy the full SHA d26bcdcView commit details -
Remove libcrypto.so.10 from the excluded libraries
Since it is called differently on other platforms
Configuration menu - View commit details
-
Copy full SHA for 4bbf6d7 - Browse repository at this point
Copy the full SHA 4bbf6d7View commit details -
Add two more libraries to the list of excluded libraries on Linux
Since they prevent SliceInfo from working properly
Configuration menu - View commit details
-
Copy full SHA for fad9d5d - Browse repository at this point
Copy the full SHA fad9d5dView commit details
Commits on Oct 24, 2016
-
Add QT_XKB_CONFIG_ROOT export to the start script
Otherwise keyboard input does not seem to work
Configuration menu - View commit details
-
Copy full SHA for 3994fb1 - Browse repository at this point
Copy the full SHA 3994fb1View commit details
Commits on Oct 25, 2016
-
CMake: Making it a NONE-type project
cura-build itself is not a C/C++ project, like set as default in CMake. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for c01de68 - Browse repository at this point
Copy the full SHA c01de68View commit details -
CuraEngine: Appending generator and add Protobuf hack
Also don't like this solution of setting the location of the libraries manually, but CMake can't manage to find the libraries on it's own. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for b41c36c - Browse repository at this point
Copy the full SHA b41c36cView commit details -
Uranium: Only ask for Qt5 on non-Windows OSs
Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for c4d2b22 - Browse repository at this point
Copy the full SHA c4d2b22View commit details
Commits on Oct 26, 2016
-
CuraEngine: Updating workaround for static build
Also added a comment why it is needed. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for b1321af - Browse repository at this point
Copy the full SHA b1321afView commit details
Commits on Oct 27, 2016
-
Batch: Updating env* scripts for Python 3.5
Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for 5dd810c - Browse repository at this point
Copy the full SHA 5dd810cView commit details -
NSIS: Merging FileAssociation from diverged master
Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for b13c568 - Browse repository at this point
Copy the full SHA b13c568View commit details -
README.md: Updating list of Windows dependencies
Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for c5d0005 - Browse repository at this point
Copy the full SHA c5d0005View commit details -
Merge branch 'master-environment_split-windows-support' of https://gi…
…thub.com/thopiekar/cura-build into master-environment_split-windows-support
Configuration menu - View commit details
-
Copy full SHA for 022508b - Browse repository at this point
Copy the full SHA 022508bView commit details -
CMake: Making sure CMAKE_PREFIX_PATH is absolute
Moreover it makes sure that the usage of "\" and "/" in the given path is correct. Without you'll run into this problem during building an NSIS installer on Windows: Running cx_Freeze File "setup.py", line 29 search_path.insert(2, "C:\Users\thopi\Documents\GitHub\cura-build-environment\build\env/lib/python3.5/site-packages/") ^ SyntaxError: (unicode error) 'unicodeescape' codec can't decode bytes in position 2-3: truncated \UXXXXXXXX escape CMakeFiles\build_bundle.dir\build.make:56: recipe for target 'build_bundle' failed mingw32-make[2]: *** [build_bundle] Error 1 CMakeFiles\Makefile2:407: recipe for target 'CMakeFiles/build_bundle.dir/all' failed mingw32-make[1]: *** [CMakeFiles/build_bundle.dir/all] Error 2 makefile:137: recipe for target 'all' failed mingw32-make: *** [all] Error 2 Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for ecc99cc - Browse repository at this point
Copy the full SHA ecc99ccView commit details -
Windows: Updating setup_win32.py.in script
Is partial based on the script for OSX. Also had to add little changes for PyQt5, as it is preinstalled on Windows and not built by cura-build-environment. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for 10f416b - Browse repository at this point
Copy the full SHA 10f416bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0b96ed4 - Browse repository at this point
Copy the full SHA 0b96ed4View commit details -
gitignore: Remove ignoring deb files
We don't build deb's anymore..
Configuration menu - View commit details
-
Copy full SHA for 2f2862a - Browse repository at this point
Copy the full SHA 2f2862aView commit details -
packaging: Adding initial script for Windows
Can't say anything special here. The difference between this and the "old" cura-build is that we are calling now a python script, which is now using cx_Freeze. The results are then moved like before from Py2Exe to NSIS and then the installer is built (triggered by CPack). Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for e777e2e - Browse repository at this point
Copy the full SHA e777e2eView commit details -
signing: Adding initial script for Windows
A very well known signing tool comes from Microsoft itself. Following their manual and some examples gives on the internet I made this script. (See https://msdn.microsoft.com/de-de/library/8s9b9yaz(v=vs.110).aspx) To make signing work, you'll needed here a pfx file. The script will check whether it exists and if there is no file, it will warn about this and skip signing. There is also a way to pass the password for signtool.exe by setting WINDOWS_IDENTITIY_PFX_PASSWORD. But the user will be warned about the usage of this for security reasons. Contributes to 2150
Configuration menu - View commit details
-
Copy full SHA for abdb75b - Browse repository at this point
Copy the full SHA abdb75bView commit details -
Configuration menu - View commit details
-
Copy full SHA for b74c602 - Browse repository at this point
Copy the full SHA b74c602View commit details -
Adding old ExtraRepository.cmake script
Useful when it is needed to add private sources into the build.
Configuration menu - View commit details
-
Copy full SHA for 33372d8 - Browse repository at this point
Copy the full SHA 33372d8View commit details
Commits on Nov 1, 2016
-
signing: Windows: Fixes on signtool.exe usage
Now finally signs Cura.exe, CuraEngine.exe and the installer. As we can't make the sign command depend on the "package" target as it is an built-in command, you'll need to execute "sign_installer" here. Contributes to CURA-2150 Contributes to CURA-2473
Configuration menu - View commit details
-
Copy full SHA for 08788ed - Browse repository at this point
Copy the full SHA 08788edView commit details -
Merge branch 'master-environment_split-windows-support' of https://gi…
…thub.com/thopiekar/cura-build into master-environment_split-windows-support
Configuration menu - View commit details
-
Copy full SHA for f8174e2 - Browse repository at this point
Copy the full SHA f8174e2View commit details
Commits on Nov 11, 2016
-
README: Remove dependency on Protobuf's python binding
We only need the protobuf compiler to generate our Arcus binding. No need for the protobuf Python module. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for f34d553 - Browse repository at this point
Copy the full SHA f34d553View commit details -
Configuration menu - View commit details
-
Copy full SHA for 292f18b - Browse repository at this point
Copy the full SHA 292f18bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 464603e - Browse repository at this point
Copy the full SHA 464603eView commit details -
NSIS: Sorting file association by alphabet
Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for 4f50035 - Browse repository at this point
Copy the full SHA 4f50035View commit details -
Windows: setup.py.in: Remove superfluous lines
In Py2Exe we had to care about adding additional libraries for NumPy. Now cx_Freeze does this job for us. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for d2a8d3c - Browse repository at this point
Copy the full SHA d2a8d3cView commit details -
Packaging: Windows: Depend on projects
Discussion: #89 (comment) Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for 71ed5b3 - Browse repository at this point
Copy the full SHA 71ed5b3View commit details -
Windows: Moving NSIS instructions to packaging
This was mixed up before. Variables related to NSIS packaging were at signing before. Now everything related to NSIS is in packaging/windows.cmake. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for dc02432 - Browse repository at this point
Copy the full SHA dc02432View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d2a18b - Browse repository at this point
Copy the full SHA 2d2a18bView commit details -
Configuration menu - View commit details
-
Copy full SHA for f76f5df - Browse repository at this point
Copy the full SHA f76f5dfView commit details -
Windows: Renaming sign_installer to signing_installer
Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for f657c12 - Browse repository at this point
Copy the full SHA f657c12View commit details -
Windows: Using CPACK_SYSTEM_NAME
Added a TODO to check whether CPACK_SYSTEM_NAME is "win64", like expected. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for f57fd4a - Browse repository at this point
Copy the full SHA f57fd4aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4ddccc4 - Browse repository at this point
Copy the full SHA 4ddccc4View commit details
Commits on Nov 15, 2016
-
NSIS: Removing orphaned variable
A change that I forget to remove, while experimenting on getting a rid of ${CMAKE_BINARY_DIR}/_CPack_Packages/${CPACK_SYSTEM_NAME}/NSIS Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for c9a01fb - Browse repository at this point
Copy the full SHA c9a01fbView commit details
Commits on Nov 16, 2016
-
Revert "Windows: setup.py.in: Remove superfluous lines"
These lines are necessary to get a working Cura installation! This reverts commit d2a8d3c.
Configuration menu - View commit details
-
Copy full SHA for 6b63253 - Browse repository at this point
Copy the full SHA 6b63253View commit details -
Windows: Correctly install plugins directory
At the moment the plugins directory of cura and uranium are moved into a new plugins directory. So finally are plugins are installed at {INSTALL_DIR}/plugins/plugins This change moves all plugins back to {INSTALL_DIR}/plugins. Contributes to CURA-2150
Configuration menu - View commit details
-
Copy full SHA for 57346fa - Browse repository at this point
Copy the full SHA 57346faView commit details
Commits on Nov 29, 2016
-
Remove numpy-stl from Linux build
Seems it is rather broken at the moment
Configuration menu - View commit details
-
Copy full SHA for 6c3c305 - Browse repository at this point
Copy the full SHA 6c3c305View commit details
Commits on Nov 30, 2016
-
Remove "fonts" dir from installed files
Since apparently it is no longer installed by Qt.
Configuration menu - View commit details
-
Copy full SHA for 5ca3316 - Browse repository at this point
Copy the full SHA 5ca3316View commit details -
Make sure to call cx_Freeze with LD_LIBRARY_PATH set
Otherwise it won't be able to find certain libraries
Configuration menu - View commit details
-
Copy full SHA for 7c4eb0f - Browse repository at this point
Copy the full SHA 7c4eb0fView commit details -
Revert "Remove numpy-stl from Linux build"
This reverts commit 6c3c305. Apperently, it was just missing some libraries somewhere. With the other changes included things work properly again.
Configuration menu - View commit details
-
Copy full SHA for 8483f9d - Browse repository at this point
Copy the full SHA 8483f9dView commit details -
Apparently the test files I have here that I thought were ascii STL were not really ascii STL. It still crashes with ascii STL so I disabled numpy-stl again. Fixes CURA-2974
Configuration menu - View commit details
-
Copy full SHA for d5c038d - Browse repository at this point
Copy the full SHA d5c038dView commit details
Commits on Dec 15, 2016
-
Remove UM3 Network Printing project file since it has been merged
Contributes to CURA-2947
Configuration menu - View commit details
-
Copy full SHA for 5a6ce23 - Browse repository at this point
Copy the full SHA 5a6ce23View commit details
Commits on Feb 13, 2017
-
Add an option to enable Cura's debug mode
It was added at the end of 2.4 but we did not expose it so far Contributes to CURA-2787
1Configuration menu - View commit details
-
Copy full SHA for 79ac548 - Browse repository at this point
Copy the full SHA 79ac548View commit details
Commits on Feb 16, 2017
-
Add missing QOpenGLFunction_4_1_Core to build
Since we now want OpenGL 4.1 for the new layer view
Configuration menu - View commit details
-
Copy full SHA for d5270b6 - Browse repository at this point
Copy the full SHA d5270b6View commit details -
Merge pull request #89 from thopiekar/master-environment_split-window…
…s-support CURA-2150: Initial Windows support
Configuration menu - View commit details
-
Copy full SHA for a7a4893 - Browse repository at this point
Copy the full SHA a7a4893View commit details