Commit Graph

751 Commits

Author SHA1 Message Date
Kornel Benko
4cfc5bb75d Amend 8774ad5, Adapt to new hunspell C++ ABI for cmake
Replace CHECK_CXX_SOURCE_COMPILES() with TRY_COMPILE()
Discarding the link-stage mimics the behaviour used by automake.
Now the testsource is compiled regardless if hunspell
is external or not.
2018-03-30 14:10:45 +02:00
Kornel Benko
8774ad51c0 Adapt to new hunspell C++ ABI for cmake
The compile test for 3rdparty hunspell is omitted,
because the macro check_cxx_source_compiles() tries also to link.
But at the time of the check, the required library is not there.
2018-03-29 22:53:59 +02:00
Kornel Benko
454f56b5f2 Cmake build: Allow cross-compiling with mingw again
1.) The check for "QT_USES_X11" expects the created application
  to run, but the '.exe' file does not run on linux.
2.) Don't use megered build anymore, it is not faster
  on multi-processor machines anyway
2018-02-10 11:21:08 +01:00
Jean-Marc Lasgouttes
63a4e82874 Add support for enchant 2.x
As of enchant 2.x, it is required to create a Broker instance instead
of relying on a static one provided by the library.

Add autoconf and cmake (courtesy of Kornel) tests that check whether
one can indeed instantiate a Broker object, and act on the result in a
new broker() helper function.

Fixes bug #10986.
2018-01-30 12:11:22 +01:00
Uwe Stöhr
dceb7e393d build5*.bat: update to Qt 5.9.4
- also adjust build5-2015-x64.bat
2018-01-24 01:18:32 +01:00
Kornel Benko
03b6ee9f06 Cmake build: Added handling for lyxrc.dist for Apple and Unix
Also added include path for magic.h, as found out by Joel Kulesza
2018-01-03 15:04:21 +01:00
Uwe Stöhr
95bcff9924 unix2dos.py: make it ready for python 3
fixes bug #10838
2017-12-08 02:08:16 +01:00
Kornel Benko
1844d22221 Cmake build: Don't try to convert non-lyx-files.
Since they are not supposed to contain versioned strings like LYX_DIR_VER,
it is sufficient to copy them instead.
Besides, they also may be non-utf-8 coded, which would also break the conversion.
2017-11-28 19:07:24 +01:00
Uwe Stöhr
bf12cebdc0 Win installer: update to Qt 5.9.3 2017-11-24 00:16:23 +01:00
Kornel Benko
6011d6cdca Cmake build: Install subscript.sty only for WIN32 (using MikTeX) 2017-11-05 17:06:38 +01:00
Kornel Benko
51e32a36d6 cmake documentation handling: sort out encoding problems.
Let srcipt work under Python2 and Python3,
also if the locale is not set to utf8.

Patch from Günter Milde, sort of cherry-pick from 9086db662d
2017-10-29 09:49:39 +01:00
Kornel Benko
65deb30c24 Cmake doc creation: Python is choking on '\\' 2017-10-17 17:12:29 +02:00
Kornel Benko
f3c8884eee Cmake doc creations: Correct indentation 2017-10-17 12:35:57 +02:00
Kornel Benko
a68ef98103 Cmake doc creations: Setting environment PYTHONIOENCODING
This should force the python executable to use the desired encoding.
The command is moved to a wrapper script to be able to set the environment
at make-run-time.
2017-10-17 12:28:36 +02:00
Uwe Stöhr
3835b473c7 ReplaceValues.py: partly revert commit f075f8ad
we need a string output not a byte
2017-10-17 00:23:19 +02:00
Uwe Stöhr
f075f8ad0a ReplaceValues.py: make the file compilable with Python 3
see the mailing list thread "compilation of LyX 2.3 fails with Python 3.6.2" for details
2017-10-16 23:29:57 +02:00
Uwe Stöhr
b7f7c857ad Win installer: update Qt
- Qt 5.6.3 uses a different path name scheme
- one DLL was removed in Qt 5.6.3
2017-10-15 16:50:20 +02:00
Kornel Benko
847c68960a Cmake build: Needed variable for creation of debian package
The variable CPACK_DEBIAN_PACKAGE_RELEASE has to be in the form
of "^[A-Za-z0-9.+~]+$". We will use the abbreviated commit revision for now.
Without this change cmake 3.10 emits error.
2017-10-07 10:47:17 +02:00
Kornel Benko
336f94d12f Cmake build: Don't use temporary doc-files as source for installation 2017-10-05 20:16:52 +02:00
Kornel Benko
c2eb1a1a72 Add suffixed lyxconvert to cmake build.
This should amend f93ec4a, but is not tested on apple
2017-10-02 02:00:47 +02:00
Kornel Benko
854d7e1619 Windows only: A try to compile with LYX_CONSOLE again
The use of the value "FORCE" was wrong anyway, since LYX_CONSOLE
is of type "BOOL".
2017-08-18 12:07:03 +02:00
Jean-Marc Lasgouttes
9fe8190364 Make "devel mode" configurable at run time
Traditionally LyX behaves differently when the directive DEVEL_VERSION
is defined at compile time. This covers
* more detailed description of current position in status bar
* the help files are open in read/write mode
* more detailed debug output in the View Source panel

