From b6df886bf14a55d22b93c5e8f5a9112c0a8e30ec Mon Sep 17 00:00:00 2001
From: Joost Verburg <joostverburg@users.sourceforge.net>
Date: Mon, 2 Jun 2008 20:28:32 +0000
Subject: [PATCH] updated list of installer files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25082 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/scons/SConstruct        | 10 +++----
 development/scons/scons_manifest.py | 44 ++++++++++++-----------------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 832842b79d..b0aef42654 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -2076,16 +2076,16 @@ if 'installer' in BUILD_TARGETS:
         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/gui/%s' \
+            % x for x in development_Win32_packaging_installer_gui] + \
         ['$TOP_SRCDIR/development/Win32/packaging/installer/include/%s' \
             % x for x in development_Win32_packaging_installer_include] + \
         ['$TOP_SRCDIR/development/Win32/packaging/installer/lang/%s' \
-            % x for x in development_Win32_packaging_installer_lang]
+            % x for x in development_Win32_packaging_installer_lang] + \
+        ['$TOP_SRCDIR/development/Win32/packaging/installer/setup/%s' \
+            % x for x in development_Win32_packaging_installer_setup]
     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)
diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 4c9ca75e10..816b9b1172 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2782,29 +2782,6 @@ 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
 ''')
 
 
@@ -2814,14 +2791,23 @@ development_Win32_packaging_installer_graphics = Split('''
 ''')
 
 
+development_Win32_packaging_installer_gui = Split('''
+    external.nsh
+    langselect.nsh
+    reinstall.nsh
+''')
+
+
 development_Win32_packaging_installer_include = Split('''
     declarations.nsh
     detection.nsh
-    filelists.nsh
+    dictlist.nsh    
+    filelist.nsh
     gui.nsh
     init.nsh
-    lang.nsh
-    windows.nsh
+    langlist.nsh
+    nsis.nsh
+    variables.nsh
 ''')
 
 
@@ -2832,3 +2818,9 @@ development_Win32_packaging_installer_lang = Split('''
     italian.nsh
 ''')
 
+
+development_Win32_packaging_installer_setup = Split('''
+    configure.nsh
+    install.nsh
+    reinstall.nsh
+''')