Commit Graph

1791 Commits

Author SHA1 Message Date
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
Joost Verburg
308906651c remove old code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34942 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 15:55:26 +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
Joost Verburg
8be5676ae2 Remove outdated patches for Windows dependencies.
Binaries and source code of the latest versions can be found at ftp://ftp.devel.lyx.org/pub/contrib/windows/

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34917 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 14:26:29 +00:00
Joost Verburg
5ca5dceac7 Windows installer updates:
* New versions of dependencies
* Improved MiKTeX detection
* Remove language selection during installation (this is now set in the LyX preferences)
* Remove hacks from LyXLauncher that are no longer needed with gettext 0.18
* Clean up some code that is no longer in use

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34916 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 14:17:03 +00:00
Uwe Stöhr
250b586ff9 SCons: use a standalone Qt installation rather than a special bundle
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34908 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 01:00:37 +00:00
Uwe Stöhr
0a8a6fca71 installer: updates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34907 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 00:58:49 +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
Kornel Benko
7ec50e6206 Add missing cmake-files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34877 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-12 13:04:13 +00:00
Jürgen Spitzmüller
1fe33c83c3 * scons_manifest.py: add missing file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34871 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-12 11:16:24 +00:00
Jürgen Spitzmüller
08010e893e * Makefile.am: fix file name.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34866 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-12 08:17:13 +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
Uwe Stöhr
b49eb16242 installer: updates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34849 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 01:31:10 +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
Uwe Stöhr
ac0eef808f installer: updates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34831 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 13:22:30 +00:00
Uwe Stöhr
cc96b0795c new translated Greek splash.lyx and Intro.lyx from Ulysses
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34778 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-06 04:05:58 +00:00
Uwe Stöhr
0ce70fcb31 installer: updates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34775 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-06 03:24:58 +00:00
Uwe Stöhr
eccda771b6 installer: updates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34685 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-19 14:03:24 +00:00
Enrico Forestieri
25dc517532 On cygwin, install by default lyxprofile and lyxrc.dist, otherwise
packagers may forget to do it in post-install scripts.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34683 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-17 10:42:32 +00:00
Uwe Stöhr
d750f0a5e7 installer: updates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34628 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-08 02:56:56 +00:00
Peter Kümmel
a200f527cf cmake: update package list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34602 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-05 11:24:55 +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
Uwe Stöhr
3c4006cb57 installer: update
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34586 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-02 02:07:47 +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