[or-cvs] r19483: {torbrowser} Merge altlauncher branch back into trunk (in torbrowser/trunk/build-scripts: . config)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2009-05-08 13:27:30 -0400 (Fri, 08 May 2009)
New Revision: 19483

Modified:
   torbrowser/trunk/build-scripts/Makefile
   torbrowser/trunk/build-scripts/config/vidalia.conf.ff
   torbrowser/trunk/build-scripts/config/vidalia.conf.ff+pidgin
Log:
Merge altlauncher branch back into trunk

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2009-05-08 16:15:11 UTC (rev 19482)
+++ torbrowser/trunk/build-scripts/Makefile	2009-05-08 17:27:30 UTC (rev 19483)
@@ -40,7 +40,7 @@
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.1.13-dev
+VERSION=1.2.0-rc5
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
@@ -195,6 +195,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/Data/settings
@@ -277,7 +280,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

Modified: torbrowser/trunk/build-scripts/config/vidalia.conf.ff
===================================================================
--- torbrowser/trunk/build-scripts/config/vidalia.conf.ff	2009-05-08 16:15:11 UTC (rev 19482)
+++ torbrowser/trunk/build-scripts/config/vidalia.conf.ff	2009-05-08 17:27:30 UTC (rev 19483)
@@ -1,5 +1,6 @@
 [General]
-BrowserExecutable=FirefoxPortable\\FirefoxPortable.exe
+BrowserDirectory=FirefoxPortable
+BrowserExecutable=tbb-firefox.exe
 LanguageCode=en
 ProxyExecutable=App\\polipo.exe
 ProxyExecutableArguments=-c, Data\\Polipo\\polipo.conf

Modified: torbrowser/trunk/build-scripts/config/vidalia.conf.ff+pidgin
===================================================================
--- torbrowser/trunk/build-scripts/config/vidalia.conf.ff+pidgin	2009-05-08 16:15:11 UTC (rev 19482)
+++ torbrowser/trunk/build-scripts/config/vidalia.conf.ff+pidgin	2009-05-08 17:27:30 UTC (rev 19483)
@@ -1,5 +1,6 @@
 [General]
-BrowserExecutable=FirefoxPortable\\FirefoxPortable.exe
+BrowserDirectory=FirefoxPortable
+BrowserExecutable=tbb-firefox.exe
 IMExecutable=PidginPortable\\PidginPortable.exe
 LanguageCode=en
 ProxyExecutable=App\\polipo.exe