Commit Graph

147 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
0576973b8d Make monolithic build code portable to Mac OS
"echo -e" is definitely not portable. Use a plain loop instead.

Also use the automake silent rule mechanism to make the generation of monolithic source files visible.
2016-04-18 18:20:06 +02:00
Peter Kümmel
3c3141dc23 3rdparty/boost: build with cmake 2015-12-20 13:41:00 +01:00
Kornel Benko
c9f6ed309f Cmake monolithic build: Some corrections.
In the src/support directory do not use src/support/AppleScriptProxy.cpp if not APPLE.
In the src/client directory remove inclusion of src/TexRow.cpp
2015-11-17 21:21:00 +01:00
Jean-Marc Lasgouttes
b7909e7e6c Remove support for precompiled headers for autotools
This was turned off by default for a long time, and it does not seem
to have any use these days.
2015-09-25 12:05:40 +02:00
Georg Baum
84cca2dd94 Fix indentation 2015-05-17 17:27:27 +02:00
Georg Baum
7b48e2aac0 Start qt event loop for commandline usage
This is needed since src/support calls lots of qt code, and some parts of it
(e.g. QFileInfo) require a running event loop. This fixes bug #4917 which is
a symptom of the problem.
The fix is to create a QCoreApplication for tex2lyx, lyxclient and LyX running
without GUI. In the future this could be extended, i.e. to split up the
frontend Application class in a GUI and a console class, and having the
console class use LyXConsoleApp in the same way as Application now uses
GuiApplication. If that is done, one could also think of moving
support/ConsoleApplication to frontend/console/ConsoleApplication.
2015-01-11 14:06:17 +01:00
Georg Baum
a02af82b82 Fix indentation 2015-01-11 11:29:00 +01:00
Enrico Forestieri
1b0cbb6932 Fix building with cmake on cygwin.
Add required libraries for the link stage.
2014-12-26 17:00:23 +01:00
Kornel Benko
6c7b5b12c7 Add cmake files to autoconf's dist 2014-08-31 15:21:20 +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
Kornel Benko
3b14de740d Cmake build: Symplify use of linking optional libraries found via find_package 2014-06-12 19:02:29 +02:00
Kornel Benko
2b0511510a Cmake build: Added magic library to some link commands.
Needed due to the use of magic_(open|load|error|file|close) after recent changes.
2014-06-12 07:49:17 +02:00
Benjamin Piwowarski
14de3aa49b CMake install and bundling improvements (esp. OS X)
This patch improves the cmake bundling process:
- reworked bundle handling for OS X: only when installing resources are copied, otherwise
only the smallest bundle is built
- on OS X, the utility programs (tex2lyx) are now installed in the right location
- it removes some unneeded BUNDLE DESTINATION
- it provides a basic support for QT plugins inclusion
- it properly builds a disk image on OS X (only the background image is missing)
- it fixes the library paths for all executables (not only LyX)
- Use the COPYING file for cmake install license
2014-04-21 11:51:04 -04:00
Vincent van Ravesteijn
514aef937a Revert "Fix make distcheck for monolithic build"
This was committed by accident.

This reverts commit 9734ab7e34.
2013-10-12 02:41:36 +02:00
Vincent van Ravesteijn
9734ab7e34 Fix make distcheck for monolithic build 2013-10-12 02:38:15 +02:00
Vincent van Ravesteijn
a3c864102a CMake: Remove libintl 2013-05-30 22:10:01 +02:00
Jean-Marc Lasgouttes
d7e2705228 Get rid of all traces of libintl.
This requires to re-add some tests in configure.ac.

Note that the code to generate a Makefile in po/ has been kept.
2013-05-30 22:10:01 +02:00
Jean-Marc Lasgouttes
2e25a65c25 Revert "Correctly clean lyxclient.cpp in monolithic build."
Sanda has been faster than me... See 39e23a.

