summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Delete inkscape.spec.inBryce Harrington2017-07-221-119/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an old RPM build file I made way way back. I'm sure Fedora has something better, and besides this is _completely_ out of date.
* | | | | | | | | | | | | | Move Doxyfile into buildtools/ subdirBryce Harrington2017-07-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doxygen lets you pass the config file name on the command line, so it's not necessary that this live in the root directory. We do not host the doxygen output on the project website, and I'm not aware that many developers utilize this for their own reference. However, I've verified the config file still works, so no reason to get rid of it.
* | | | | | | | | | | | | | Drop old autotools leftover scriptsBryce Harrington2017-07-223-342/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think these may be obsolete. They've been in the codebase forever, but I don't know what they are used for anymore. I'm guessing they're autotools leftovers.
* | | | | | | | | | | | | | cmake: drop option USES_TERMINAL from 'dist' targetEduard Braun2017-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it was introduced in 4a543072019e0bd4a0fcaaa3c2cef718e045edc6 but requires at least cmake 3.2 therefore breaking compatibility
* | | | | | | | | | | | | | wix: Update for cmake / MSYS2 buildEduard Braun2017-07-223-28/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 16cb9a13a88db072389f5f4ba0d6a7997cee0123)
* | | | | | | | | | | | | | NSIS: update for MSYS2 buildsEduard Braun2017-07-221-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 68642e81c9df0c913a0e976bcbe40b2e2e2385f9)
* | | | | | | | | | | | | | NSIS: Distribution directory can already be set on command lineEduard Braun2017-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'makensis /DINKSCAPE_DIST_DIR=..\..\build\inkscape inkscape.nsi'. (cherry picked from commit 3534f9a0013a155a1d31e837e12e73eb8678dbb0)
* | | | | | | | | | | | | | NSIS: Allow to set output filenanme on command lineEduard Braun2017-07-221-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'makensis /DOutPath=C:\full\path\output.exe inkscape.nsi'. (cherry picked from commit 3b5261b9a77db009a279918356e8f71bcd7fe640)
* | | | | | | | | | | | | | NSIS: update for git and cmakeEduard Braun2017-07-222-145/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - parse INKSCAPE_VERSION from values define in CMakeLists.txt - remove all revision strings - we typically do not build installers for development versions, so version numbers should be unique (cherry picked from commit be6e18bfb1c0b9dade32f3c1aa298f39d6313ab8)
* | | | | | | | | | | | | | Use menus.xml for menus, load a basic File>Quit menu as backup.Martin Owens2017-07-212-312/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | root dir tidying: Remove old .pod filesEduard Braun2017-07-209-4449/+7
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were used for the autotools build and now have their cmake equivalent in man/ Also add a note that .pod files should *not* be updated directly in the Inkscape repo but in inkscape-docs instead: http://bazaar.launchpad.net/~inkscape.dev/inkscape-docs/trunk/files/head:/man/
* | | | | | | | | | | | | cmake: update uninstall targetEduard Braun2017-07-203-31/+33
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - update cmake_uninstall.cmake.in from https://cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F and move the file to /CMakeScripts - on WIN32 simply delete the whole distribution directory (should be sufficient ant the script version is unbearably slow)
* | | | | | | | | | | | cmake: cleanup man page generationEduard Braun2017-07-204-34/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move code from main CMakeLists.txt to separate cmake file in /man - root dir tidying: move fix-roff-punct
* | | | | | | | | | | | CI/GitLab: Speed up build by limiting clone depthEduard Braun2017-07-201-0/+3
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Adjust the tooltip strings of the objects center pointAntonio Ospite2017-07-201-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Show a control point for the center of a rectangleAntonio Ospite2017-07-201-0/+39
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other shapes like ellipses and stars now show a center point but the user still cannot easily control the position of a rectangle by using its center. Show a control point for the center so it's easier to move the shape around and snap it by its center.
* | | | | | | | | | CI/AppVeyor: try something new with ccacheEduard Braun2017-07-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently re-using the same cache folder for both 0.92 and master results in a lot of cache misses whenever switching branches.
* | | | | | | | | | Remove unnecessary cast which creates a temporary object that then goes out ↵Tavmjong Bah2017-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of scope.
* | | | | | | | | | Minor code cleanup after baeb92c8b275ada9a09187772e11f8b32b7ae6efEduard Braun2017-07-191-11/+1
| | | | | | | | | |
* | | | | | | | | | Shortcuts: Fix "Tab" vs. "Shift + Tab"Eduard Braun2017-07-181-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes introduced in 46fd67ec49c3988db20db422061a2f52582c896c changed the behavior in this case: - pressing Tab produces a keyval with name "Tab" - pressing Shift+Tab produces a keyval with name "ISO_Left_Tab" the Shift modifier is removed in this case as a "consumed modifier", see commit mentioned above for details
* | | | | | | | | | Update msys2installdeps.shEduard Braun2017-07-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bzr -> git - drop dependencies of 0.92.x branch since it has its own msys2installdeps.sh now
* | | | | | | | | | CI/AppVeyor: tweak ccache settingsEduard Braun2017-07-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently use the same cache for master and 0.92.x branches so increase the cache size a bit. (the maximum is 1 GB and we now have 2 x 300 MB for 32-bit/64-bit) Also set options to ignore creation time and modification time of include files as they are very likely to be different between builds (sloppiness=include_file_ctime,include_file_mtime) ToDo: Figure out if it's worth splitting the cache. Unfortunately I don't know of a good way to tell if a branch is based on 0.92.x or if it's build based on master. See also https://github.com/appveyor/ci/issues/1623 which might allow for some better control in future.
* | | | | | | | | | root dir tidying: MSYS2 & AppVeyor CIEduard Braun2017-07-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move build scripts and related tools to buildtools folder - rename appveyor.yml -> .appveyor.yml
* | | | | | | | | | Cleanup: eliminate version from config.hEduard Braun2017-07-177-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea behind inkscape-version.h / inkscape-version.cpp is to avoid rebuilding most of the code base when the version number changes. Defining a version number in config.h defeats this purpose.
* | | | | | | | | | Cleanup: eliminate require-config.hEduard Braun2017-07-174-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's widely unused and seems harly necessary.
* | | | | | | | | | Update InkscapePortable.ini to use \share\locale instead of \locale for ↵Gord Caswell2017-07-171-72/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language handling.
* | | | | | | | | | cmake: autogenerate Windows .rc files for inkscape and inkviewEduard Braun2017-07-1710-161/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - inkscape.rc/inkview.rc are automatically configured with the correct program name, version number and copyright year - use one common file for all four configurations (inkscape/inkview, x86/x64) which should make it much easier to maintain and keep in sync - fix/update/add some fields in the resource file, see https://msdn.microsoft.com/library/windows/desktop/aa381058.aspx - also unify inkscape-manifest.xml As a result all configurations will use dpiAware=True now (x86 and inkview did not have that setting yet) This does not matter in gtk3 but is known know to cause tiny icons on gtk2. It's still the preferred option as everything else (including canvas) is properly scaled; if bitmap interpolation is more desirable instead the setting can be overriden in the compatibility tab of the executables properties dialog
* | | | | | | | | | cmake: fix 'dist' target to actually include INKSCAPE_REVISIONEduard Braun2017-07-162-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (re-use inkscape-version.cpp in order not to duplicate code)
* | | | | | | | | | root dir tidying: cleanup inkscape iconsEduard Braun2017-07-1610-72/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move inkscape.ico -> share/branding (it's an icon but it should not end up in an icon theme in share/icons, so this seemed like a better choice) and update depentans (.rc files and NSIS installer) - remove inkscape.png as it was only used by Doxyfile and is mostly redundant to the files in share/icons/application (todo: maybe re-create those files and include a 64x64 size) - use inkscape.svg in Doxyfile (confirmed working). It's a bit too large but looks much nicer than any of the smaller icons in share/icons/application (the recommended maximum size is 55 px height which looks ugly though and is obviously too small, the optimum seems to be somewhere around 70 px) - also remove one of the two flat icons in share/branding which were duplicates (the smaller file was kept but renamed)
* | | | | | | | | | root dir tidying: move mingwenv.cmake -> CMakeScripts/ConfigEnvMinGW.cmakeEduard Braun2017-07-152-189/+189
| | | | | | | | | |
* | | | | | | | | | cmake: fix package name 'gtest' -> 'GTest'Eduard Braun2017-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (lookup of FidGTest.cmake is apparently case sensitive)
* | | | | | | | | | CMake: fix wrong variable added in c666dd26su-v2017-07-151-1/+1
| | | | | | | | | |
* | | | | | | | | | Revert "Drop btool .rc files"Eduard Braun2017-07-144-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a32a763a36548f63b6c0d758cb8a82de60e11f18.
* | | | | | | | | | Drop btool .rc filesBryce Harrington2017-07-144-118/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The btool build system is no longer present in inkscape's source tree.
* | | | | | | | | | CI/GitLab: Compile tests in build stage so they only need to be executed in ↵Eduard Braun2017-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test stage
* | | | | | | | | | cmake: Add build target 'tests' which builds all tests (but does not execute ↵Eduard Braun2017-07-142-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them) - the recommended 'check' target depends on 'tests' (so "make check" will automatically build and run tests) - the pre-defined 'test' target does not automatically build tests, so make sure to run "make tests" before running "make test" (if you want to use it)
* | | | | | | | | | cmake: fix targets to actually depend on inkscape-version.cppEduard Braun2017-07-142-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (targets depended only on inkscape-version.cmake to be run but not on the created file itself resulting in changes only being picked up on the second build)
* | | | | | | | | | cmake: do not build tests for default targetEduard Braun2017-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this speeds up incremental builds (i.e. when debugging) as tests do not have to be linked each time
* | | | | | | | | | README: Fix misspellingBryce Harrington2017-07-141-1/+1
| | | | | | | | | |
* | | | | | | | | | Drop jenkinsBryce Harrington2017-07-142-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jenkins is no longer used. Also, the jenkins config is set up to use autotools which is no longer in the codebase.
* | | | | | | | | | CI/AppVeyor: Add branch name, commit date/hash and build architecture to ↵Eduard Braun2017-07-132-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | artifact names
* | | | | | | | | | CI: Save AppVeyor cache if the compilation succeeds (even if installation or ↵Eduard Braun2017-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests might fail). This should speed up builds in scenarios where e.g. an MSYS2 update broke the installation while the build itself still works.
* | | | | | | | | | use SYSTEMROOT in msys2checkdeps.py as location of the Windows directory in ↵Eduard Braun2017-07-131-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attempt to fix AppVeyor
* | | | | | | | | | CI: run check for missing/unused dependecies in AppVeyorEduard Braun2017-07-131-2/+3
| | | | | | | | | |
* | | | | | | | | | Add functionality to msys2checkdeps.py to check for libraries which were ↵Eduard Braun2017-07-132-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed but are unused (should detect if globs added to the list from 170049663979e3531d247f4228b94fe1ccd2568f that are too lenient)
* | | | | | | | | | cmake/MSYS2: Try to make the installation a bit more lenient towards version ↵Eduard Braun2017-07-131-106/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numbers in library names. This should be more future-proof against package updates but also allows to build with slightly outdated libraries.
* | | | | | | | | | cmake/MSYS2: update with missing libs detected with script from previous commitEduard Braun2017-07-131-10/+15
| | | | | | | | | |
* | | | | | | | | | MSYS2: Add python script to generate a list of dependencies / check for ↵Eduard Braun2017-07-131-0/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing dependencies of the installed distribution
* | | | | | | | | | Update ege-color-prof-tracker.cppMarc Jeanmougin2017-07-131-1/+1
| | | | | | | | | |
* | | | | | | | | | Fix src/ege-color-prof-tracker.cpp after ↵Marc Jeanmougin2017-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27cadae623ce5bc66b0401238bc7737b7b9d37d5 due to the modified signal having one less argument (thanks houz for the fix)