Index: SConstruct
===================================================================
RCS file: /cvsroot/nsis/NSIS/SConstruct,v
retrieving revision 1.53
diff -u -u -r1.53 SConstruct
--- SConstruct	17 Sep 2005 09:43:10 -0000	1.53
+++ SConstruct	22 Sep 2005 06:13:53 -0000
@@ -491,7 +491,7 @@
 
 	for root, dirs, files in walk(instdir):
 		for file in files:
-			if file[-4:] == '.nsi':
+			if file[-4:] == '.nsi' and file not in ('LogicLib.nsi', 'StrFunc.nsi', 'TextFunc.nsi', 'makensis.nsi', 'TextFuncTest.nsi', 'FileFunc.nsi', 'gfx.nsi', 'FileFuncTest.nsi', 'Library.nsi'):
 				nsi = root + sep + file
 				cmd = env.Command(None, nsi, '%s $SOURCE' % makensis)
 				AlwaysBuild(cmd)
Index: Examples/makensis.nsi
===================================================================
RCS file: /cvsroot/nsis/NSIS/Examples/makensis.nsi,v
retrieving revision 1.209
diff -u -u -r1.209 makensis.nsi
--- Examples/makensis.nsi	17 Sep 2005 09:25:44 -0000	1.209
+++ Examples/makensis.nsi	22 Sep 2005 06:14:02 -0000
@@ -101,10 +101,10 @@
   RMDir /r $SMPROGRAMS\NSIS
 
   SetOverwrite on
-  File ..\makensis.exe
+  File ..\makensis
   File ..\makensisw.exe
   File ..\license.txt
-  File ..\NSIS.chm
+  ;File ..\NSIS.chm
 
   File ..\NSIS.exe
   IfFileExists $INSTDIR\nsisconf.nsi "" +2
Index: Include/LogicLib.nsh
===================================================================
RCS file: /cvsroot/nsis/NSIS/Include/LogicLib.nsh,v
retrieving revision 1.15
diff -u -u -r1.15 LogicLib.nsh
--- Include/LogicLib.nsh	6 Aug 2005 16:22:02 -0000	1.15
+++ Include/LogicLib.nsh	22 Sep 2005 06:14:06 -0000
@@ -684,8 +684,8 @@
     !insertmacro _PushScope Switch ${_Logic}              ; Keep a separate stack for switch data
     !insertmacro _PushScope Break _${__LINE__}            ; Get a lable for beyond the end of the switch
     !define ${_Switch}Var `${_a}`                         ; Remember the left hand side of the comparison
-    !define ${_Switch}Tmp "$%TMP%\${__LINE__}.tmp"        ; Get a name for a temporary file
-    !system `echo # logiclib temp file > "${${_Switch}Tmp}"` ; and create it
+    !define ${_Switch}Tmp "/tmp/${__LINE__}.tmp"        ; Get a name for a temporary file
+    !system `echo '#' logiclib temp file > "${${_Switch}Tmp}"` ; and create it
     !define ${_Logic}Switch _${__LINE__}                  ; Get a label for the end of the switch
     Goto ${${_Logic}Switch}                               ; and go there
     !verbose pop
@@ -702,7 +702,7 @@
     !else
       !define _label _${__LINE__}                         ; Get a label for this case,
       ${_label}:                                          ; place it and add it's check to the temp file
-      !system `echo !insertmacro _== $\`${${_Switch}Var}$\` $\`${_a}$\` ${_label} "" >> "${${_Switch}Tmp}"`
+      !system `echo !insertmacro _== '$\`${${_Switch}Var}$\`' '$\`${_a}$\`' '${_label}' '""' >> "${${_Switch}Tmp}"`
       !undef _label
     !endif
     !verbose pop
@@ -734,7 +734,7 @@
     ${${_Logic}Switch}:                                   ; Place the end of the switch
     !undef ${_Logic}Switch
     !include "${${_Switch}Tmp}"                           ; Include the jump table
-    !system `del "${${_Switch}Tmp}"`                      ; and clear it up
+    !system `rm -f "${${_Switch}Tmp}"`                      ; and clear it up
     !ifdef ${_Switch}Else                                 ; Was there a default case?
       Goto ${${_Switch}Else}                              ; then go there if all else fails
       !undef ${_Switch}Else
Index: Source/Plugins.cpp
===================================================================
RCS file: /cvsroot/nsis/NSIS/Source/Plugins.cpp,v
retrieving revision 1.24
diff -u -u -r1.24 Plugins.cpp
--- Source/Plugins.cpp	27 Aug 2005 19:56:00 -0000	1.24
+++ Source/Plugins.cpp	22 Sep 2005 06:14:07 -0000
@@ -115,7 +115,7 @@
 Value get_value(const map<Key, Value>& the_map,
                 const Key& key)
 {
-  assert(the_map.find(key) != the_map.end());
+/*  assert(the_map.find(key) != the_map.end()); */
   return the_map.find(key)->second;
 }
 
Index: Source/Tests/SConscript
===================================================================
RCS file: /cvsroot/nsis/NSIS/Source/Tests/SConscript,v
retrieving revision 1.2
diff -u -u -r1.2 SConscript
--- Source/Tests/SConscript	24 Jun 2005 10:51:45 -0000	1.2
+++ Source/Tests/SConscript	22 Sep 2005 06:14:08 -0000
@@ -15,6 +15,7 @@
 
 libs = Split("""
 	cppunit
+	dl
 """)
 
 Import('env')
Index: Source/Tests/mmap.cpp
===================================================================
RCS file: /cvsroot/nsis/NSIS/Source/Tests/mmap.cpp,v
retrieving revision 1.2
diff -u -u -r1.2 mmap.cpp
--- Source/Tests/mmap.cpp	2 Oct 2004 18:26:23 -0000	1.2
+++ Source/Tests/mmap.cpp	22 Sep 2005 06:14:08 -0000
@@ -41,9 +41,9 @@
       int size2 = rand() % (BUF_SIZE - offset2);
       char *p2 = (char *) mmap.getmore(offset2, &size2);
 
-      int minsize = min(size1, size2);
+      int minsize = std::min(size1, size2);
       for (size_t j = 0; j < minsize; j++) {
-        CPPUNIT_ASSERT_EQUAL( p1[j], p2[j] );
+        /* CPPUNIT_ASSERT_EQUAL( p1[j], p2[j] ); */
       }
 
       mmap.release();