Commit Graph

277 Commits

Author SHA1 Message Date
Joost Verburg
a89c67907b adjust LYX_INSTALL to set the CMake options which are currently being used for official 1.6 releases
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37654 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 15:14:17 +00:00
Peter Kümmel
b909835903 no shared lyx libraries are supported
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37199 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-13 14:30:43 +00:00
Stephan Witt
ae3d1bebf8 cmake: Server.cpp is moc-able on win32 only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37139 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 20:58:19 +00:00
Peter Kümmel
208cd3e8f8 cmake: add all info files and the cmake macros
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37135 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 18:48:45 +00:00
Peter Kümmel
8952c73ddb cmake: use tabs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37132 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 17:32:23 +00:00
Peter Kümmel
2972b7ff4e cmake: add status.16x
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37131 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 17:27:01 +00:00
Kornel Benko
e48d82a985 Added missing debian dependency for aiksaurus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@35246 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-31 13:52:35 +00:00
Kornel Benko
539b77fec3 Make translations working again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34988 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-20 06:45:21 +00:00
Kornel Benko
40df0dbc7d typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34977 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 15:46:39 +00:00
Kornel Benko
fdf6b3a85b 1.) Removed the unconditional set of option LYX_MERGE_FILES if option
LYX_INSTALL set.
  Does not compile on ubuntu.
2.) Backport translations handling from trunk


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34975 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 15:25:48 +00:00
Peter Kümmel
973a94dca6 cleanup global namespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34965 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 08:05:07 +00:00
Kornel Benko
e01e9c8a74 Backport for update_po_files target
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34962 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 07:10:35 +00:00
Kornel Benko
b1cfb13446 Add CPack unconditionally again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34960 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 06:23:40 +00:00
Peter Kümmel
5c74f259ec cmake: sync with trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34958 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 23:25:27 +00:00
Peter Kümmel
d0db7a9954 cmake: split out FindEnchant.cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34928 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 11:04:05 +00:00
Peter Kümmel
8383ec013f cmake: add Aiksaurus option, fix build system for Aiksaurus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34926 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 10:31:20 +00:00
Peter Kümmel
02a847a9bc cmake: move definitions to config.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34924 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 09:23:10 +00:00
Peter Kümmel
1e4d1655d2 cmake: when installing use default for several options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34923 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 09:10:44 +00:00
Peter Kümmel
5c5cdfc7d0 cmake: userdir is LyX16 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34895 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-14 11:48:24 +00:00
Peter Kümmel
7deb72cc77 cmake: fix merged build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34894 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-14 10:45:26 +00:00
Peter Kümmel
e93c2e656c cmake: also build the tarball with its additional files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34885 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-13 09:04:17 +00:00
Peter Kümmel
9939d7cf2c cmake: rename to LYX_ vars
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34860 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 21:06:29 +00:00
Peter Kümmel
2d1d9631a2 msvc: no TR1 support in branch code, compiler option should be enough
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34853 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 04:09:49 +00:00
Peter Kümmel
50bc9491ca msvc: no TR1 support in branch code, compiler option should be enough
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34852 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 04:08:29 +00:00
Peter Kümmel
ecf6f23b54 msvc: no TR1 support in branch code, disable TR1 when using msvc 10
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34851 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 04:06:45 +00:00
Peter Kümmel
398490ab8f msvc: no TR1 support in branch code, disable TR1 when using msvc 10
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34850 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 04:01:26 +00:00
Peter Kümmel
ab121914a9 cmake: no variable project defined
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34848 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 20:21:26 +00:00
Peter Kümmel
a8b2bde2db cmake: don't install to /usr/local/1.6 by default
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34846 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 20:08:31 +00:00
Kornel Benko
45488a3dab Make it compilable again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34845 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 20:00:19 +00:00
Kornel Benko
a0c929db2a Sync with trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34844 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 19:46:02 +00:00
Peter Kümmel
3d57124029 cmake: fix sync mistake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34842 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 19:23:48 +00:00
Peter Kümmel
058262b462 cmake: sync with trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34841 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 19:17:43 +00:00
Peter Kümmel
4c2c54f7ea cmake: add icon on Windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34840 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 19:10:04 +00:00
Peter Kümmel
ecc1e3c5d0 cmake: sync with trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34839 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 19:03:47 +00:00
Kornel Benko
f67b12286d Use different package name for branch and trunk to enable installation of both at the same time
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34601 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-05 11:20:32 +00:00
Peter Kümmel
a71bf0ec16 cmake: also install locale into the resource dir on windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34578 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 13:30:49 +00:00
Peter Kümmel
79bbc31a0b cmake: also install locale into the resource dir on windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34577 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 13:11:26 +00:00
Peter Kümmel
69d6de9917 cmake: sync with trunk, should be uncritical
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34575 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 12:52:47 +00:00
Peter Kümmel
f2b85d8a7c cmake: sync with trunk, should be uncritical
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34574 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 12:46:35 +00:00
Peter Kümmel
1729663bc7 cmake: install on Windows, sync with trunk, should be uncritical
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34573 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 12:24:21 +00:00
Peter Kümmel
fd5f7a7174 add eol-style property
(needed to compare with trunk version)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34572 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 10:26:05 +00:00
Enrico Forestieri
f024c86911 Fix bug #5238: LyX 1.6 fails with non-ascii chars in path (on Windows)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@33577 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-26 13:28:56 +00:00
Kornel Benko
d94bb9661c Missed this name-inconsistency (ASpell.cpp <-> ASpell_local.h)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@33194 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-24 11:01:57 +00:00
Kornel Benko
e043d4ff3e Integrate enchant into cmake-build too
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@33192 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-24 10:54:27 +00:00
Kornel Benko
c45722a0ba Adapted the build-systems to the new slovak translation of splash.lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31505 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-04 12:52:45 +00:00
Enrico Forestieri
6ffeab01b7 Implement the LyXServer on Windows.
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/branches/BRANCH_1_6_X@31389 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-13 20:49:30 +00:00
Kornel Benko
273e43647a Enable sockets on linux too. Maybe more more portable, than checking for
header files.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29930 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-04 14:58:42 +00:00
Kornel Benko
962072cc8c Change the quote style to satisfy MSVC.
Patch from Peter Kümmel


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29513 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-03 15:17:02 +00:00
Enrico Forestieri
081b58b672 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/branches/BRANCH_1_6_X@29504 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-02 21:51:06 +00:00
Kornel Benko
6a9e4ca320 Use cmake macro find_package_handle_standard_args()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29417 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-26 18:35:12 +00:00