Add the front end installer exe NSIS scripts for the bundle and net installer package...

svn:r18123

diff --git a/contrib/bundle.nsi b/contrib/bundle.nsi
new file mode 100644 (file)
index 0000000..639a29e
--- /dev/null
+++ b/contrib/bundle.nsi
@@ -0,0 +1,65 @@
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+!include "FileFunc.nsh"
+  
+!define VERSION "0.2.1.10"
+!define INSTALLER "TorBundle.exe"
+!define WEBSITE "https://www.torproject.org/"
+!define LICENSE "LICENSE"
+ 
+SetCompressor /SOLID BZIP2
+RequestExecutionLevel user
+OutFile ${INSTALLER}
+InstallDir "$LOCALAPPDATA\TorInstPkgs"
+SetOverWrite on
+Name "Tor ${VERSION} Bundle"
+Caption "Tor ${VERSION} Bundle Setup"
+BrandingText "Tor Bundle Installer"
+CRCCheck on
+XPStyle on
+ShowInstDetails hide
+VIProductVersion "${VERSION}"
+VIAddVersionKey "ProductName" "Tor"
+VIAddVersionKey "Comments" "${WEBSITE}"
+VIAddVersionKey "LegalTrademarks" "Three line BSD"
+VIAddVersionKey "LegalCopyright" "©2004-2009, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
+VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
+VIAddVersionKey "FileVersion" "${VERSION}"
+
+!define MUI_ICON "torinst32.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Section "Tor" Tor
+       SectionIn RO
+       SetOutPath $INSTDIR
+       Call ExtractPackages
+        Call RunInstallers
+       Call LaunchVidalia
+SectionEnd
+
+Function ExtractPackages
+       File "tor.msi"
+       File "torbutton.msi"
+       File "thandy.msi"
+       File "polipo.msi"
+       File "vidalia.msi"
+        File "tbcheck.bat"
+FunctionEnd
+
+Function RunInstallers
+       ExecWait 'msiexec /i "$INSTDIR\tor.msi" NOSC=1 /qn'
+       ExecWait 'msiexec /i "$INSTDIR\thandy.msi" NOSC=1 /qn'
+       ExecWait 'msiexec /i "$INSTDIR\polipo.msi" NOSC=1 /qn'
+       ExecWait 'msiexec /i "$INSTDIR\torbutton.msi" /qn'
+       ExecWait 'msiexec /i "$INSTDIR\vidalia.msi" /qn'
+        ExpandEnvStrings $0 %COMSPEC%
+        Exec '"$0" /C "$INSTDIR\tbcheck.bat"'
+FunctionEnd
+
+Function LaunchVidalia
+       SetOutPath "$LOCALAPPDATA\Programs\Vidalia"
+       Exec 'vidalia.exe -loglevel info -logfile log.txt'
+FunctionEnd
+

diff --git a/contrib/netinst.nsi b/contrib/netinst.nsi
new file mode 100644 (file)
index 0000000..8e3e53a
--- /dev/null
+++ b/contrib/netinst.nsi
@@ -0,0 +1,71 @@
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+!include "FileFunc.nsh"
+  
+!define VERSION "0.2.1.10"
+!define INSTALLER "TorNetInstaller.exe"
+!define WEBSITE "https://www.torproject.org/"
+!define LICENSE "LICENSE"
+ 
+SetCompressor /SOLID BZIP2
+RequestExecutionLevel user
+OutFile ${INSTALLER}
+InstallDir "$TEMP\TorInstTmp"
+SetOverWrite on
+Name "Tor Network Installer"
+Caption "Tor Network Installer"
+BrandingText "Tor Network Installer"
+CRCCheck on
+XPStyle on
+ShowInstDetails hide
+VIProductVersion "${VERSION}"
+VIAddVersionKey "ProductName" "Tor"
+VIAddVersionKey "Comments" "${WEBSITE}"
+VIAddVersionKey "LegalTrademarks" "Three line BSD"
+VIAddVersionKey "LegalCopyright" "©2004-2009, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
+VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
+VIAddVersionKey "FileVersion" "${VERSION}"
+
+!define MUI_ICON "torinst32.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Section "Tor" Tor
+       SectionIn RO
+       SetOutPath $INSTDIR
+       Call ExtractPackages
+        Call RunInstallers
+        Call LaunchVidalia
+       Call CleanUpTemp
+SectionEnd
+
+Function ExtractPackages
+       File "thandy.msi"
+FunctionEnd
+
+Function RunInstallers
+       ExecWait 'msiexec /i "$INSTDIR\thandy.msi" NOSC=1 /qn'
+       ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update "--repo=$LOCALAPPDATA\Thandy\Tor Updates" /bundleinfo/tor/win32/'
+       ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update "--repo=$LOCALAPPDATA\Thandy\Polipo Updates" /bundleinfo/polipo/win32/'
+       ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update "--repo=$LOCALAPPDATA\Thandy\TorButton Updates" /bundleinfo/torbutton/win32/'
+       ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update "--repo=$LOCALAPPDATA\Thandy\Vidalia Updates" /bundleinfo/vidalia/win32/'
+       ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\Tor Updates" /bundleinfo/tor/win32/'
+       ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\Polipo Updates" /bundleinfo/polipo/win32/'
+       ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\TorButton Updates" /bundleinfo/torbutton/win32/'
+       ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\Vidalia Updates" /bundleinfo/vidalia/win32/'
+        ExpandEnvStrings $0 %COMSPEC%
+        Exec '"$0" /C "$INSTDIR\tbcheck.bat"'
+FunctionEnd
+
+Function LaunchVidalia
+       SetOutPath "$LOCALAPPDATA\Programs\Vidalia"
+       Exec 'vidalia.exe -loglevel info -logfile log.txt'
+FunctionEnd
+
+Function CleanUpTemp
+       ExecWait '"del" "$INSTDIR\thandy.msi"'
+       SetOutPath $TEMP
+       RMDir /r $TEMP\TorInstTmp
+FunctionEnd
+

diff --git a/contrib/torinst32.ico b/contrib/torinst32.ico
new file mode 100644 (file)
index 0000000..ccbad9b
Binary files /dev/null and b/contrib/torinst32.ico differ