Commit Graph

216 Commits

Author SHA1 Message Date
Bo Peng
132ab09b38 Scons: fix options like CPPFLAGS
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14845 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-26 18:55:51 +00:00
Michael Schmitt
415970fcb5 fix typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14825 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-23 14:11:14 +00:00
Abdelrazak Younes
f533422b0e get rid of QT3_SUPPORT
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14773 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-17 09:08:20 +00:00
Bo Peng
0ba726bb7a Add #include "xxx_moc.cpp" to xxx.C files, and stop compiling _moc.cpp individually.
* src/frontends/qt3/[all mocable files].C: add #include _moc.cpp at the end.
	* development/scons/SConstruct: do not compile _moc files individually.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14714 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-16 22:10:20 +00:00
Bo Peng
a9b8f12846 Scons: minor Sconstruct fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14711 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-16 21:50:26 +00:00
Bo Peng
e530d2ddd2 Scons: add support for msvc qt3
* src/support/package.C.in: use PATH_MAX instead of MAX_PATH
	* INSTALL.scons: add instruction for building qt3 2ith msvc
	* development/scons/SConstruct: use the right lib (qt-mt3) and manifest file


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14709 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-16 21:34:24 +00:00
Bo Peng
22a3512110 Scons: fix ICONV support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14690 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-15 14:23:57 +00:00
Bo Peng
486d32ba39 Scons: add ICONV_CONST to common/config.h, require library iconv
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14676 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-14 16:47:37 +00:00
Bo Peng
5687075007 Scons: fix a uic bug, add unicode.hC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14662 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-14 00:33:39 +00:00
Bo Peng
c94fcdeeae Scons: fix a filelist bug (missing spell.C)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14643 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-13 14:30:40 +00:00
Bo Peng
c8e38f5e05 Scons: stop globbing filenames, use explicit file list instead.
* INSTALL.scons: stop lyx1.4.x/qt2 support
	* development/scons/scons_manifest.py: list of all filenames
	* development/scons/SConstruct: use explicit file list
	* development/scons/scons_utils.py: remove globFiles


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14634 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-13 04:54:25 +00:00
Bo Peng
d7588feb8f Scons: check minor version number (>=0.96.92)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14633 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-13 01:51:05 +00:00
Bo Peng
6c36d0444c scons: make "scons install" succeed without msgfmt
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14490 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-20 18:57:29 +00:00
Bo Peng
81262569fc Scons: small fix for target msvs_projects
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14476 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-17 19:34:58 +00:00
Bo Peng
f37a03ece9 Scons: check for unused/misspelled command line option, allow rebuild=yes/no/all/none.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14449 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-13 17:52:41 +00:00
Michael Schmitt
94d5cd6c67 * SConstruct: remove xforms relicts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14417 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 19:40:55 +00:00
Abdelrazak Younes
852431e2a6 Add -DQT_NO_KEYWORDS to compiler option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14413 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 17:40:14 +00:00
Bo Peng
1f831d0a99 Scons: fix DESTDIR
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14386 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-08 21:31:57 +00:00
Bo Peng
563c1b6b24 Scons: allow non-exist build_dir option, adjust QTDIR/bin handling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14365 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 16:21:10 +00:00
Bo Peng
fc42d0d4f9 Scons: check system boost version, probe qt3 libs for qt2 frontend
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14354 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 03:08:37 +00:00
Bo Peng
a54d3e83bd Scons: exclude boost headers only for system boost header files.
* INSTALL.scons: document this change.
	* development/scons/SConstruct: check for included_boost to exclude boost 
	  headers from the dependency tree.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14343 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-05 18:48:59 +00:00
Bo Peng
e85cfec957 Scons: do not build boost dependency tree, use debug/release boost system library, check for boost system header files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14338 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-05 15:33:38 +00:00
Bo Peng
cd443c86ca Scons: fix handling of lib/lyx2lyx/lyx2lyx_version.py.in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14325 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 20:57:25 +00:00
Bo Peng
62d3cebb29 Scons: polish scons' 1.4.x support.
* INSTALL.scons: add instruction for 1.4.x
	* development/scons/SConstruct: fix a installation bug for 1.4.x, better handling of QTDIR


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14311 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 02:02:11 +00:00
Bo Peng
d4253cbacd Scons: rename option qt_include_path to qt_inc_path (we have extra_inc_path etc.)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14307 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-02 22:09:11 +00:00
Bo Peng
418b9c936d Scons: check the validity of QTDIR, and the existence of uic and moc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14293 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-02 17:35:14 +00:00
Bo Peng
b2d7d52537 Scons: fix a isdir typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14288 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-02 03:17:15 +00:00
Bo Peng
b0abcefcc0 Scons: set default qt lib directory under cygwin
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14286 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-02 01:54:44 +00:00
Bo Peng
a5a508bdaa Change the indent level of python code from two to four
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14250 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-27 21:08:54 +00:00
Bo Peng
e941da3bdf Scons: fix DESTDIR, reloate intl/libintl.h, libgnuintl.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14239 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-27 03:53:04 +00:00
Bo Peng
de064bd88a Scons: remove pch, add stdlib_debug and profiling options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14188 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-24 03:49:11 +00:00
Bo Peng
b6e42797d4 Scons: fix rebuildTargetOnly for lyx msvs projects
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14180 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-22 15:46:35 +00:00
Bo Peng
fe5c0415a4 Scons: restore fast_start, remove BOOST_USER_CONFIG in boost/config.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14164 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 16:46:35 +00:00
Bo Peng
865e5c25f2 Scons: config.h moves to BUILDDIR/common, boost_config.h moves to BUILDDIR/boost.
Do not use debug libraries for win/mingw.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14163 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 14:44:46 +00:00
Abdelrazak Younes
f032e0af1a revert commit 14159
QtView -> GuiView at the right place this time.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14160 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 11:56:31 +00:00
Abdelrazak Younes
e2c3e46a25 QtView -> GuiView
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14159 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 11:52:13 +00:00
Abdelrazak Younes
d8ae51dbe1 This is the merging of the GUI API cleanup branch that was developed in svn+ssh://svn.lyx.org/lyx/lyx-devel/branches/personal/younes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14152 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 08:39:16 +00:00
Bo Peng
dde45f75da Scons: link to qt debug lib in debug mode
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14139 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-18 04:04:23 +00:00
Bo Peng
29431ace2c Scons: imerge SConscript to SConstruct, separate config.h, code cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14133 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-17 04:43:44 +00:00
Bo Peng
c287b1330e Scons: bug fix for default_boost_option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14114 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 02:45:57 +00:00
Bo Peng
aa460e9217 Scons: improved option handling
* add option: optimization (=-O3 etc)
	* add load_option=opt1,opt2 or load_option=-opt1,opt2: selectively load options
	* CCFLAGS etc will replace default values, but not hardcoded ones.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14107 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 15:13:19 +00:00
