Commit Graph

271 Commits

Author SHA1 Message Date
Kornel Benko
1f8e611c03 MYTHES_LIBS not set
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29341 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-19 17:30:19 +00:00
Kornel Benko
ced1b3530b Added libmythes to lyx-build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29334 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-19 15:04:20 +00:00
Kornel Benko
1657aeb41b white space
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29332 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-19 15:00:45 +00:00
Kornel Benko
d094fccda1 white space
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29331 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-19 14:57:50 +00:00
Kornel Benko
517f8dc1d0 Fix error in creating moc-files due to last commit.
Again: prepend moc_ instead of appending _moc in cmake


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29258 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-16 10:48:32 +00:00
Kornel Benko
7ad31fcf7b Try to avoid use of perl, if there is no perl-command available
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29244 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-15 07:28:37 +00:00
Kornel Benko
6f5ac86d6e Copy po-files only if realy changed.
Avoids annoying po re-building.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29243 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-15 07:14:29 +00:00
Kornel Benko
5378f44032 1.) some white spaces removed
2.) Using direct call to uic-qt4. This was needed to enable translated
    strings to appear in many dialogs.
    I needed some time to find out, why strings form autocof-build made
    it into the dialogs, but strings from cmake-build did not.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29234 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-12 15:01:08 +00:00
Kornel Benko
b5880744c9 1.) Definition of macro add_gettext_python()
Missed the part, when there were more then one argument
        specifying the possible extension.
2.) Typo in extension: .layouts => .layout
3.) Reorder the creation of lyx.pot to make more like when creating
        with autoconf.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29106 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-05 16:02:46 +00:00
Kornel Benko
1f582e9490 Adapt to some new configuration strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28967 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-29 07:33:54 +00:00
Kornel Benko
44b15b8cf1 Added unconsidered header files to the list.
Globbed the tex2lyx directory to be more robust against changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28890 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-25 07:02:19 +00:00
Kornel Benko
c313084ef5 Avoid modification of po-files in source tree
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28888 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-25 06:49:49 +00:00
Kornel Benko
6420c5b213 autogeneration of tex2lyx.1 now from tex2lyx.1in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28875 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-20 11:39:38 +00:00
Kornel Benko
184cbb6825 Remove "share" from default installation prefix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28750 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-10 07:14:41 +00:00
Kornel Benko
aff87ada93 autogeneration of lyxclient.1 now from lyxclient.1in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28741 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-09 15:09:47 +00:00
Kornel Benko
9fb1b3aa00 Add variable program_suffix to handle manuals properly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28738 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-09 14:30:28 +00:00
Vincent van Ravesteijn
d31e25e159 cmake: Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28609 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-25 21:11:43 +00:00
Kornel Benko
9d1a382472 Added revision as the release number for rpm package
to avoid the need of the --force flag when updating.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28604 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-25 07:42:50 +00:00
Vincent van Ravesteijn
cc44d6cb0b Hide messages when using cmake-gui.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28580 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-21 22:41:30 +00:00
Vincent van Ravesteijn
a833b6f097 Fix cmake after r28575. Patch from Kornel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28579 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-21 22:37:25 +00:00
Peter Kümmel
56f8b5f3c3 Kornel: cmake, use external files for packaging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28501 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-15 15:38:32 +00:00
Peter Kümmel
cc9edb643a Kornel really needs write access
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28500 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-15 14:02:26 +00:00
Peter Kümmel
3f8bc76ecb add missing cmake files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28496 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-15 13:11:44 +00:00
Peter Kümmel
72526f6f8b ke/CMakeLists.txt
Expanded parsing of configure.ac to get also the BUGREPORT value
		Added creation of red hat- and debian-packages

	Kornel

--line, and those below, will be ignored--