This reverts commit 1b74d3e729.
2012-11-06 20:48:51 +01:00
Jean-Marc Lasgouttes
1b74d3e729 Correctly clean lyxclient.cpp in monolithic build. 2012-11-05 14:28:26 +01:00
Pavel Sanda
39e23a8c5c Let lyxclient.cpp be cleaned by make clean.
I would wait with backporting for 2.0.6.
2012-11-03 23:58:33 +01:00
Lars Gullik Bjønnes
43f6b1672b Use empty() to check empty and non-empty'ness not size()
Also add FormatList::empty().
2012-10-27 01:25:38 +02:00
Kornel Benko
f7680c696d Cmake build:
Added dependencies to target `test'. Now all the needed executables
are recreated prior to running tests if not already existant.
2012-10-21 16:58:45 +02:00
Pavel Sanda
c1e9632beb Remove leftover from 16fd47ad8f.
Catch by Kayvan Sylvan.
2012-09-28 01:09:23 +02:00
Jean-Marc Lasgouttes
16fd47ad8f Fix bug #7741: incorrect locale when starting R from LyX?
The goal here is to get rid of the old code that modified variables
LANGUAGE and LC_ALL, therefore creating the problems mentionned
in the ticket.

In the new system, there is no explicit "GUI" message handler, that
needs to be reset at each language change. Instead, getGuiMessages
calls getMessages with the correct parameter. This allows to simplify
greatly the code and to remove a lot of old cruft.
2012-07-15 22:22:10 +02:00
Jean-Marc Lasgouttes
992eae2524 Typos 2012-06-05 12:22:13 +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
Pavel Sanda
4d541f8430 Don't hardcode /tmp in lyxclient, bug #7917.
Patch from Benjamin Piwowarski.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40380 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-05 19:09:24 +00:00
Kornel Benko
3004722131 Add framework AppKit to cmake as in the automake case (MAC only)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39798 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:49:06 +00:00
Stephan Witt
3c846d98ac to succesfully link lyx on mac the AppKit framework is needed only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39791 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-30 16:05:46 +00:00
Jean-Marc Lasgouttes
9e53e98b05 Link against Cocoa and/or Carbon for Mac OS X. This is needed for autoOpen and Linkback.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39772 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-27 07:27:19 +00:00
Peter Kümmel
41a0adcb47 cmake: build a .dmg file on Mac, looks not as nice as the official installer but it runs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38765 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 13:21:18 +00:00
Peter Kümmel
eef204ca33 cmake on mac: also build with LYX_NLS=0
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38733 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 22:06:06 +00:00
Peter Kümmel
6a953f81ad cmake on mac: build with external libintl, find gettext, build merged
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38729 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 21:11:35 +00:00
Kornel Benko
5c1666c0e1 In colaboration with Stephan Witt, adapted to our libintl to MAC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38695 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 19:18:44 +00:00
Peter Kümmel
897edc10c0 cmake: move CMakeLists.txt into source dir (multiple steps)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38691 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 17:44:41 +00:00
Kornel Benko
45b61c6ecf 1.) Corrected internal compilation for Libintl
2.) Changed cmake-files accordingly
Patch from Jean-Marc Lasgouttes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38606 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-06 19:24:54 +00:00
Enrico Forestieri
a99340cd10 Infrastructure for choosing different icon sets. This currently works
through the rc setting \icon_set. Preferences dialog will follow shortly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38038 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 01:59:34 +00:00
Pavel Sanda
62ca7f3ae5 Proper camel case for FileName.absFilename
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34234 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:09 +00:00
Richard Heck
4991fc3996 This hasn't much effect but seems wise.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33931 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-29 21:17:44 +00:00
Enrico Forestieri
51d70699ef Fix bug #5525: Windows XP doesn't shut down with LyX open
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33077 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-17 23:01:48 +00:00
Enrico Forestieri
0695afbc55 Don't rely on the signal delivered by raise(), as this may cause a bogus
assertion when Qt is compiled in debug mode, and simply directly perform
an emergency cleanup when a shutdown event occurs on Windows.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31029 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 13:19:02 +00:00
Pavel Sanda
42dcca6b00 Fix bug #6106. This can go to branch Juergen.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30779 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-25 14:34:00 +00:00
Enrico Forestieri
b0936fac4c When performing a reverse DVI search and the tmpdir is a symlink, the
DVI viewer passes back the resolved path, such that the search fails,
as internally LyX uses the unresolved path.
This patch fixes this bug by using the new method FileName::realPath
which resolves a path by getting rid of any '.', '..', or symlink
path components.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29476 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-01 15:18:11 +00:00
Jean-Marc Lasgouttes
eb74cde19b use $version_suffix instead of $program_suffix in man pages (the later can come up as NONE)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28870 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-19 22:29:40 +00:00
Enrico Forestieri
12d1cb2076 Fixes for gcc4 on cygwin.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28842 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-17 22:35:55 +00:00
Jean-Marc Lasgouttes
76d0ead2b6 make the lyxclient man page autogenerated
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28740 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-09 14:49:40 +00:00
Pavel Sanda
316764c611 Cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28592 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-24 22:42:41 +00:00
Pavel Sanda
96578ef324 Support gcc 4.4. Patch from Martin Michlmayr.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg146271.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27609 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-17 12:49:47 +00:00
Enrico Forestieri
d2bd215690 Fix for mingw/cygwin
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27573 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 19:18:40 +00:00
André Pönitz
bb12808b20 remove libtool
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27468 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 17:45:55 +00:00