Bo Peng
56134789f7 Scons: add qt2 frontend for lyx1.4
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14096 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 14:16:54 +00:00
Bo Peng
9d229c3f24 Scons: fix typos and minor bugs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14070 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-11 04:48:22 +00:00
Bo Peng
48ecd44845 Scons: Better MSVS Projects support (now with debug)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14069 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-10 21:02:11 +00:00
Bo Peng
6daeed854b Scons: ICONV_CONST bug fix, and some code clean-up
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14066 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-10 02:21:28 +00:00
Bo Peng
c8eb10bbef Scons: version_suffix windows fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14063 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-09 18:44:28 +00:00
Bo Peng
210dbf394f Scons: version_suffix bug fix and improvement
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14062 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-09 17:11:15 +00:00
Bo Peng
f85e2778f3 Scons: link to libiconv if available
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14061 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-09 15:57:13 +00:00
Bo Peng
7fef63264b Scons: generate msvs porject files with target msvs_projects
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13994 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-03 22:15:35 +00:00
Bo Peng
62e8b7cf75 Scons: msvc command line support.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13984 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-02 18:36:29 +00:00
Bo Peng
79237ec01c Scons: two small bug fixes, and a bit more about msvc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13975 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-01 03:01:46 +00:00
Bo Peng
44d2042c9a Scons: initial msvc support, and separate fast_start and load_option options.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13962 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-29 16:58:14 +00:00
Bo Peng
16a8861cd5 Scons: add option rebuild that rebuild only specified targets, regardless of environment (e.g. CCFLAGS) changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13952 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-29 14:59:20 +00:00
Bo Peng
a04cdd5d50 Scons: add more libintl related function/type tests.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13932 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-25 23:33:39 +00:00
Bo Peng
90933ac07a Scons: dest_dir option, cache command line option, fix a intl bug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13914 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-23 00:27:05 +00:00
Bo Peng
7aeddf0bc3 Scons: fix a few bugs: qt4, included_ libs, command line argument with blank
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13894 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-21 15:50:55 +00:00
Bo Peng
2496781ffb Scons: nls support (nls=yes, gettext=include/system/auto), merge some autoconf
tests, fix CCFLAGS arg for mingw, version-suffix support, reduce unnecessary rebuild


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13892 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-20 15:59:56 +00:00
Bo Peng
f39c9e1d5e scons: lyx2lyx_version.py.in, less rebuild, filter installed files, bug fix for substFile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13853 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-17 04:07:45 +00:00
Bo Peng
0725d504b7 scons: fix lyxclient build error handling under windows, extra_inc_path problems.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13852 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-16 14:14:05 +00:00
Bo Peng
e94889a041 gettext support, fast_start option, scons all, mingw bug fix and some cleanup for the scons build system
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13849 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-15 20:35:01 +00:00
Bo Peng
46bf7d0a25 better scons install (man directory and windows system), fix a few bugs, use g++ as LINK.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13838 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-12 14:21:30 +00:00
Bo Peng
df9bd2cc6d add 'scons lyxbase', 'scons install', nsl support, and a few other scons improvement.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13835 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-11 21:28:13 +00:00
Bo Peng
e1a132eda7 More bugs fixes to scons system, and finer target control.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13834 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-11 17:20:25 +00:00
Abdelrazak Younes
93adc6658e * Get rid of Qt3Support linking
* revert to -lz instead -lzlib1 (I think Enrico was right about libraries ordering and -lz at the end of linking command works fine under mingw).
* remove win32 target from gcc/g++ replacement hack for cygwin



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13832 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-11 11:50:08 +00:00
Bo Peng
c7fa09fe9f Bug fixes to the scons system.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13831 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-11 05:35:01 +00:00
Bo Peng
bee53b6c8d Scons-build system moves to development/scons, from Bo Peng (ben.bob@gmail.com)
* remove SConstruct config/scons_utils.py config/qt4.py
	* add development/scons/qt4.py SConscript SConstruct scons_utils.py


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13829 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-10 21:53:31 +00:00