Commit Graph

425 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
8ecb96c09a Add the git commit (if applicable) to LyX version
This only works for autotools right now, but adding that to cmake is trivial
2014-10-10 12:12:17 +02:00
Stephan Witt
327da4f275 Add QtMacExtras detection for Qt5 support 2014-08-21 18:22:43 +02:00
Enrico Forestieri
4bdeae2733 Update autotools for building with Qt5.
The option --enable-qt5 allows configuring for Qt5. The default is Qt4.
Nothing special is done with respect to Qt4, apart from pulling in the
correct libraries. Indeed, other than the core and gui libraries, now
also the concurrent and widgets libraries are needed.
2014-07-19 03:34:28 +02:00
Jean-Marc Lasgouttes
3cbd343a55 Cleanup the code for boost configuration 2014-05-05 10:11:18 +02:00
Jean-Marc Lasgouttes
5ff8a01cb6 Fix oversight in autotools packaging selection
The only consequence of this thinko is that the lyx.desktop and the svg icons were installed on Mac OS and Windows platform, whereas they are useless.
2014-04-21 11:51:59 -04:00
Jean-Marc Lasgouttes
3e073ec919 Quick workaround for detection of Qt/Mac using pkg-config 2013-07-19 16:03:54 +02:00
Jean-Marc Lasgouttes
b58b8e7c73 Fix Qt tools search when a Qt directory has been specified
When --with-qt-dir has been specified, programs like "moc" in the Qt
directory are unlikely to have a qualified name like moc-qt4.
Therefore, such qualified names are only considered when the base
version has not been found.
2013-07-13 22:44:28 +02:00
Jean-Marc Lasgouttes
aaacbe579b Update our documentation to mention git instead of svn.
Note that some mentions of svn remain in
* development/cmake/LyxPackaging.cmake
* development/LyX-Mac-binary-release.sh
* development/Win32/packaging/installer/settings.nsh
2013-05-27 18:19:59 +02:00
Jean-Marc Lasgouttes
3ef4db2ce4 Continue pre-spring cleaning of configure script
* build-type=profiling implies -fno-omit-frame-pointer in gcc. This allows sysprof to yield proper call trees
 * remove --enable-grpof option (the build type is enough)
 * remove --with-frontend option since we have only one frontend. Move stuff around and generally simplify the Qt detection code
 * do not check for bc anymore.
 * Update README.
2013-03-19 16:41:14 +01:00
Jean-Marc Lasgouttes
04a8db4af8 Get rid of LYX_ERROR in our configure file.
We use the standard AC_MSG_ERROR instead, which just stops the configure process where the problem happens.
2013-03-19 15:15:56 +01:00
Jean-Marc Lasgouttes
1d08d5232d Add a test to configure for minimal Qt version
* use AS_COMPARE_VERSION to check whether the Qt version is correct.
* upgrade minimal requirement for autoconf to version 2.60 (released in 2006!).
2013-03-19 12:59:38 +01:00
Stephan Witt
141fbb6f8c Prepare LyX code to compile and link with Qt5:
* some functionality is in new modules now
  new header locations and library names: QtConcurrent and QtWidgets
* method setResizeMode is renamed to setSectionResizeMode
* deprecated QAbstractItemModel::reset() is dropped now
* platform specific code like QApplication::syncX() is not common anymore
* QString::fromAscii() is dropped now
* some QDesktopServices methods has been moved to QStandardPaths
2013-02-03 19:26:21 +01:00
Stephan Witt
6fb0d9035c ignore auto maked script test-driver 2013-01-20 12:45:34 +01:00
Lars Gullik Bjønnes
393ade85ec config/lyxinclude.m4: add support for --enable-cxx11
Using --enable-cxx11 turns on C++11 mode in gcc.
2012-10-24 23:46:48 +02:00
Kornel Benko
20359572ed Patch from Benjamin Piwowarski
Just some comments on the patch:

- The executable name has to match the information in Info.plist (development/MacOSX/Info.plist.in and CMakeLists.txt).  The autoconf config/lyxinclude.m4 file has been modified to make it work with autotools.