This patch introduces the new function devel-mode-toggle that allows
to use devel mode in stable releases, and vice versa.

The information is saved in the session file. The default is to
disable devel mode.

Remove all traces of DEVEL_VERSION in autoconf and cmake
2017-07-24 22:00:44 +02:00
Kornel Benko
12a2565b97 Cmake build: Use the same destination for lyx-tex-files as in automake 2017-07-14 11:24:20 +02:00
Kornel Benko
e23e65a973 Cmake build: Install lyx-provided fonts to where GuiFontLoader.cpp expects them 2017-07-10 13:17:29 +02:00
Kornel Benko
acf8df28b3 Sort images file list also for cmake
This is not needed for recent cmake versions, but since we expect
also older cmake version be used, sort the list nevertheless.
See https://reproducible-builds.org/ for why this matters.

Amends b8e3615
2017-06-27 19:18:24 +02:00
Uwe Stöhr
50f0ae9ecd build5-2015.bat: fix a path 2017-05-13 19:19:18 +02:00
Uwe Stöhr
5120c25872 build5-2015.bat: fix build script for current CMake releases
- since CMake 3.5 the path to the cmake.exe is no longer by default written to Windows' PATH variable. Therefore this has to be done in the script.

- Windows path can contain spaces (CMake's default installation folder does) so we must use quotes around the paths

- set the CMAKE_PREFIX_PATH variable
2017-05-10 01:38:48 +02:00
Uwe Stöhr
18bdb38f30 build5-2015.bat: the option LYX_ENABLE_CXX11 is no longer available in CMake
- also use a boolean setting for LYX_CONSOLE, see bug #10658
2017-05-09 22:08:22 +02:00
Kornel Benko
0f798d6675 Cmake build: Allow numbers in lyx-suffix too
That way we can use '-DLYX_SUFFIX_VALUE=123.456'
2017-04-30 17:01:31 +02:00
Uwe Stöhr
d318a8a6f2 build5-2015-installer.bat: we use Qt 5.6.2 2017-04-25 01:43:23 +02:00
Juergen Spitzmueller
52019917f4 Split external_templates to individual *.xtemplate files
This makes it easier to add new templates or change existing ones
in the user directory.

Fixes: #3983

The CMake changes should be double-checked.
2017-03-26 15:32:01 +02:00
Kornel Benko
5d3d26b024 Cmake build: Adapt handling of mytheslib to automek behaviour
The added cmake-parameter is:
  -DLYX_EXTERNAL_MYTHES=<value>
where <value> is one of
  AUTO	(Default) Search first on system for mythes (lib and include)
  ON	Use installed only (errors if not installed)
  OFF	Compile the provided source in 3rdparty
2017-03-07 14:27:08 +01:00
Kornel Benko
15babdc0f1 Amend 0e50ad8 'move mythes sources to 3rdparty' for cmake build. 2017-03-06 19:31:23 +01:00
Kornel Benko
c6314fc7d0 Amend b5416928. Cmake configuration for QT5.8 2017-02-23 00:18:52 +01:00
Kornel Benko
7b57bea5d5 Cmake build: Missed to install citeengines dir in commit cf3f481 2017-01-13 17:18:25 +01:00
Kornel Benko
f4c3dc6668 Add the perl-mode-line for emacs to perl scripts 2016-12-03 11:39:28 +01:00
Kornel Benko
ff0c95aba6 Cmake build: Prepare for hardening use of external programs 2016-11-22 16:51:44 +01:00
Uwe Stöhr
10e90ad78c Win build: fix a typo 2016-10-16 14:33:18 +02:00
Kornel Benko
5e3ceee8d5 Cmake package: Correct description.
The new cmake 3.6 now also inserts correctly
this file into its control-file. But the syntax of the control-file
expects the description lines be indented by a space.
Also empty lines (only spaces) are not allowed.
2016-09-23 13:39:23 +02:00
Guillaume Munch
02b747396e Commands to select the posix variant for the mingw cross-compilation script
The win32 thread model of gcc does not support the <thread> and <mutex> headers
yet.
2016-08-12 21:46:26 +01:00
Kornel Benko
5f5c966b19 Cmake build: Ignore also files with extension .patch --
These files should not be installed.
2016-08-08 21:23:20 +02:00
Kornel Benko
2d49342ce3 Cmake build: Amend 41e409f8: Use std::call_once only if it is actually available 2016-08-07 11:32:53 +02:00
Kornel Benko
fa85bf9b59 Cmake build: Added check for pythons polib module
Idea stolen from http://public.kitware.com/pipermail/cmake/2011-January/041666.html
2016-07-24 11:20:08 +02:00
Kornel Benko
59ac7ce660 Cmake build: Add needed libraries if using QT5_Extras
Commit cb0c881 does this already for automake.
2016-07-11 19:08:11 +02:00
Uwe Stöhr
1f6e2c323e build4-2010.bat: remove outdated script
building with MSVC 2010 won't be possible with LyX 2.3
2016-07-11 02:12:36 +02:00
Kornel Benko
8a15df6d65 Amend cb0c881 2016-07-10 22:14:08 +02:00
Enrico Forestieri
cb0c881b02 Fix paste of selection to (unfocused) external applications
With both Qt4 and Qt5, when using a click-to-focus policy, the first
attempt to paste a selection by middle mouse in an external application
which has no focus may fail. It is not clear why this succeeds for some
applications and fails for others, but refreshing the timestamp of the
selection request cures the issue. The cmake part is by Kornel.

See also this thread:
http://thread.gmane.org/gmane.editors.lyx.devel/162491
2016-07-10 19:31:32 +02:00
Kornel Benko
396b55dd51 Cmake build: Mimic changes done in autoconf at f70dd65 2016-07-08 10:58:32 +02:00
Uwe Stöhr
edbc91a6f9 remove 2 outdated build scripts
LyX 2.3 cannot be compiled with MSVC 2010
2016-07-02 19:40:18 +02:00
Georg Baum
3c56e7c0eb Fix MSVC C++11 detection
The old version with empty flag did not enter the loop at all, so we have to
use a workaround. Thanks Uwe for testing.
2016-07-02 18:26:08 +02:00
Georg Baum
987dd84461 Do not use --std=c++14 for MSVC
MSVC does not need a special flag to specify the standard. Using --std=c++14
produces a warning, but compilation succeeds, so the old code did mistakenly
choose --std=c++14 for MSVC.
2016-07-02 12:42:04 +02:00
Georg Baum
e49d59dafc Fix std::regex detection for older gcc
Older gcc versions (e.g. the first one which has usable std::regex: gcc 4.9)
require the --std=c++11 flag to be set. Otherwise std::regex is not made
available. Therefore we need to keep the flag in the loop.
2016-07-02 12:39:08 +02:00
Uwe Stöhr
f1818679ce CMAKE: update path to Qt 5.6.1 2016-07-01 01:39:38 +02:00
Georg Baum
c7c9744368 Adjust dep path in build batches
Another location where paths are stored...
2016-06-19 13:15:50 +02:00
Georg Baum
c737f1cddf Remove InsetMathXYArrow
This was dead code that did never work, and most of it was boilerplate that
you can steel in 15 minutes from any existing math inset. Apart from that it
did contain a pointer to InsetXYMatrix which would create the same problems
we saw with the macros.
2016-06-16 20:39:32 +02:00
Georg Baum
f8990ef469 This is LyX 2.3 2016-06-16 20:20:59 +02:00
Kornel Benko
0eb0a3d94d Cmake dist: Expand the list of not distributed files. 2016-06-15 10:21:18 +02:00
Kornel Benko
2da1c956e4 Cmake build: Check for make_unique and PATH_MAX symbols added. 2016-06-12 19:56:31 +02:00
Kornel Benko
24a7dd45dc Cmake build: Determine availability of 'std::regex' if using clang compiler 2016-06-11 12:23:33 +02:00
Kornel Benko
f792837531 Cmake build: Finetune some destination data paths on UNIX 2016-06-10 13:40:38 +02:00
Georg Baum
2047ea5eb4 Replace Boost.Signals with Boost.Signals2
Boost.Signals is deprecated. This fixes bug #9943.
The only thing left to do is to rewrite (or get rid of) the boost -mt test
in config/lyxinclude.m4 not to use signals anymore.
2016-06-09 22:25:34 +02:00
Georg Baum
273c67d8aa Require a C++11 compiler
As discussed on the list. If no C++11 compiler is found configuration stops
with an error. There are now unneeded parts of boost, the will be removed in
a second commit.
2016-06-07 20:34:52 +02:00
Kornel Benko
9dd695b17a Cmake build: Correct some installation paths 2016-06-07 14:38:20 +02:00
Kornel Benko
06539caccb Cmake build: Refactor determination of destination paths. 2016-06-06 08:29:07 +02:00
Kornel Benko
b5c87f2963 Cmake build: Set new installation paths
For a suffixed version (with suffix 2.3) and installation dir (/usr/local)
the new paths are:
binary -> /usr/local/bin
system-lib -> /usr/local/share/lyx2.3
fonts -> /usr/local/fonts/truetype/lyx2.3
manuals -> /usr/local/man/man1
locales -> /usr/local/share/locale
tex -> /usr/local/texmf/tex/latex/lyx2.3
2016-06-05 22:59:13 +02:00
Kornel Benko
7c0eba4d75 Cmake build: Allow user defined suffix for program files 2016-06-05 16:26:59 +02:00
Kornel Benko
7a86fe3e0b Cmake: Allow test for X11 with QT5.6
Used for key-test tests.
2016-05-30 08:22:15 +02:00
Uwe Stöhr
978eea2173 CMake: add 2 build scripts to compile LyX with Qt 5 and MSVC 2015 2016-05-30 02:03:16 +02:00
Jean-Marc Lasgouttes
87d4ce0ff7 Remove boost/format support
Only ChkTex.cpp used it, whereas the rest of our code uses the simpler bformat.
2016-05-29 17:55:45 -04:00
Georg Baum
2d708bd7cf Simplify .po file generation
We can generate the file with the cirrect line endings directly instead of
calling a helper script to convert them.
2016-05-29 17:55:44 -04:00
Georg Baum
d5f2bad461 Mingw-w64 build fixes for long long
On mingw-w64, long long (64bit wide) is larger than long (32bit wide).
Therefore we need some more specializations for string, docstring,
otextstream and << overloaded ostream functions. The configuration code
is by me, the source code changes by Shankar Giri Venkita Giri (bug 10053).
2016-05-29 17:55:43 -04:00
Kornel Benko
882b7b01d0 Cmake install: Exclude some files from being installed
Files like CMakeLists.txt or *.lyx~ should not be part
of an installation.
2016-04-14 11:15:08 +02:00
Kornel Benko
13bf0f3275 Ammend 4aa88e9 2016-04-09 12:21:16 +02:00
Peter Kümmel
a0a472c16e msvc2015: always incude strfwd.h first, to prevent crashes of our
typedefed streams.
2016-04-02 11:03:17 +02:00
Kornel Benko
41447b1225 Cmake export tests: Label handling
In collaboration with Günter Milde:
1.) Allow char ':' be part of a ctest-label
2.) Eliminate redundant label naming and directory names
    (The testnames should not repeat the directory name)
