Commit Graph

123 Commits

Author SHA1 Message Date
Bo Peng
5402048cea Scons windows installer integration:
* INSTALL.Win32: add instructin of building windows bundle installer
	* development/scons/SConstruct: add bundle and bundle_dir option
	* development/scons/scons_utils.py: handle bundle building
	* development/Win32/packaging/installer/lyx.nsi: 
		allow specify bundle .exe name from command line
	* development/Win32/packaging/installer/settings.user.nsh: 
		allow specify bundle directory from command line
	* development/Win32/packaging/installer/components/external.nsh:
		get files from bundle directory
	* development/Win32/packaging/installer/settings.nsh
		update miktex version (link needs to be updated as well?)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17081 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-07 07:55:38 +00:00
Bo Peng
67e8d59d68 Forgot to use absolute paths
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17024 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-02 03:54:29 +00:00
Bo Peng
d57708a28a Scons: add deps_dir option for windows installer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17023 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-02 03:44:14 +00:00
Bo Peng
16d5b72ea1 Scons: also consider prefix option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16901 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 07:07:57 +00:00
Bo Peng
168d3ef631 Scons: continue refining scons installer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16900 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 06:58:03 +00:00
Bo Peng
bae86e4098 Scons: refine scons installer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16899 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 06:47:11 +00:00
Bo Peng
c9fb2a107e Scons: NSIS support (installer target)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16854 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-25 19:13:22 +00:00
Bo Peng
db4499f4b1 Scons: initial windows nsis installer support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16846 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-25 06:19:49 +00:00
Bo Peng
3b8d367e6e Scons: fix a mingw/scons bug (it is a scons bug)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16539 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-05 18:30:46 +00:00
Bo Peng
b1c7fc3e4f Scons: fix two mingw bugs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16522 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-05 06:29:18 +00:00
Bo Peng
71794188c7 Scons: allow use of different icons for lyx and tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16464 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-02 06:13:53 +00:00
Bo Peng
5059ac7648 Scons: fix a typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16463 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-02 05:22:20 +00:00
Bo Peng
c35c782b30 Scons: create an .rc file and link lyx.exe etc with .res to set icon
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16462 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-02 05:21:08 +00:00
Michael Schmitt
515616a914 * scons/SConstruct: fix manifest on Windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16382 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-23 09:09:10 +00:00
Bo Peng
d99334d73b Scons: fix a newly introduced qt4 CCFLAGS bug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16343 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-20 01:32:43 +00:00
Bo Peng
356fb608ed Scons: allow shared boost libraries
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16342 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-19 20:39:00 +00:00
Bo Peng
e75d65a829 Scons: clear separation of env and frontend_env (a major reshuffling)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16341 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-19 18:32:55 +00:00
Bo Peng
d78a76a6ee Scons: handle the case when qt4 is in system directories
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16338 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-19 15:44:39 +00:00
Bo Peng
c1a5770979 Scons: remove boost 1.33.1 support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16328 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-18 23:27:33 +00:00
Bo Peng
cd43719f96 Scons: load qt4 module with debug=False when the debug library is not available; modify boost/check warning message
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16323 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-18 15:30:50 +00:00
Bo Peng
39186319da Scons: support boost 1.34
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16305 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-16 23:31:15 +00:00
Bo Peng
016d529945 Scons: test for the availability of debug version of qt libraries before linking to them
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16304 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-16 20:16:34 +00:00
Bo Peng
3023f93593 Scons: can now be executed from any directory
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16303 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-16 16:31:28 +00:00
Bo Peng
f5599ea253 Scons: print error message when scons is not called from top source directory or development/scons
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16292 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-15 21:38:55 +00:00
Bo Peng
48a83e978d Scons: use /path/to/qt/QtCore explicitly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16267 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-13 16:28:40 +00:00
Bo Peng
d213175b85 Scons: add support for QtCore in support (and tex2lyx and client)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16261 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-13 04:55:41 +00:00
Bo Peng
59f15f2d94 Scons: set uic parameter -tr lyx::qt_ properly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16000 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-20 17:26:26 +00:00
Bo Peng
c8429d4bbc Detect mode_t for safe use of chmod, and for scons/msvc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15985 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-19 13:58:39 +00:00
Bo Peng
eb939a9b76 Scons: adopt Georg's solution for tex2lyx/gettext
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15963 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-18 03:04:42 +00:00
Georg Baum
5ed606f9c5 Add a cache for converted image files. This needs to be enabled in the
preferences file with \use_converter_cache true. It is disabled by default,
and no GUI support for changing the preferences is yet implemented.

	* src/insets/insetgraphics.C
	(InsetGraphics::prepareFile): Use image file cache

	* src/insets/ExternalSupport.C
	(updateExternal): Use image file cache

	* src/exporter.C
	(Exporter::Export): Do not use image file cache

	* src/graphics/GraphicsCacheItem.C

	(CacheItem::Impl::imageConverted): Add the converted file to the
	image file cache
	(CacheItem::Impl::convertToDisplayFo): Use image file cache

	* src/converter.C
	(Converters::convert): Use image file cache if the caller allowed that

	* src/converter.h
	(Converters::convert): Adjust arguments

	* src/Makefile.am: Add new files

	* src/support/lyxlib.h
	(chmod): new function
	(copy): add mode argument

	* src/support/copy.C
	(chmod): new function
	(copy): implement mode argument

	* src/support/mkdir.C
	(lyx::support::mkdir): Add warning if permissions are ignored

	* src/lyxrc.[Ch]: Add new settings \converter_cache_maxage and
	\use_converter_cache

	* src/ConverterCache.[Ch]: New image file cache

	* src/importer.C
	(Importer::Import): Do nut use the image file cache

	* src/lyx_main.C
	(LyX::init): Initialize the image file cache

	* src/mover.[Ch]
	(Mover::do_copy): Add mode argument
	(SpecialisedMover::do_copy): ditto

	* configure.ac: Check for chmod

	* development/cmake/ConfigureChecks.cmake: ditto

	* development/cmake/config.h.cmake: ditto

	* development/scons/SConstruct: ditto

	* development/scons/scons_manifest.py: Add new files


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15897 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-13 10:27:57 +00:00
Georg Baum
a116e04b8b Use wctype character classification functions if possible
* src/buffer.C
	(Buffer::insertStringAsLines): Uncomment isPrintable test

	* src/support/lstrings.C
	(compare_no_case): Use char_type and not int for the docstring version
	(ascii_tolower): Convert to a template
	(compare_ascii_no_case): Do not use a template anymore, because we
	need int for the string version and char_type for the docstring
	version as intermediate type
	(lowercase): Use towlower if possible
	(uppercase): Use towupper if possible

	* src/support/textutils.h
	(isLetterChar): Use iswalpha if possible
	(isPrintable): Use iswprint if possible
	(isPrintableNonspace): Use iswprint and iswspace if possible
	(isDigit): Use iswdigit if possible

	* src/paragraph.C
	(Paragraph::asString): remove obsolete FIXME
	(Paragraph::transformChar): add FIXME

	* configure.ac: Add definition of LIBC_WCTYPE_USES_UCS4 to config.h

	* development/cmake/config.h.cmake: ditto

	* development/scons/SConstruct: ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15893 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-13 09:53:25 +00:00