- The process to build OS X bundle is to first add all the files to be included to the bundle when calling add_executable (src/CMakeLists.txt) and then by calling setting the source file property of each of these files (development/cmake/Install.cmake, l.14) so that the files are properly located into the bundle. This is also why Install.cmake has to be included two times in src/CMakeLists.txt (once to build the list of files, once to set the location of the list of files).

- in CMakeLists.txt there is a line
install(CODE "set(BU_CHMOD_BUNDLE_ITEMS 1)")
What it does is to fix the owner permissions within the bundle - this is necessary because some libraries are copied within the bundle and might be owned by root

- An empty qt.conf is included in the bundle so that QT does not try to link to other QT libraries (which will not be included in the bundle)

- In development/cmake/Install.cmake, some OS X specific files (*.sdef, qt.conf, *.icns) have to be included in the bundle

Benjamin
2012-10-13 09:53:20 +02:00
Jean-Marc Lasgouttes
51cc826961 Fix detection of system boost
Using LDFLAGS is not a good idea since it is not at the end of the link command. LIBS is better.

Some additional cleanup.
2012-10-08 10:58:45 +02:00
Stephan Witt
040374f343 use -F instead of -L to link Qt frameworks 2012-09-23 16:06:55 +02:00
Jean-Marc Lasgouttes
4471e65fa1 Handle version numbers like 2.0.5dev in LYX_CHECK_VERSION 2012-07-04 12:18:15 +02:00
Lars Gullik Bjønnes
c7bb190fd3 Setup .gitignore for generated files
Setting up .gitignore or .git/info/excludes is something that should
be done. Not doing it makes it a lot harder to see actual new files
that should be added.

Signed-off-by: Lars Gullik Bjønnes <larsbj@gullik.org>
2012-03-22 02:16:12 +01:00
Jean-Marc Lasgouttes
ae872178fb Remove from svn the files that are provided by automake. This ensures that we always use the correct version.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40635 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-20 09:31:06 +00:00
Stephan Witt
a86893a84c #7927 apply patch from mft to support posix packageing on Mac for the Gentoo prefix project
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40573 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-05 19:50:18 +00:00
Jean-Marc Lasgouttes
2bf021ee73 Improve support for distributing desktop files and icons
* add proper INSTALL_POSIX conditional for makefiles
* move all the code to Makefile.am
* rename lyx.desktop to lyx.desptop.in and add proper tags to allow handling of program_suffix.
* add code to install desktop entry and icons under the proper name.

I did not touch scons and cmake, I hope it was not necessary.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40531 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-20 13:11:03 +00:00
Enrico Forestieri
6781444835 Warn user that build will fail if bc is not installed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39945 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 15:35:36 +00:00
Julien Rioux
e8daa48bc1 Provide our own patched AM_PYTHON_CHECK_VERSION that requires python <3.0
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39890 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-19 20:50:58 +00:00
Richard Heck
cf4ddb2ed5 Patch from Raphael Kubo de Costa to fix build on FreeBSD.
http://marc.info/?l=lyx-devel&m=131586604331711&w=2

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39768 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-26 15:51:28 +00:00
Stephan Witt
c29d13569e restore old hunspell library detection code as fallback when pkg-config is not available - for Mac OS X
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39484 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-14 07:17:12 +00:00
Pavel Sanda
9359d73dde Using pkgconfig to configure hunspell.
(hunspell 1.3 is not correctly recognized otherwise).