2016-03-26 13:06:14 +01:00
Uwe Stöhr
869d34ddeb development/cmake/build5-2015-x64.bat: Windows build script for 64bit LyX and Qt 5.6 2016-03-08 00:31:10 +01:00
Kornel Benko
cc884dd044 Typo. 2016-02-15 21:00:35 +01:00
Kornel Benko
64446ab834 Preparing a helper script to creat md5sum of a file. 2016-02-15 15:24:33 +01:00
Kornel Benko
a413d667ca Set C++11 option defaulting to 'AUTO' as it is on autotools too.
Nothing changes for already cached values.
With fresh build-dir and in 'AUTO'-mode we try to determine if the c++ compiler
is able to use this feature.
2016-02-11 09:03:07 +01:00
Uwe Stöhr
deb8e48efa build5-2010.bat: simplify script
* This is a script for MSVC2010 so assume this is used
* Fix a typo
* Load the MSVC build environment
2016-01-28 00:07:43 +01:00
Uwe Stöhr
c5236c42b9 build5-2010.bat: use the same CMake parameters as in build5-2010-installer.bat 2016-01-26 01:57:15 +01:00
Peter Kümmel
44fd57e4b4 python now will be found, rmdir could fail 2016-01-22 12:47:23 +01:00
Peter Kümmel
0477e01d3e use Qt default path, don't touch source tree 2016-01-19 17:39:52 +01:00
Uwe Stöhr
41d5acdca3 Win build scripts: add a one-click script for installer builds
- also restore a build script for daily development work
- remove 2 outdated/unnecessary scripts
2016-01-19 02:21:06 +01:00
Peter Kümmel
e30b1d67fc rename build directory 2016-01-17 18:52:20 +01:00
Peter Kümmel
2f290a46d2 clean build with MSVC2010 2016-01-17 18:34:15 +01:00
Uwe Stöhr
1822d44c58 add 2 Windows build scripts for LyX 2.2
- build4-2010.bat: MSVC 2010 and Qt 4.8.7 (as backup)
- build5-2010.bat: MSVC 2010 and Qt 5.5.1

