[or-cvs] r8768: Include torbutton in the base tor installation. If Firefox e (tor/trunk/contrib)

[phobos@xxxxxxxx]

Author: phobos
Date: 2006-10-19 20:25:03 -0400 (Thu, 19 Oct 2006)
New Revision: 8768

Modified:
   tor/trunk/contrib/package_nsis-mingw.sh
   tor/trunk/contrib/tor-mingw.nsi.in
Log:
Include torbutton in the base tor installation.  If Firefox exists,
install torbutton for all profiles.


Modified: tor/trunk/contrib/package_nsis-mingw.sh
===================================================================
--- tor/trunk/contrib/package_nsis-mingw.sh	2006-10-20 00:12:02 UTC (rev 8767)
+++ tor/trunk/contrib/package_nsis-mingw.sh	2006-10-20 00:25:03 UTC (rev 8768)
@@ -23,6 +23,8 @@
 cp /usr/local/ssl/lib/libcrypto.a win_tmp/bin/
 cp /usr/local/ssl/lib/libssl.a win_tmp/bin/
 cp contrib/tor.ico win_tmp/bin/
+
+# YOU must copy torbutton xpi into the contrib dir
 cp contrib/torbutton-1.0.4-fx+tb.xpi win_tmp/bin/
 
 # There is no man2html in mingw.  

Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in	2006-10-20 00:12:02 UTC (rev 8767)
+++ tor/trunk/contrib/tor-mingw.nsi.in	2006-10-20 00:25:03 UTC (rev 8768)
@@ -10,12 +10,10 @@
 !define WEBSITE "http://tor.eff.org/";
 
 !define LICENSE "LICENSE"
-;BIN is where it expects to find tor.exe, tor-resolve.exe, libcrypto.a
-;and libssl.a
+;BIN is where it expects to find tor.exe, tor-resolve.exe, libcrypto.a and libssl.a
 !define BIN "..\bin"
 
 SetCompressor lzma
-;SetCompressor zlib
 OutFile ${INSTALLER}
 InstallDir $PROGRAMFILES\Tor
 SetOverWrite ifnewer
@@ -33,9 +31,6 @@
 VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at http://tor.eff.org/";
 VIAddVersionKey "FileVersion" "${VERSION}"
 
-;Use upx on the installer header to shrink the size.
-;!packhdr header.dat "upx --best header.dat"
-
 !define MUI_WELCOMEPAGE_TITLE "Welcome to the Tor ${VERSION} Setup Wizard"
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Tor ${VERSION}.\r\n\r\nIf you have previously installed Tor and it is currently running, please exit Tor first before continuing this installation.\r\n\r\n$_CLICK"
 !define MUI_ABORTWARNING
@@ -130,14 +125,12 @@
    File "${BIN}\torbutton-1.0.4-fx+tb.xpi"
 
    ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
-   ; This message box is for debugging
-   MessageBox MB_OK "Firefox is installed at $1"
-     StrCmp $1 "" +4 0 ; if Path is empty or null, then skip to an error, otherwise proceed normally
-        ; This message box is for debugging
-        MessageBox MB_OK "I'm going to run $1firefox.exe --install-global-extension $INSTDIR\torbutton"
-	Exec '"$1firefox.exe" -install-global-extension $INSTDIR\torbutton-1.0.4-fx+tb.xpi'
+   StrCmp $1 "" +2 0 ; if Path is empty or null, then skip to an error, otherwise proceed
+	Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\torbutton-1.0.4-fx+tb.xpi"'
+	DetailPrint "Torbutton installed"
 	Goto +2
 	MessageBox MB_OK|MB_ICONSTOP "FireFox wasn't found on your system.  Not installing Torbutton."
+	DetailPrint "Firefox NOT found."
 SectionEnd
 
 SubSection /e "Shortcuts" Shortcuts