Patch from Rex Dieter, posted by Jose.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39040 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-14 14:32:42 +00:00
Jean-Marc Lasgouttes
6b88f5bcb7 streamline hunspell checking
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37988 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-21 22:30:36 +00:00
Stephan Witt
45e4c6b94b do not check for hunspell libraries if header is not present
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37887 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-09 15:40:03 +00:00
José Matox
b8836fcd19 Fix config detection for hunspell-1.2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37850 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 20:47:05 +00:00
Georg Baum
f792fe8037 fix bug #7288: add configure option for external mythes library
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37585 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 20:31:07 +00:00
Jean-Marc Lasgouttes
0299c0be49 fix --disable-debug in configure; more cleanups to build_type handling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37386 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-31 10:19:03 +00:00
Jean-Marc Lasgouttes
98b48a4969 Add and document build types profinling and gprof. Some clean up of build_type code in configure
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37323 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-25 13:49:49 +00:00
Jean-Marc Lasgouttes
3b316bc83f better fix to #7239. Actually the whole switch and kaboodle (see r37229) is needed (otherwise sweave is broken)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37322 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-25 11:22:47 +00:00
Jean-Marc Lasgouttes
eb18b4e835 Rename --enable-profiling to --enable-gprof to pave the way for a configure option for normal profiling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37245 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-18 09:57:03 +00:00
Stephan Witt
1812984b42 finally ASPELL_FRAMEWORK is not used anymore
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36844 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 18:43:02 +00:00
Stephan Witt
39645b33b4 correct the Qt framework names
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35527 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-28 19:27:10 +00:00
Stephan Witt
d18995cd79 #6874 prepare configure based build with Qt4 frameworks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35524 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-28 15:07:07 +00:00
Enrico Forestieri
6d9763d413 Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35467 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-20 22:52:13 +00:00
Enrico Forestieri
4a2243135c Instead of specifically addressing glibc, use NULL as second argument
of realpath() when PATH_MAX is not defined in limits.h.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35466 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-20 17:53:40 +00:00
Stephan Witt
042e8bb4d0 consolidate dictionary lookup of spellchecker and thesaurus, prepare builtin distribution of dictionaries
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34540 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-29 14:36:51 +00:00
Stephan Witt
fb43bbbf6c tiger support on mac snow leopard, include Qt4 frameworks, smart build script with parameters
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34132 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-14 13:22:00 +00:00
Jean-Marc Lasgouttes
2425391657 remove variables initializations that are immediately overridden
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33317 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-02 19:26:04 +00:00
Jürgen Spitzmüller
7746747506 * add support for the enchant spell checker (bug 6226).
SCons might be broken.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33157 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-22 15:26:38 +00:00
Jean-Marc Lasgouttes
8acb4ba22d wrong syntax for command "test"
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32218 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-27 09:59:50 +00:00
Jean-Marc Lasgouttes
89dde39404 clarify message for spelling libs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31545 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-06 15:21:24 +00:00
Jean-Marc Lasgouttes
06a229faf8 remove traces of libtool and of obsolete autoconf macros
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31544 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-06 15:13:20 +00:00
Jean-Marc Lasgouttes
84880b5842 cleanup the help messages of the configure script; now --with-version-suffix shows what the default suffix is
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31542 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-06 14:05:57 +00:00
Jean-Marc Lasgouttes
c9f1c6cf5f small cleanup, now that we require automake 1.8
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31431 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-21 12:16:42 +00:00
Enrico Forestieri
fc97861803 Implement the LyXServer on Windows.
Only for autotools, I don't know how to update cmake and scons, sorry.
For cmake and scons, you should make sure that moc is called on Server.h
using the -D_WIN32 option.

In order to enable the server, specify the LyXServer pipe in
Tools->Preferences->Paths. The path to be entered there must have the
form "\\.\pipe\nameofyourchoice" (without quotes). After that, you can
send commands to LyX. For example, if the pipe path is \\.\pipe\lyxpipe,
typing the following in a terminal:

echo LYXCMD:test:file-open > \\.\pipe\lyxpipe.in
type \\.\pipe\lyxpipe.out

brings up the file dialog and returns the acknowledgment from LyX.
Beware of spaces when using cmd.exe. For example, the following:
echo LYXCMD:test:file-open:foo.lyx> \\.\pipe\lyxpipe.in
will correctly load the document named foo.lyx, but
echo LYXCMD:test:file-open:foo.lyx > \\.\pipe\lyxpipe.in
(notice the space before the redirection) will try to load a
document whose name is "foo.lyx .lyx" because cmd.exe will also
pass the space (sigh).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31189 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-21 22:58:38 +00:00