[Gd-chatter] r10840 - trunk/fundev/packages/win32-nsis

[housel at gwydiondylan.org]

Author: housel
Date: Wed Aug  2 08:02:55 2006
New Revision: 10840

Modified:
   trunk/fundev/packages/win32-nsis/choose-build-script.ini
   trunk/fundev/packages/win32-nsis/fundev.nsi
Log:
Bug: 7161 7312 7323
- Add a choice for VC8 to the installation dialogs.
- Fix a problem with removing all of "$SMPROGRAMS" on uninstall.


Modified: trunk/fundev/packages/win32-nsis/choose-build-script.ini
==============================================================================
--- trunk/fundev/packages/win32-nsis/choose-build-script.ini	(original)
+++ trunk/fundev/packages/win32-nsis/choose-build-script.ini	Wed Aug  2 08:02:55 2006
@@ -1,12 +1,12 @@
 ; Ini file generated by the HM NIS Edit IO designer.
 [Settings]
-NumFields=5
+NumFields=6
 
 [Field 1]
 Type=Groupbox
 Text=Linker
 Left=0
-Right=0
+Right=6
 Top=0
 Bottom=113
 
@@ -24,8 +24,8 @@
 Text=Microsoft Visual C++ .NET
 Left=10
 Right=-5
-Top=29
-Bottom=39
+Top=28
+Bottom=38
 
 [Field 4]
 Type=RadioButton
@@ -37,9 +37,17 @@
 
 [Field 5]
 Type=RadioButton
-Text=Pelles C for Windows
+Text=Microsoft Visual C++ 2005 Express Edition + Microsoft Platform SDK
 Left=10
 Right=-5
-Top=58
+Top=59
 Bottom=69
 
+[Field 6]
+Type=RadioButton
+Text=Pelles C for Windows
+Left=10
+Right=-5
+Top=74
+Bottom=85
+

Modified: trunk/fundev/packages/win32-nsis/fundev.nsi
==============================================================================
--- trunk/fundev/packages/win32-nsis/fundev.nsi	(original)
+++ trunk/fundev/packages/win32-nsis/fundev.nsi	Wed Aug  2 08:02:55 2006
@@ -110,6 +110,7 @@
   SectionIn 1 2 RO
 
   SetOutPath "$INSTDIR\"
+  File ..\..\License.txt
   File /r bin
   File /r lib
   File /r databases
@@ -146,6 +147,8 @@
   StrCmp $2 "1" "" +2
     StrCpy $R0 "x86-win32-vc7-build.jam"
   StrCmp $3 "1" "" +2
+    StrCpy $R0 "x86-win32-vc8-build.jam"
+  StrCmp $4 "1" "" +2
     StrCpy $R0 "x86-win32-pellesc-build.jam"
 
   WriteRegStr HKCU "${REGISTRY_KEY}\1.0\Build-System" "build-script" \
@@ -384,7 +387,7 @@
   RMDir /r "$INSTDIR" 
 
   ;; Delete start menu stuff
-  RMDir /r "$SMPROGRAMS"
+  RMDir /r "$SMPROGRAMS\Open Dylan"
 
   ;; Delete desktop icons...
   Delete "$DESKTOP\${APPNAMEANDVERSION}.lnk"