anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Scons: continue refining scons installer

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16900 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-01-28 06:58:03 +00:00
parent bae86e4098
commit 168d3ef631
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
development/Win32/packaging/installer/settings.user.nsh
View File

@ -4,22 +4,30 @@
;Location of LyX files and dependencies
!ifndef FilesLyX
!ifdef FilesLyX
!define FILES_LYX "${FilesLyX}"
!else
!define FILES_LYX "..\..\..\..\build-msvc"
!endif
!ifndef FilesDeps
!ifdef FilesDeps
!define FILES_DEPS "${FilesDeps}"
!else
!define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc-qt4"
!endif
;Location of Windows installation
!ifndef FilesWindows
!ifdef FilesWindows
!define FILES_WINDOWS "${FilesWindows}"
!else
!define FILES_WINDOWS "C:\WINDOWS"
!endif
;Location of Python 2.5
!ifndef FilesPython
!ifdef FilesPython
!define FILES_PYTHON "${FilesPython}"
!else
!define FILES_PYTHON "C:\Python25"
!endif

13
development/scons/SConstruct
View File

@ -1486,10 +1486,11 @@ def appExists(apppath, appname):
return os.path.isfile(File(env.subst('$BUILDDIR/common/%s/${PROGPREFIX}%s$PROGSUFFIX' % (apppath, appname))).abspath)
targets = BUILD_TARGETS
build_install = 'install' in targets or 'installer' in targets
build_installer = 'installer' in targets
# msvc need to pass full target name, so I have to look for path/lyx etc
build_lyx = build_installer or targets == [] or True in ['lyx' in x for x in targets] \
or 'install' in targets or 'all' in targets
or build_install or 'all' in targets
build_boost = (included_boost and not libExists('boost_regex')) or 'boost' in targets
build_intl = (included_gettext and not libExists('included_intl')) or 'intl' in targets
build_support = build_lyx or True in [x in targets for x in ['support', 'client', 'tex2lyx']]
@ -1499,11 +1500,11 @@ build_frontends = build_lyx or 'frontends' in targets
build_graphics = build_lyx or 'graphics' in targets
build_controllers = build_lyx or 'controllers' in targets
build_client = True in ['client' in x for x in targets] \
or 'install' in targets or 'all' in targets or build_installer
or build_install or 'all' in targets or build_installer
build_tex2lyx = True in ['tex2lyx' in x for x in targets] \
or 'install' in targets or 'all' in targets or build_installer
or build_install or 'all' in targets or build_installer
build_lyxbase = build_lyx or 'lyxbase' in targets
build_po = 'po' in targets or 'install' in targets or 'all' in targets
build_po = 'po' in targets or build_install or 'all' in targets
build_qt4 = (build_lyx and frontend == 'qt4') or 'qt4' in targets
build_msvs_projects = use_vc and 'msvs_projects' in targets
@ -1997,9 +1998,7 @@ if build_po:
gmo_files.extend(env.Transfiles(f))
if 'install' in targets or 'installer' in targets:
if build_install:
#
# this part is a bit messy right now. Since scons will provide
# --DESTDIR option soon, at least the dest_dir handling can be