[ros-diffs] [peterw] 29697: - Merged the NSIS files back together.

Author: peterw
Date: Sat Oct 20 08:03:39 2007
New Revision: 29697

URL: http://svn.reactos.org/svn/reactos?rev=29697&view=rev
Log:
- Merged the NSIS files back together.

Removed:
    trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh
    trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh
Modified:
    trunk/tools/RosBE-Windows/RosBE.nsi

Removed: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.…
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (original)
+++ trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (removed)
@@ -1,5 +1,0 @@
-Section "-MinGW, GCC v4.1.3 and NASM 0.99.04" SEC01
-    SetOutPath "$INSTDIR\4.1.3\"
-    SetOverwrite try
-    File /r Components\4.1.3\*.*
-SectionEnd

Removed: trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-Mi…
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh (original)
+++ trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh (removed)
@@ -1,6 +1,0 @@
-Section "-Other miscellaneous files." SEC02
-    SetOutPath "$INSTDIR"
-    SetOverwrite try
-    File /r Root\*.*
-    File /r Icons\*.*
-SectionEnd

Modified: trunk/tools/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=…
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE-Windows/RosBE.nsi Sat Oct 20 08:03:39 2007
@@ -97,11 +97,18 @@
 
 ;; MUI end.
 
-;;
-;; Add sections 1, 2 and 3 which contain the file lists for GCC4 and Miscellaneous.
-;;
-!include "RosBE.Files-4.1.3.nsh"
-!include "RosBE.Files-Miscellaneous.nsh"
+Section "-MinGW, GCC v4.1.3 and NASM 0.99.04" SEC01
+    SetOutPath "$INSTDIR\4.1.3\"
+    SetOverwrite try
+    File /r Components\4.1.3\*.*
+SectionEnd
+
+Section "-Other miscellaneous files." SEC02
+    SetOutPath "$INSTDIR"
+    SetOverwrite try
+    File /r Root\*.*
+    File /r Icons\*.*
+SectionEnd
 
 Section -StartMenuShortcuts SEC03
     SetShellVarContext current