M    development/cmake/CMakeLists.txt


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28495 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-15 10:43:06 +00:00
Peter Kümmel
2ef89683a3 development/cmake/CMakeLists.txt
Expanded parsing of configure.ac to get also the BUGREPORT value
		Added creation of red hat- and debian-packages

	Kornel


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28483 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-13 21:37:08 +00:00
Pavel Sanda
4d847204ed *cmake - patch from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28465 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-12 08:23:12 +00:00
Peter Kümmel
fb3d47a14d Changes:
development/cmake/CMakeLists.txt
		Use lowercase for PACKAGE iff (USE_POSIX_PACKAGING)
		Set correct PROGRAM_SUFFIX,
			CMakeLists.txt in subdirectories depend now on it
		Define PACKAGE_BASE depending on  PACKAGING type
			for use in subsequent directories
	development/cmake/config.h.cmake
		typo: PPROGRAM_SUFFIX --> PROGRAM_SUFFIX
	development/cmake/src/tex2lyx/CMakeLists.txt +
	+ development/cmake/src/CMakeLists.txt +
	+ development/cmake/src/client/CMakeLists.txt +
	+ development/cmake/man/CMakeLists.txt
		added desired version-info to executables and manuals
			tex2lyx, lyx, lyxclient respectivelly

	Kornel



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28438 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-10 22:21:39 +00:00
Peter Kümmel
1fe1080cf6 cmake: Kornel's package versions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28396 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-08 12:20:31 +00:00
Peter Kümmel
765e190753 cmake: Kornel
Search for all possible files, since there is no POTFILES.in anymore in svn
		Use the PACKAGE-Value as the root of the .mo file
			 (For now it will be LyX.mo)
--line, and those below, will be ignored--

M    development/cmake/po/CMakeLists.txt


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28365 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-05 19:02:27 +00:00
Peter Kümmel
9ef5e73fa1 Kornel:
Setting some internal variables from info in configure.ac
	(PACKAGE, PACKAGE_VERSION, LYX_DATE, LYX_DIR_VER, LYX_USERDIR_VER)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28283 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-26 18:42:02 +00:00
Peter Kümmel
60ce0b3226 Kornel: Moved handling of for lyx2lyx created files to lyx2lyx/CMakeLists.txt
Installation of executabe lyx2lyx
		creation and installation of lyx2lyx_version.py


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28241 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-18 14:45:57 +00:00
Peter Kümmel
802ca12d08 cmake: fix some stupid errors
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28234 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-18 10:55:54 +00:00
Peter Kümmel
2467c38ca9 cmake: fix for PyCompile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28227 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 19:17:51 +00:00
Peter Kümmel
42dc171666 cmake: fix for PyCompile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28226 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 18:54:28 +00:00
Peter Kümmel
01854608fd cmake: more fixes from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28103 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 20:56:40 +00:00
Peter Kümmel
fbdafecf52 cmake: more fixes from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28102 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 20:52:14 +00:00
Peter Kümmel
138d393a17 Kornel's patch
development/cmake/Install.cmake
		Added directory scripts
		Corrected handling of directories. There may well be empty _dir_list.
			(if we search for e.g. lib/doc/en/clipart, there is nothing)
	development/cmake/lyx2lyx/CMakeLists.txt
		most ot the code moved to development/cmake/lyx2lyx/CMakeLists.txt,
			we include now this module.
	development/cmake/CMakeLists.txt
		add the subdirectory "scripts"


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28100 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 18:50:24 +00:00
Peter Kümmel
ed50dbfe0f New files from Kornel
development/cmake/PyCompile.cmake
		common code for creating .pyc and .pyo files
			for scripts and lyx2lyx python files
	development/cmake/scripts/CMakeLists.txt
		sets a variable and includes development/cmake/PyCompile.cmake


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28098 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 18:28:48 +00:00
Peter Kümmel
588a118f3f cmake: some cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28010 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-06 18:51:00 +00:00
Peter Kümmel
18305961ed cmake: set default install path, add py-compile for lyx2lyx, from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28001 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-05 19:13:20 +00:00
Peter Kümmel
9c44e16aea cmake: explain ugly hacks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27984 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-04 13:33:23 +00:00
Peter Kümmel
b89a2ff510 cmake: more changes from Kornel, and Windows fixes: glob is not really cross plattform
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27983 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-04 13:01:55 +00:00
Peter Kümmel
874a696dfa cmake: more changes from Kornel, and Windows fixes: glob is not really cross plattform
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27982 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-04 13:00:34 +00:00
Peter Kümmel
afe522b1f6 Kornel
New files:
        development/cmake/doc/ReplaceValues.pl
                perl-script to substitute words (defined in the cmd-line) with their actual
                        values
        development/cmake/doc/CMakefiles.txt
                convert and install files .lyx and .txt-files from the lib/doc-directory
	development/cmake/src/client/CMakeLists.txt
		create and install lyxclient
	
