Commit Graph

61 Commits

Author SHA1 Message Date
Uwe Stöhr
d4b5638fcb scons: fix remaining issues that was not covered by r33560, patch by Bo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33562 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-25 02:09:04 +00:00
Enrico Forestieri
bc72d3fc58 Automate setting of LYX_DIR_XXx and LYX_USERDIR_XXx environment variable names.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25898 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-26 10:45:38 +00:00
Joost Verburg
f9e5128e31 lots of installer improvements:
* Add option to bundle required ImageMagick/Ghostscript files without the need to modify registry keys that belong to the original applications. This allows for full support for installation by limited users, gives different users the possibility to have a different setup of all LyX tools and reduces download size. The necessary files will be included in the dependency package.
* Python, ImageMagick and Ghostscript will now all be compiled using the same MSVC compiler and can use the same C runtimes. This reduces the installer size.
* Compile Python files during installation to improve performance. Limited users may not have access to the installation folders so the files cannot be compiled afterwards.
* Only the settings that typically need to be changed for LyX releases are now in settings.nsh.
* Rename launcher executable to LyXLauncher.exe to match the alternative installer.
* Minor fixes and cleanup.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24574 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-01 18:33:36 +00:00
Bo Peng
c67b21683d Fix scons for Andre's Resource.cpp change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21041 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-18 18:32:09 +00:00
Bo Peng
6973591797 fix a wrong scons fix due to the removal of /TP option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19708 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-21 22:14:30 +00:00
Bo Peng
bb0f26bc05 SCons: msvc gives different result for this ICONV_CONST test so I need to change the test to .cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19701 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-21 21:21:39 +00:00
Bo Peng
b38d22d2e7 SCons: msvc does not need this /TP option any more after we rename .C => .cpp. Also fix a CXX_GLOBAL_CSTD bug (not quite sure)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19693 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-21 16:46:05 +00:00
Bo Peng
60d63985b7 fix scons for Andre's LYX_DATE changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19508 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-13 15:46:33 +00:00
Bo Peng
3dc11ec08e Scons: check HAVE_DECL_MKSTEMP to fix a configuration error with gcc4 on Linux
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18587 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-31 01:34:33 +00:00
Bo Peng
5eea42b9eb Scons: fix a bug in scons_utils.py that leads to duplicate entries in POTFILES.in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18123 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-30 16:50:24 +00:00
Bo Peng
aa3b2eccf5 Scons: new update_manifest target.
When you run 'scons update_manifest', it tells you which files are missing
and which files are not in the source tree. It also generates a 
scons_manifest.py.new file with all the missing files added to 
XXX_extra_files. It will *not* change other sections of existing
manifest.py



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18121 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-30 16:19:49 +00:00
Bo Peng
912c73fc9f Always use relative path in POTFILES.in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18108 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-30 03:43:28 +00:00
Bo Peng
a6e1dc19a3 Scons: update_po target now updates po/POTFILES.in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18075 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-28 20:33:15 +00:00
Bo Peng
5e94f81cbf Scons: update_po target, move processing functions to po/lyx_pot.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17509 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-22 15:39:44 +00:00
Bo Peng
b92cef16ee Scons: update_po target part four: lyx.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17503 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-22 03:15:58 +00:00
Bo Peng
1385059003 Scons: update_po target part three: ui_l10n
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17502 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-22 02:51:51 +00:00
Bo Peng
8ab80df229 Scons: update_po target part two: qt4_l10n and layouts_l10n
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17501 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-22 02:37:26 +00:00
Bo Peng
2593c4b206 Scons: update_po target, part one: language_l10n.pot
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17496 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-21 03:23:54 +00:00
Bo Peng
673da6c01c SCons: build TOC.lyx during installation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17468 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-18 06:03:28 +00:00
Bo Peng
145c4d9afe fix cygwin postinstall script
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17411 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-05 15:37:36 +00:00
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
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
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
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
17a36a12f9 Scons: create libs directory for res file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16472 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-03 04:57:55 +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
0dadb5c0ff Scons: do not subst %var%, as I am told that they are changed to @var@
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16367 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-21 15:21:30 +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
71ed7ab328 Scons: do not print warnings when checking boost libraries
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16339 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-19 15:48:40 +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
f3016d70d9 Scons: fix a config.h generation bug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15341 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-16 02:55:04 +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
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
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
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
7dcf1bdb26 SCons: fix a small bug in scons_utils.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14388 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-08 22:42:09 +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
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
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
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
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
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
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
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
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
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