[or-cvs] r21845: {torbrowser} update some paths and names, shuffle some files (torbrowser/trunk/build-scripts)

[Erinn Clark]

Author: erinn
Date: 2010-03-07 09:36:48 +0000 (Sun, 07 Mar 2010)
New Revision: 21845

Modified:
   torbrowser/trunk/build-scripts/Makefile.linux
Log:
update some paths and names, shuffle some files

Modified: torbrowser/trunk/build-scripts/Makefile.linux
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.linux	2010-03-07 03:07:53 UTC (rev 21844)
+++ torbrowser/trunk/build-scripts/Makefile.linux	2010-03-07 09:36:48 UTC (rev 21845)
@@ -3,8 +3,8 @@
 ###
 ### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
 ### Copyright 2009 Jacob Appelbaum <jacob at appelbaum.net>
+### Copyright 2010 Erinn Clark <erinn at torproject.org>
 ###
-###
 ### You want to do the following currently supported activities:
 # This downloads and compiles everything
 ### make -f Makefile.linux build-all-binaries
@@ -194,10 +194,10 @@
 CONFIG_SRC=config
 
 ## Destination for the generic bundle
-DEST=Generic\ Bundle
+DEST=generic-bundle
 
 ## Name of the bundle
-NAME=Tor\ Browser
+NAME=tor-browser
 
 ## Where shall we put the finished files for distribution?
 DISTDIR=tbbl-dist
@@ -274,7 +274,7 @@
 	split-bundle_pt-PT \
 	split-bundle_ru \
 	split-bundle_zh-CN \
-	split-bundle_it
+	split-bundle_it 
 
 ##
 ## Cleanup
@@ -323,6 +323,7 @@
 	mkdir -p $(DATADIR)/Tor
 	mkdir -p $(DATADIR)/Vidalia
 	mkdir -p $(DATADIR)/Polipo
+	mkdir -p $(DATADIR)/profile
 	mkdir -p $(DOCSDIR)
 	mkdir -p $(TB_TMPDIR)
 
@@ -382,9 +383,9 @@
 ## Configure Firefox, Vidalia, Polipo and Tor
 configure-apps:
 	## Configure Firefox preferences
-	mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
-	cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/.mozilla/Firefox/profiles.ini
-	cp $(CONFIG_SRC)/{bookmarks.html,prefs.js} $(DEST)/.mozilla/Firefox/firefox.default/
+	#mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
+	cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Data/profiles.ini
+	cp $(CONFIG_SRC)/{bookmarks.html,prefs.js} $(DEST)/Data/profile
 	## Configure Pidgin
 ifeq ($(USE_PIDGIN),1)
 	mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
@@ -404,8 +405,8 @@
 
 # We've replaced the custom C program with a shell script for now...
 launcher:
-	cp ../src/RelativeLink/RelativeLink.sh $(DEST)/"Start Tor Browser"
-	chmod +x $(DEST)/"Start Tor Browser"
+	cp ../src/RelativeLink/RelativeLink.sh $(DEST)/start-tor-browser
+	chmod +x $(DEST)/start-tor-browser
 
 strip-it-stripper:
 	strip $(APPDIR)/tor
@@ -492,7 +493,9 @@
 patch-firefox-language:
 	## Patch the default Firefox prefs.js
 	cp $(CONFIG_SRC)/{bookmarks.html,prefs.js} $(BUNDLE)/App/Firefox/defaults/profile/
+	cp $(CONFIG_SRC)/{bookmarks.html,prefs.js} $(BUNDLE)/Data/profile
 	./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e
+	./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e
 
 ###
 ### Utilities