[etoys-dev] [SVN][490] Fix win32 installer

[commits at etoys.squeak.org]

Repository: http://etoys.squeak.org/svn

Revision: 490
Author:   KR
Date:     2010-09-13 13:59:14 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
Fix win32 installer

Modified Paths:
--------------
    trunk/installers/win32/makeIni.nsh
    trunk/installers/win32/olpc.nsi

-------------- next part --------------
Modified: trunk/installers/win32/makeIni.nsh
===================================================================
--- trunk/installers/win32/makeIni.nsh	2010-09-12 20:31:29 UTC (rev 489)
+++ trunk/installers/win32/makeIni.nsh	2010-09-13 13:59:14 UTC (rev 490)
@@ -6,7 +6,7 @@
  ;
  Function MakeXPIniFile
     Push $0
-    FileOpen $0 $INSTDIR\etoys.ini" w
+    FileOpen $0 "$INSTDIR\etoys.ini" w
     DetailPrint "$INSTDIR\etoys.ini"
     FileWrite $0 "[Global]$\r$\n"
     FileWrite $0 "DeferUpdate=1$\r$\n"
@@ -38,7 +38,7 @@
  ;
  Function MakeVistaIniFile
     Push $0
-    FileOpen $0 $INSTDIR\$\etoys.ini" w
+    FileOpen $0 "$INSTDIR\etoys.ini" w
     DetailPrint "$INSTDIR\etoys.ini"
     FileWrite $0 "[Global]$\r$\n"
     FileWrite $0 "DeferUpdate=1$\r$\n"

Modified: trunk/installers/win32/olpc.nsi
===================================================================
--- trunk/installers/win32/olpc.nsi	2010-09-12 20:31:29 UTC (rev 489)
+++ trunk/installers/win32/olpc.nsi	2010-09-13 13:59:14 UTC (rev 490)
@@ -43,6 +43,7 @@
   
 ;  !include "NSISpcre.nsh"
 
+   !include "LogicLib.nsh"
 !include "makeIni.nsh"
 
 !include "lastPart.nsh"
@@ -66,7 +67,7 @@
 ;--------------------------------
 ;Pages
 
-  !insertmacro MUI_PAGE_LICENSE "${AssetFolderCommon}\LICENSE"
+  !insertmacro MUI_PAGE_LICENSE "${AssetFolderCommon}\NOTICE"
 ;  !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   
@@ -117,6 +118,8 @@
 ;  File "${AssetFolderCommon}\NOTICE"
 ;  File "${AssetFolderCommon}\NEWS"
 
+  DetailPrint $WinVersion
+
   ${If} $WinVersion == "Vista"
   	Call MakeVistaIniFile
   ${ElseIf} $WinVersion == "7"