Changeset 47 for remote_control

Timestamp:

06/11/10 11:43:53 (12 years ago)

Author:

sc

Message:

license.txt:

• initial checkin
• GNU GPL v2

package/vcredist_x86.exe:

• initial checkin
• Microsoft Visual C++ 2005 Redistributable Package (x86)

install.nsi:

• automatically and silently installs MS VC++ package
• final 0.1.2 release version

Location:

remote_control

Files:

• PuzzleboxBrainstorms-install.nsi (modified) (8 diffs)
• license.txt (added)
• package (added)
• package/vcredist_x86.exe (added)

remote_control/PuzzleboxBrainstorms-install.nsi

@@ -14 +14 @@
 ; SetDateSave off ; (can be on to have files restored to their orginal date)
 
-;LicenseText "You must agree to this license before installing."
-;LicenseData "license.txt"
+LicenseText "You must agree to this license before installing."
+LicenseData "license.txt"
 
 InstallDir "$PROGRAMFILES\Puzzlebox Brainstorms"
-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox\Puzzlebox Brainstorms" ""
+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox Brainstorms\Puzzlebox Brainstorms" ""
 ;DirShow show ; (make this hide to not let the user change it)
-DirText "Select the directory to install the Puzzlebox Brainstorms into:"
+DirText "Select the directory to install Puzzlebox Brainstorms into:"
 
 InstallColors /windows
@@ -27 +27 @@
 SetOutPath "$INSTDIR"
 ; add files / whatever that need to be installed here.
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox\Puzzlebox Brainstorms" "" "$INSTDIR"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox\Puzzlebox Brainstorms" "DisplayName" "Puzzlebox Brainstorms (remove only)"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox\Puzzlebox Brainstorms" "UninstallString" '"$INSTDIR\PuzzlesboxBrainstorms-Uninstall.exe"'
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox Brainstorms\Puzzlebox Brainstorms" "" "$INSTDIR"
+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox Brainstorms\Puzzlebox Brainstorms" "DisplayName" "Puzzlebox Brainstorms (remove only)"
+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox Brainstorms\Puzzlebox Brainstorms" "UninstallString" '"$INSTDIR\PuzzlesboxBrainstorms-Uninstall.exe"'
       
  File dist\bz2.pyd
@@ -42 +42 @@
  File dist\libvorbis-0.dll
  File dist\libvorbisfile-3.dll
- File dist\MSVCR71.dll
+; File dist\MSVCR71.dll
  File dist\puzzlebox_brainstorms_client_local.exe
  File dist\puzzlebox_brainstorms_client_network.exe
@@ -112 +112 @@
 ; File dist\fonts\tahoma.ttf
 
+ File package\vcredist_x86.exe
+
+ExecWait 'package\Vcredist_x86.exe /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log"'
+
 
 ; write out uninstaller
@@ -123 +127 @@
   SetOutPath $INSTDIR
   CreateDirectory "$SMPROGRAMS\Puzzlebox Brainstorms"
-  CreateShortCut "$SMPROGRAMS\Puzzlebox Brainstorms\Uninstall Puzzlebox Brainstorms.lnk" \
-                 "$INSTDIR\PuzzleboxBrainstorms-Uninstall.exe"
   CreateShortCut "$SMPROGRAMS\Puzzlebox Brainstorms\Puzzlebox Brainstorms.lnk" \
                  "$INSTDIR\puzzlebox_brainstorms_client_local.exe" \
@@ -134 +136 @@
                  "$INSTDIR\puzzlebox_brainstorms_server.exe" \
                  ""  ""  "0"  "SW_SHOWMINIMIZED"
+  CreateShortCut "$SMPROGRAMS\Puzzlebox Brainstorms\Edit Puzzlebox Brainstorms Configuration.lnk" \
+                 "$INSTDIR\puzzlebox_brainstorms_configuration.ini" \
+                 ""  ""  "0"  ""
+  CreateShortCut "$SMPROGRAMS\Puzzlebox Brainstorms\Uninstall Puzzlebox Brainstorms.lnk" \
+                 "$INSTDIR\PuzzleboxBrainstorms-Uninstall.exe"
   CreateShortCut "$DESKTOP\Puzzlebox Brainstorms.lnk" "$INSTDIR\puzzlebox_brainstorms_client_local.exe" \
                   ""  ""  "0"  "SW_SHOWMINIMIZED"
@@ -144 +151 @@
 Section Uninstall
 ; add delete commands to delete whatever files/registry keys/etc you installed here.
-   Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Puzzlebox Brainstorms.lnk"
-   Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Puzzlebox Brainstorms Network Client.lnk"
-   Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Puzzlebox Brainstorms Network Server.lnk"
-   Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Uninstall Puzzlebox Brainstorms.lnk" 
-     RMDir "$SMPROGRAMS\Puzzlebox Brainstorms"
-   Delete "$DESKTOP\Puzzlebox Brainstorms.lnk"
+ Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Puzzlebox Brainstorms.lnk"
+ Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Puzzlebox Brainstorms Network Client.lnk"
+ Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Puzzlebox Brainstorms Network Server.lnk"
+ Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Edit Puzzlebox Brainstorms Configuration.lnk" 
+ Delete "$SMPROGRAMS\Puzzlebox Brainstorms\Uninstall Puzzlebox Brainstorms.lnk" 
+   RMDir "$SMPROGRAMS\Puzzlebox Brainstorms"
+ Delete "$DESKTOP\Puzzlebox Brainstorms.lnk"
 
 
@@ -237 +245 @@
 
 Delete "$INSTDIR\PuzzleboxBrainstorms-Uninstall.exe"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox\Puzzlebox Brainstorms"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox Brainstorms\Puzzlebox Brainstorms"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox Brainstorms"
 RMDir "$INSTDIR"