I tested both scripts thoroughly and the resulting LyX build is stable. Please feel free to modify them if something can be improved.
2016-01-14 00:39:32 +01:00
Peter Kümmel
6e3a4ecfe7 mingw.bat: circumvent critical python detection
LyX could be build with a double click on mingw.bat.
2016-01-13 15:46:44 +01:00
Peter Kümmel
275d5a66a5 use Qt 5.5.1 2016-01-13 13:12:25 +01:00
Peter Kümmel
407bb15bde add batch file for MinGW build on Windows 2016-01-12 20:10:51 +01:00
Peter Kümmel
ff8719497a also install cross compiled lyx 2016-01-06 14:24:22 +01:00
Peter Kümmel
f09202c69c fix broken xmingw script 2016-01-06 13:07:59 +01:00
Peter Kümmel
2a112d8a65 add script to cross-compile for Windows 2015-12-20 14:42:24 +01:00
Kornel Benko
4e9fe808d7 Cmake export tests: Correct some quirks
1.) Label lyx2lyx was handled wrong (removed '2')
2.) tests were named '_lyx2lyx' instead of only 'lyx2lyx'
2015-12-17 12:57:34 +01:00
Peter Kümmel
11f9c71d75 fix MinGW build on Windows 2015-12-15 13:20:11 +01:00
Peter Kümmel
7d2c054611 also build without gnuwin32 directory 2015-12-15 13:20:10 +01:00
Peter Kümmel
2ce5ca7fcc improve mingw runtime detection 2015-12-15 13:20:09 +01:00
Kornel Benko
afaf28964a Cmake build: Map '\origin unavailable' to appropriate value on install
For example for lib/doc.de/xyzzy.lyx the entry is changed to
	\origin /systemlyxdir/doc/de/
2015-12-13 16:08:27 +01:00
Kornel Benko
a9764cf191 Cmake build: Initialize some variables before use. 2015-12-09 15:37:58 +01:00
Uwe Stöhr
11e12c787a build5.bat: explicitly set QT5 2015-12-08 01:40:48 +01:00