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

Commits on Jul 13, 2016

  1. Configuration menu
    Copy the full SHA
    bb88701 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. Configuration menu
    Copy the full SHA
    4623966 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d73e5d View commit details
    Browse the repository at this point in the history
  3. Refactor python module find files to use a common function

    This way we can much more easily add find files for other modules
    awhiemstra committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    9dace7e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    180bb68 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    07527e8 View commit details
    Browse the repository at this point in the history
  6. 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.
    awhiemstra committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    aa58e69 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    ee89d34 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    06b5987 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7ecfce5 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2016

  1. Configuration menu
    Copy the full SHA
    6666a74 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ceef674 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0dbdf64 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7df432c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    beba423 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6fa51a5 View commit details
    Browse the repository at this point in the history
  7. Fix setting Cura version

    awhiemstra committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    49f3d53 View commit details
    Browse the repository at this point in the history
  8. Require cx_Freeze 5.0

    Since 4.3 dumps all library files into the root dir
    awhiemstra committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    4109e99 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d1ad449 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    373ffb7 View commit details
    Browse the repository at this point in the history
  11. Use cx_freeze's library detection to detect and include dependencies

    This way we do not need to manually copy all those libraries
    awhiemstra committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    beafda4 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. Remove obsolete files

    awhiemstra committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    9443ba7 View commit details
    Browse the repository at this point in the history
  2. Implement a simple version of FindAppImageKit.cmake

    Since we do not really need the complicated macro
    awhiemstra committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    798ace4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    55c818f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b4f6f3e View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2016

  1. Initialize BUILD_* to OFF

    awhiemstra committed Jul 25, 2016
    Configuration menu
    Copy the full SHA
    a049be6 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. Configuration menu
    Copy the full SHA
    acf2c6e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    755b6ff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5e677b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2016

  1. Configuration menu
    Copy the full SHA
    a0a6e62 View commit details
    Browse the repository at this point in the history
  2. Remove commented code

    awhiemstra committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    e4ddc7f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f3cb21c View commit details
    Browse the repository at this point in the history
  4. Create a .dmg in the signing step

    We need to sign all executables in the bundle before packaging. This allows us to do that.
    awhiemstra committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    b1b52ed View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Configuration menu
    Copy the full SHA
    057df46 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2016

  1. escape char in CMakeLists.txt

    jackha committed Aug 22, 2016
    Configuration menu
    Copy the full SHA
    13ffa3d View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2016

  1. Code style: Whitespace around binary operators

    Contributes to issue CURA-879.
    Ghostkeeper committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    71602f2 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2016

  1. Use CMAKE_PREFIX_PATH to determine locations from the build environment

    This fixes dependency lookups in built projects
    awhiemstra committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    3438663 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0ffac17 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2016

  1. Configuration menu
    Copy the full SHA
    225ded7 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2016

  1. Configuration menu
    Copy the full SHA
    e50325d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3cfabdd View commit details
    Browse the repository at this point in the history
  3. Add functionality to include project files from a separate directory.

    This replaces EXTRA_REPOSITORIES from the original cura-build.
    awhiemstra committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    941f3dc View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2016

  1. Add missing modules to OSX setup file

    Since they are needed for plugins but cx_freeze does not find them.
    
    Contributes to CURA-879
    awhiemstra committed Sep 22, 2016
    Configuration menu
    Copy the full SHA
    7a5c6af View commit details
    Browse the repository at this point in the history
  2. Add "packaging" module that some other module is complaining about

    Contributes to CURA-879
    awhiemstra committed Sep 22, 2016
    Configuration menu
    Copy the full SHA
    a5c4c5d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bd41f31 View commit details
    Browse the repository at this point in the history
  4. 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
    awhiemstra committed Sep 22, 2016
    Configuration menu
    Copy the full SHA
    36e2005 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2016

  1. Add fdm_materials as an extra project

    Contributes to CURA-2136
    awhiemstra committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    9745b34 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c54671f View commit details
    Browse the repository at this point in the history
  3. Force master for fdm_materials for now

    Since we have no other branches
    awhiemstra committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    39b0d12 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2016

  1. Fix copy command for Linux desktop file/icon

    Since cmake -E copy does not actually take multiple arguments
    awhiemstra committed Oct 17, 2016
    Configuration menu
    Copy the full SHA
    3da4bd2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    551a7d4 View commit details
    Browse the repository at this point in the history
  3. Add missing commas

    awhiemstra committed Oct 17, 2016
    Configuration menu
    Copy the full SHA
    357e8aa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f0bb01a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d12fa8e View commit details
    Browse the repository at this point in the history
  6. Add missing comma

    awhiemstra committed Oct 17, 2016
    Configuration menu
    Copy the full SHA
    f1db025 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d0ccef3 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2016

  1. Add missing numpy-stl package

    Since it is used by a plugin cx_Freeze does not find it
    awhiemstra committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    cb5adc7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    062cdc7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d26bcdc View commit details
    Browse the repository at this point in the history
  4. Remove libcrypto.so.10 from the excluded libraries

    Since it is called differently on other platforms
    awhiemstra committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    4bbf6d7 View commit details
    Browse the repository at this point in the history
  5. Add two more libraries to the list of excluded libraries on Linux

    Since they prevent SliceInfo from working properly
    awhiemstra committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    fad9d5d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2016

  1. Add QT_XKB_CONFIG_ROOT export to the start script

    Otherwise keyboard input does not seem to work
    awhiemstra committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    3994fb1 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. 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
    thopiekar committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    c01de68 View commit details
    Browse the repository at this point in the history
  2. 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
    thopiekar committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    b41c36c View commit details
    Browse the repository at this point in the history
  3. Uranium: Only ask for Qt5 on non-Windows OSs

    Contributes to CURA-2150
    thopiekar committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    c4d2b22 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2016

  1. CuraEngine: Updating workaround for static build

    Also added a comment why it is needed.
    
    Contributes to CURA-2150
    thopiekar committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    b1321af View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2016

  1. Batch: Updating env* scripts for Python 3.5

    Contributes to CURA-2150
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    5dd810c View commit details
    Browse the repository at this point in the history
  2. NSIS: Merging FileAssociation from diverged master

    Contributes to CURA-2150
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    b13c568 View commit details
    Browse the repository at this point in the history
  3. README.md: Updating list of Windows dependencies

    Contributes to CURA-2150
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    c5d0005 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master-environment_split-windows-support' of https://gi…

    …thub.com/thopiekar/cura-build into master-environment_split-windows-support
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    022508b View commit details
    Browse the repository at this point in the history
  5. 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
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    ecc99cc View commit details
    Browse the repository at this point in the history
  6. 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
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    10f416b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0b96ed4 View commit details
    Browse the repository at this point in the history
  8. gitignore: Remove ignoring deb files

    We don't build deb's anymore..
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    2f2862a View commit details
    Browse the repository at this point in the history
  9. 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
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    e777e2e View commit details
    Browse the repository at this point in the history
  10. 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
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    abdb75b View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b74c602 View commit details
    Browse the repository at this point in the history
  12. Adding old ExtraRepository.cmake script

    Useful when it is needed to add private sources into the build.
    thopiekar committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    33372d8 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2016

  1. 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
    thopiekar committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    08788ed View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master-environment_split-windows-support' of https://gi…

    …thub.com/thopiekar/cura-build into master-environment_split-windows-support
    thopiekar committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    f8174e2 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2016

  1. 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
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    f34d553 View commit details
    Browse the repository at this point in the history
  2. Windows: Making unsigned builds non-fatal

    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    292f18b View commit details
    Browse the repository at this point in the history
  3. NSIS: Adding X3D association

    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    464603e View commit details
    Browse the repository at this point in the history
  4. NSIS: Sorting file association by alphabet

    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    4f50035 View commit details
    Browse the repository at this point in the history
  5. 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
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    d2a8d3c View commit details
    Browse the repository at this point in the history
  6. Packaging: Windows: Depend on projects

    Discussion:
    #89 (comment)
    
    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    71ed5b3 View commit details
    Browse the repository at this point in the history
  7. 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
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    dc02432 View commit details
    Browse the repository at this point in the history
  8. Windows: Adding additional notes

    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    2d2a18b View commit details
    Browse the repository at this point in the history
  9. Windows: Adding FindSigntool and using it

    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    f76f5df View commit details
    Browse the repository at this point in the history
  10. Windows: Renaming sign_installer to signing_installer

    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    f657c12 View commit details
    Browse the repository at this point in the history
  11. Windows: Using CPACK_SYSTEM_NAME

    Added a TODO to check whether CPACK_SYSTEM_NAME is "win64", like
    expected.
    
    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    f57fd4a View commit details
    Browse the repository at this point in the history
  12. Windows: Correcting typo

    Contributes to CURA-2150
    thopiekar committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    4ddccc4 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2016

  1. 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
    thopiekar committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    c9a01fb View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Revert "Windows: setup.py.in: Remove superfluous lines"

    These lines are necessary to get a working Cura installation!
    
    This reverts commit d2a8d3c.
    thopiekar committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    6b63253 View commit details
    Browse the repository at this point in the history
  2. 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
    thopiekar committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    57346fa View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2016

  1. Remove numpy-stl from Linux build

    Seems it is rather broken at the moment
    awhiemstra committed Nov 29, 2016
    Configuration menu
    Copy the full SHA
    6c3c305 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2016

  1. Remove "fonts" dir from installed files

    Since apparently it is no longer installed by Qt.
    awhiemstra committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    5ca3316 View commit details
    Browse the repository at this point in the history
  2. Make sure to call cx_Freeze with LD_LIBRARY_PATH set

    Otherwise it won't be able to find certain libraries
    awhiemstra committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    7c4eb0f View commit details
    Browse the repository at this point in the history
  3. 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.
    awhiemstra committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    8483f9d View commit details
    Browse the repository at this point in the history
  4. Disable numpy-stl again

    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
    awhiemstra committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    d5c038d View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2016

  1. Remove UM3 Network Printing project file since it has been merged

    Contributes to CURA-2947
    awhiemstra committed Dec 15, 2016
    Configuration menu
    Copy the full SHA
    5a6ce23 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2017

  1. 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
    awhiemstra committed Feb 13, 2017
    1 Configuration menu
    Copy the full SHA
    79ac548 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2017

  1. Add missing QOpenGLFunction_4_1_Core to build

    Since we now want OpenGL 4.1 for the new layer view
    awhiemstra committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    d5270b6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #89 from thopiekar/master-environment_split-window…

    …s-support
    
    CURA-2150: Initial Windows support
    awhiemstra committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    a7a4893 View commit details
    Browse the repository at this point in the history