summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | appveyor: updated libgc and gtest now liveEduard Braun2017-06-201-9/+1
| | | | | | | | |
* | | | | | | | | Improve AppVeyor configurationEduard Braun2017-06-162-17/+58
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - speed up build by skipping full system upgrade - build all branches (as long as they have an appveyor.yml) - actually fail if there are errors during build - run some basic tests on inkscape.exe - prepare actual tests (disabled for now as they deadlock sometimes)
| * | | | | | | | Disable tests - they still deadlock sporadically :-(Eduard Braun2017-06-161-1/+1
| | | | | | | | |
| * | | | | | | | Enable testsEduard Braun2017-06-161-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (won't fail yet If tests do not complete sucessfully because of frequent SEGFAULTs on exit whose source has yet to be determined)
| * | | | | | | | Install updated versions of libgc ↵Eduard Braun2017-06-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (https://github.com/Alexpux/MINGW-packages/pull/2597) and gtest (https://github.com/Alexpux/MINGW-packages/pull/2588) - libgc 7.6.0 solves a deadlocking issue that prevented tests to ever complete (it might also be related to https://bugs.launchpad.net/inkscape/+bug/1659172 and https://bugs.launchpad.net/inkscape/+bug/1655619) - gtest 1.8.0 includes gmock making it unnecessary to download and build separately
| * | | | | | | | disable unused build stageEduard Braun2017-06-161-0/+2
| | | | | | | | |
| * | | | | | | | output some status messagesEduard Braun2017-06-161-12/+31
| | | | | | | | |
| * | | | | | | | suppress noise from install targetEduard Braun2017-06-161-1/+5
| | | | | | | | |
| * | | | | | | | actually fail if there is an errorEduard Braun2017-06-161-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (this is necessary as we're running an additional bash inside the CI environment and are never generating any exit codes on the actual console)
| * | | | | | | | Build all branches by default (no reason not to and doesn't hurt as long as ↵Eduard Braun2017-06-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the UI setting to "Skip branches without appveyor.yml" is enabled)
| * | | | | | | | Skip full system upgradeEduard Braun2017-06-161-2/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Speeds up the build by a few minutes. most packages are not needed anyway, and those that are should be updated by msys2installdeps.sh
* | | | | | | | Make tests buildable on windows and account for newer gtest 1.8.0 (which ↵Eduard Braun2017-06-162-41/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already includes gmock) While tests pass in principle some assertion errors are thrown and tests often SEGFAULT on exit (I suspect an issue with libgc)
| * | | | | | | | Set path to /share folder when running tests (see ↵Eduard Braun2017-06-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cf0d896e314d46767ec2c0f7e2734473f523490)
| * | | | | | | | cmake: allow building with gtest 1.8.0 (already includes gmock)Eduard Braun2017-06-162-23/+24
| | | | | | | | |
| * | | | | | | | Use CMAKE_RUNTIME_OUTPUT_DIRECTORY instead of the old EXECUTABLE_OUTPUT_PATH ↵Eduard Braun2017-06-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (notably this includes shared libraries on Windows which should end up together with the executables) Also use CMAKE_LIBRARY_OUTPUT_DIRECTORY instead of the old LIBRARY_OUTPUT_PATH
| * | | | | | | | Fix compilation on Windows by removing duplicate dependenciesEduard Braun2017-06-151-14/+1
|/ / / / / / / /
* | | | | | | | Refactor 1a66c0aae0da7c3b860d06e72f5ff87f444bc462 and allow to use a ↵Eduard Braun2017-06-154-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different data directory by setting the environment variable INKSCAPE_DATADIR at runtime
* | | | | | | | cleanupEduard Braun2017-06-151-5/+0
| | | | | | | |
* | | | | | | | Improve Windows relocation support.Eduard Braun2017-06-152-59/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a lot of unused / overly compicated path manipulation functions and replace them with a solution that also handles the case where inkscape.exe is located in a /bin subdirectory.
* | | | | | | | Remove cmake checks for unused libraries.Elliott Sales de Andrade2017-06-151-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neither gthread nor FreeType appear to be used for anything.
* | | | | | | | Drop x11 dependency.Elliott Sales de Andrade2017-06-152-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS, it's added if GTK+ 2 uses the x11 backends, which seems a bit silly since Inkscape is using GTK+ 3. Linux also doesn't appear to require x11 linkage, especially if using Wayland as a backend.
* | | | | | | | Remove unused #cmakedefine's.Elliott Sales de Andrade2017-06-151-73/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are neither read nor set by anything (i.e., always commented out in the final config.h). They are probably mostly leftovers from the Autotools build.
* | | | | | | | Remove cmake checks for unused sys/ headers.Elliott Sales de Andrade2017-06-152-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing tests these macros nor includes these files, so I don't think there's any useful side-effect for checking that they exist.
* | | | | | | | Remove cmake checks for C89 headers.Elliott Sales de Andrade2017-06-154-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are roughly equivalent to autoconf's AC_HEADER_STDC and even they say that macro is obsolescent. strings.h is not really a C89 header, but it defined some things that are no longer needed [1]. And no file actually #includes it. [1] https://stackoverflow.com/a/4291328
* | | | | | | | Remove duplicated build checks.Elliott Sales de Andrade2017-06-156-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these #defines are not even checked anyway, though they could have the side-effect of failing configure before the build started. However, these checks are redundant due to other checks for the same thing: * concept_check.hpp was added to Boost in 1.19.0, released in 2000. I sincerely doubt anyone is using that version right now, but I added a minimum version to the find_package() call. In any case, no code actually checked the #define, so it wouldn't have built without it anyway. * FindBoehmGC puts gc.h on the compiler search path, so there's no need to try gc/gc.h also. * libintl.h is found by FindIntl. * unordered_set is part of the C++11 standard. * zlib.h is found by find_package(ZLIB).
* | | | | | | | Remove checks for unused functions.Elliott Sales de Andrade2017-06-152-8/+0
| | | | | | | |
* | | | | | | | Remove outdated checks for GTK+ functions.Elliott Sales de Andrade2017-06-152-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gtk_window_fullscreen was added in 2.2 and gtk_window_set_default_icon_from_file is not even used.
* | | | | | | | Merge branch 'master' into docker-ciTed Gould2017-06-153-294/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove bzrignore and update gitignoreMartin Owens2017-06-152-294/+6
| | | | | | | | |
| * | | | | | | | Ammend Running Without Installing to seperate confMartin Owens2017-06-151-2/+6
| | | | | | | | |
| * | | | | | | | Update docs with 'Running Without Installing' instructionsMartin Owens2017-06-151-0/+19
| |/ / / / / / /
* | | | | | | | Switching to the official Inkscape repoTed Gould2017-06-151-1/+4
| | | | | | | |
* | | | | | | | Switching to the Gitlab registryTed Gould2017-06-151-1/+1
| | | | | | | |
* | | | | | | | Switch to a docker base with the deps in itTed Gould2017-06-141-8/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' of gitlab.com:marcjeanmougin/inkscapeMarc Jeanmougin2017-06-141-0/+32
|\ \ \ \ \ \ \
| * | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-141-1/+1
| | | | | | | |
| * | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-141-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:marcjeanmougin/inkscapeMarc Jeanmougin2017-06-131-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-131-0/+1
| | | | | | | | |
| * | | | | | | | Merge gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-133-10/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-131-1/+8
| | | | | | | | |
| * | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-131-1/+1
| | | | | | | | |
| * | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-111-1/+1
| | | | | | | | |
| * | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-111-2/+2
| | | | | | | | |
| * | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-111-5/+5
| | | | | | | | |
| * | | | | | | | Merge gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-1113-768/+976
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update .gitlab-ci.yml
| * | | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-101-2/+12
| | | | | | | | | |
| * | | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Update .gitlab-ci.ymlMarc Jeanmougin2017-06-101-1/+1
| | | | | | | | | |