Bo Peng
ac1dcef5d0 Scons: getext/unicode support for tex2lyx (ignore src/tex2lyx/gettext.* and use src/gettext.* and src/messages.*)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15716 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-03 18:49:56 +00:00
Bo Peng
8b5e79fc47 Scons: remove some other qt3 debris
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15494 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-22 20:34:37 +00:00
Lars Gullik Bjønnes
8f261b1529 The Gtk removal from trunk.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15488 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-22 18:05:16 +00:00
Michael Schmitt
7cf8328885 * scons/SConstruct: fix scons error (remainder of qt3 frontend removal)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15436 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-21 09:17:58 +00:00
André Pönitz
a63cddf51c remove qt3 frontend
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15432 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-21 08:35:47 +00:00
Bo Peng
90cbd48fd3 Scons: remove fast_start feature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15343 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-16 03:26:14 +00:00
Bo Peng
aa8913e939 Scons: fix windows DESTDIR installation problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15253 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-05 03:08:08 +00:00
Bo Peng
222d0562f7 Scons: fix cygwin postinstall/lyx.sh installation problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15250 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-05 02:58:13 +00:00
Bo Peng
b3b65e6f70 Scons: set default_build_mode cleverly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15244 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-04 17:37:02 +00:00
Bo Peng
c53e7a603c Scons: libintl also needs /MD option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15240 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-04 16:45:46 +00:00
Bo Peng
ba81af5fb2 Scons: command line arguments may be overwritten when building tools are loaded
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15237 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-04 15:12:15 +00:00
Bo Peng
48988ff296 Scons: fix ICONV_LIB caching problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15236 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-04 15:05:34 +00:00
Bo Peng
8cc733b6a4 Scons: fix substFile dependence problems
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15215 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-03 14:31:25 +00:00
Bo Peng
255345d4c6 Scons: cygwin packaging fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15178 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-28 04:45:21 +00:00
Bo Peng
6f29180afc Scons: correct installation of cygwin fonts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15175 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-27 19:30:08 +00:00
Bo Peng
a8354d3db7 Scons: get version info from configure.ac, add fonts and postinstall script for cygwin
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15158 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-26 19:37:09 +00:00
Bo Peng
526bb55821 Scons: add HAVE_WCHAR_T to two config.h files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14998 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-14 17:04:11 +00:00
Bo Peng
dd0e06b339 Scons: add SIZEOF_WCHAR_T
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14997 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-14 15:40:06 +00:00
Bo Peng
5889f636c0 Scons: add support for system iconv function (from glibc)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14995 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-14 14:09:08 +00:00