Changed:
        development/cmake/Install.cmake
                include the new doc-directory
                remove installation of .lyx from the doc-directory. Will be installed in
                        development/cmake/doc/CMakefiles.txt
        development/cmake/Install.cmake
                changed macro lyx_install() to not insert '.' into the globbing-expression
                        automatically. We need sometimes also dotless files.
	development/cmake/src/CMakefiles.txt
		Added subdirectory client to create and install lyxclient on unix-like systems


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27978 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-03 10:53:24 +00:00
Peter Kümmel
510c918c6c Kornel's cmake install changes:
New files:
        Directories:
		development/cmake/po
		development/cmake/man
        Files:
		development/cmake/po/CMakeLists.txt
			Creates lyx.pot and *.gmo-files;
			Installs ${_lang} as ${LYX_ABS_INSTALLED_DATADIR}/${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES/lyx.mo
		development/cmake/man/CMakeLists.txt
			Handling of lyx-manuals.
		development/cmake/modules/FindLyXGettext.cmake
			Original: (GNU) FindGettext.cmake
			Changed the installation subdirectory of .gmo-files.
			Previously installing into "/usr/local/share/lyx2.0" led
				   to e.g. /usr/local/share/lyx2.0/share/locale/de/LC_MESSAGES/lyx.mo
				   now     /usr/local/share/lyx2.0/locale/de/LC_MESSAGES/lyx.mo
Changes:
        development/cmake/Install.cmake
                macro lyx_install _parent_src_dir
                        searches now through directories specified as simple regular expression.
                        Until now we had to specify explicitly each directory for each language.
                Mode of the DESTINATION/lyx2lyx is now corect
                Installation of the .gmo files

	development/cmake/config.h.cmake:
		Changed some #cmakedefine to #define, because config_file() did not
        	substitute the desired values in config.h.
        	Some typos corrected (TOP_SRCDIR -> TOP_SRC_DIR)

        development/cmake/configCompiler.h.cmake
                Removed doubly defined ENABLE_NLS, HAVE_LC_MESSAGES
                Installation directory still hardcoded, users need to to set environment
                variable LYX_LOCALEDIR to get the corect translations.

	development/cmake/CMakeLists.txt
		Setting correct values to LYX_ABS_INSTALLED_DATADIR,
        		LYX_ABS_INSTALLED_LOCALEDIR, LYX_ABS_TOP_SRCDIR.
			Now the lyx-executable searches on the installed places for it's data,
        		so no need to set environment anymore.
		New variable: LYX_LOCALEDIR. We need it later in FindLyXGettext.cmake,
		    	because we cannot use the absolute path LYX_ABS_INSTALLED_LOCALEDIR.
			(We need relative path when packaging to different root-directory).
                Use of module FindLyXGettext.cmake: This is a modified version
		       	of (GNU) FindGettext.cmake
                Include the new development/cmake/po directory
		Include the new development/cmake/man directory

        development/cmake/po/CMakeLists.txt
                Creation of lyx.pot and apropriate .gmo files
                Creating lyx.pot file
                        I had to use perl to simulate the unix "cat" command. Maybe Jose can
                        write the corect statement in python





git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27973 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-28 13:35:29 +00:00
Peter Kümmel
b581607b55 cmake: gettext patch from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27931 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-20 09:25:55 +00:00
Peter Kümmel
672a158a0a cmake: more install fixes, thx to Kornel Benko
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27871 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-14 17:09:06 +00:00
Peter Kümmel
7ad91d8646 fix line endings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27836 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-10 17:29:44 +00:00
Peter Kümmel
8d50d723a0 cmake: add TODO
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27835 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-10 17:28:27 +00:00
Peter Kümmel
1327b056b1 cmake: fix gcc include
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27834 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-10 17:19:56 +00:00