[or-cvs] r8811: torbutton installation moved to vidalia bundle, comment it o (tor/trunk/contrib)

[phobos at seul.org]

Author: phobos
Date: 2006-10-23 21:31:31 -0400 (Mon, 23 Oct 2006)
New Revision: 8811

Modified:
   tor/trunk/contrib/package_nsis-mingw.sh
   tor/trunk/contrib/tor-mingw.nsi.in
Log:
torbutton installation moved to vidalia bundle, comment it out but leave
it in as a reference


Modified: tor/trunk/contrib/package_nsis-mingw.sh
===================================================================
--- tor/trunk/contrib/package_nsis-mingw.sh	2006-10-23 23:08:27 UTC (rev 8810)
+++ tor/trunk/contrib/package_nsis-mingw.sh	2006-10-24 01:31:31 UTC (rev 8811)
@@ -25,7 +25,7 @@
 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/
+#cp contrib/torbutton-1.0.4-fx+tb.xpi win_tmp/bin/
 
 # There is no man2html in mingw.  
 # Maybe we should add this into make dist instead.

Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in	2006-10-23 23:08:27 UTC (rev 8810)
+++ tor/trunk/contrib/tor-mingw.nsi.in	2006-10-24 01:31:31 UTC (rev 8811)
@@ -120,19 +120,19 @@
    File "..\LICENSE"
 SectionEnd
 
-Section "TorButton for FireFox" Torbutton
-   SetOutPath $INSTDIR
-   File "${BIN}\torbutton-1.0.4-fx+tb.xpi"
+;Section "TorButton for FireFox" Torbutton
+;   SetOutPath $INSTDIR
+;   File "${BIN}\torbutton-1.0.4-fx+tb.xpi"
+;
+;   ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
+;   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
 
-   ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
-   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
 
 Section "Start Menu" StartMenu