[or-cvs] r20399: {torbrowser} This builds a full bundle, properly patches the language and (torbrowser/trunk/build-scripts)

[ioerror at seul.org]

Author: ioerror
Date: 2009-08-27 15:05:52 -0400 (Thu, 27 Aug 2009)
New Revision: 20399

Modified:
   torbrowser/trunk/build-scripts/Makefile.linux
Log:
This builds a full bundle, properly patches the language and does so from an empty directory.
It is currently missing:
A working Polipo (the binary is file, Vidalia fails to start it)
A proper Torbutton plugin installation


Modified: torbrowser/trunk/build-scripts/Makefile.linux
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.linux	2009-08-27 19:03:47 UTC (rev 20398)
+++ torbrowser/trunk/build-scripts/Makefile.linux	2009-08-27 19:05:52 UTC (rev 20399)
@@ -372,10 +372,10 @@
 	cp $(CONFIG_SRC)/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf
 endif
 	## Configure Polipo
-	cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo
+	cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo/polipo.conf
 	## Configure Tor
 	cp $(CONFIG_SRC)/torrc-linux $(DEST)/Data/Tor/torrc
-	cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor
+	cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip
 
 # We've replaced the custom C program with a shell script for now...
 launcher:
@@ -450,7 +450,7 @@
 ## Set the language for Vidalia
 patch-vidalia-language:
 	## Patch Vidalia
-	./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE)
+	./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) -n
 
 ## Set the language for Pidgin
 patch-pidgin-language:
@@ -462,8 +462,9 @@
 endif
 
 patch-firefox-language:
-	## Patch Firefox prefs.js
-	./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE)
+	## Patch the default Firefox prefs.js
+	cp $(CONFIG_SRC)/{bookmarks.html,prefs.js} $(BUNDLE)/App/firefox/defaults/profile/
+	./patch-firefox-language.sh $(BUNDLE)/App/firefox/defaults/profile/prefs.js $(LANGCODE) -n
 
 ###
 ### Utilities