From cdc5ab6a83721834b8616627d6134b36683be3c7 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Tue, 19 Jun 2007 18:44:42 +0000 Subject: [PATCH] add installer files to scons_manifest so that installers can depends on installer files git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18831 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 14 ++++++++ development/scons/scons_manifest.py | 54 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index e3049387f1..0ffbf25b73 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -2352,6 +2352,18 @@ if build_installer: if mode != 'release': print 'installer has to be built in release mode (use option mode=release)' Exit(1) + installer_files = ['$TOP_SRCDIR/development/Win32/packaging/installer/%s' \ + % x for x in development_Win32_packaging_installer] + \ + ['$TOP_SRCDIR/development/Win32/packaging/installer/components/%s' \ + % x for x in development_Win32_packaging_installer_components] + \ + ['$TOP_SRCDIR/development/Win32/packaging/installer/dialogs/%s' \ + % x for x in development_Win32_packaging_installer_dialogs] + \ + ['$TOP_SRCDIR/development/Win32/packaging/installer/graphics/%s' \ + % x for x in development_Win32_packaging_installer_graphics] + \ + ['$TOP_SRCDIR/development/Win32/packaging/installer/include/%s' \ + % x for x in development_Win32_packaging_installer_include] + \ + ['$TOP_SRCDIR/development/Win32/packaging/installer/include/lang/%s' \ + % x for x in development_Win32_packaging_installer_include_lang] if env.has_key('NSIS') and env['NSIS'] is not None: # create a builder to strip and install env['BUILDERS']['installer'] = Builder(generator=utils.env_nsis) @@ -2392,6 +2404,7 @@ if build_installer: '$TOP_SRCDIR/development/Win32/packaging/installer/lyx.nsi') # since I can not use a scanner, explicit dependent is required env.Depends(installer, 'install') + env.Depends(installer, installer_files) env.Alias('installer', installer) # also generate bundle? if env.has_key('bundle') and env['bundle']: @@ -2403,6 +2416,7 @@ if build_installer: bundle_installer = env.installer(env['win_installer'].replace('.exe', '-bundle.exe'), '$TOP_SRCDIR/development/Win32/packaging/installer/lyx.nsi') env.Depends(bundle_installer, 'install') + env.Depends(bundle_installer, installer_files) env.Alias('installer', bundle_installer) Default('lyx') diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 7edb9f66a7..dcd9d8d278 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -2881,3 +2881,57 @@ boost_libs_iostreams_src_extra_files = Split(''' ''') +development_Win32_packaging_installer = Split(''' + license.rtf + lyx.nsi + settings.nsh + settings.user.nsh +''') + + +development_Win32_packaging_installer_components = Split(''' + configure.nsh + core.nsh + dicts.nsh + external.nsh + langselect.nsh + reinstall.nsh + uninstall.nsh + user.nsh + viewer.nsh +''') + + +development_Win32_packaging_installer_dialogs = Split(''' + external.ini + langselect.ini + reinstall.ini + user.ini + viewer.ini +''') + + +development_Win32_packaging_installer_graphics = Split(''' + header.bmp + wizard.bmp +''') + + +development_Win32_packaging_installer_include = Split(''' + declarations.nsh + detection.nsh + filelists.nsh + gui.nsh + init.nsh + lang.nsh + windows.nsh +''') + + +development_Win32_packaging_installer_include_lang = Split(''' + english.nsh + french.nsh + german.nsh + italian.nsh +''') + -- 2.39.2