[or-cvs] r18107: {torbrowser} Set up Vidalia to launch Firefox directly Remove FirefoxPort (in torbrowser/branches/altlauncher/build-scripts: . config)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2009-01-14 12:00:16 -0500 (Wed, 14 Jan 2009)
New Revision: 18107

Added:
   torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.altlauncher
Modified:
   torbrowser/branches/altlauncher/build-scripts/Makefile
Log:
Set up Vidalia to launch Firefox directly
Remove FirefoxPortable launcher
Update version number to 1.2.0rc
Rename Firefox executable to tbb-firefox.exe

Modified: torbrowser/branches/altlauncher/build-scripts/Makefile
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/Makefile	2009-01-14 16:55:42 UTC (rev 18106)
+++ torbrowser/branches/altlauncher/build-scripts/Makefile	2009-01-14 17:00:16 UTC (rev 18107)
@@ -16,7 +16,7 @@
 QT=/c/Qt/4.3.5/bin
 
 ## Location of bundle components
-VIDALIA=/c/build/vidalia-0.1.10
+VIDALIA=/c/build/vidalia-alt-launcher
 TOR=/c/build/tor-0.2.1.8-alpha
 POLIPO=/c/build/polipo-1.0.4
 FIREFOX_SRC=/c/build/FirefoxPortable-2.0.0.20
@@ -40,7 +40,7 @@
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.1.8
+VERSION=1.2.0-rc1
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
@@ -186,6 +186,9 @@
 	## Configure Firefox preferences
 	cp $(CONFIG_SRC)/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/
 	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/
+	## Set up alternate launcher
+	mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe
+	rm $(DEST)/FirefoxPortable/FirefoxPortable.exe
 	## Configure FirefoxPortable
 	cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable
 	cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable
@@ -200,7 +203,7 @@
 ifeq ($(USE_PIDGIN),1)
 	cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf
 else
-	cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf
+	cp $(CONFIG_SRC)/vidalia.conf.altlauncher $(DEST)/Data/Vidalia/vidalia.conf
 endif
 	## Configure Polipo
 	cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo
@@ -272,7 +275,7 @@
 	cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE)
 	## Install default extensions and everything from extensions directory
 	for extension in langpack_$(LANGCODE).xpi $(DEFAULT_EXTENSIONS) $(EXTENSIONS_DIR)/*.xpi $(EXTENSIONS_DIR)/*.jar; \
-	  do $(BUNDLE)/FirefoxPortable/App/firefox/firefox.exe \
+	  do $(BUNDLE)/FirefoxPortable/App/firefox/tbb-firefox.exe \
              -profile $(DUMMYPROFILE)/profile \
              -install-global-extension $$extension; \
           done

Added: torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.altlauncher
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.altlauncher	                        (rev 0)
+++ torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.altlauncher	2009-01-14 17:00:16 UTC (rev 18107)
@@ -0,0 +1,11 @@
+[General]
+BrowserDirectory=FirefoxPortable
+LanguageCode=en
+ProxyExecutable=App\\polipo.exe
+ProxyExecutableArguments=-c, Data\\Polipo\\polipo.conf
+RunProxyAtStart=true
+
+[Tor]
+ControlPort=9051
+TorExecutable=.\\App\\tor.exe
+Torrc=.\\Data\\Tor\\torrc