[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r22659: {torbrowser} Add and update some config files, update Makefile for bundle (in torbrowser/trunk: build-scripts build-scripts/config src/RelativeLink)

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] r22659: {torbrowser} Add and update some config files, update Makefile for bundle (in torbrowser/trunk: build-scripts build-scripts/config src/RelativeLink)
From: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Mon, 19 Jul 2010 13:30:39 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Mon, 19 Jul 2010 09:30:46 -0400
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: erinn
Date: 2010-07-19 13:30:39 +0000 (Mon, 19 Jul 2010)
New Revision: 22659

Added:
   torbrowser/trunk/build-scripts/config/PkgInfo
   torbrowser/trunk/build-scripts/config/qt.conf
   torbrowser/trunk/build-scripts/config/torrc-osx
Modified:
   torbrowser/trunk/build-scripts/Makefile.osx
   torbrowser/trunk/build-scripts/config/vidalia.conf.ff-osx
   torbrowser/trunk/src/RelativeLink/RelativeLinkOSX.sh
Log:
Add and update some config files, update Makefile for bundle creation

Modified: torbrowser/trunk/build-scripts/Makefile.osx
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.osx	2010-07-19 13:30:33 UTC (rev 22658)
+++ torbrowser/trunk/build-scripts/Makefile.osx	2010-07-19 13:30:39 UTC (rev 22659)
@@ -191,7 +191,7 @@
 TOR=$(COMPILED_BINS)/tor
 POLIPO=$(COMPILED_BINS)/polipo
 ## Someday, this will be our custom Firefox
-FIREFOX=$(FETCH_DIR)/Firefox
+FIREFOX=$(FETCH_DIR)/Firefox.app
 PIDGIN=$(COMPILED_BINS)/pidgin
 
 ## Location of utility applications
@@ -226,7 +226,9 @@
 endif
 
 ## Extensions to install by default
-DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi betterprivacy.xpi
+DEFAULT_EXTENSIONS=torbutton.xpi
+#betterprivacy.xpi
+#noscript.xpi
 
 ## Where to download Torbutton from
 #TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail
@@ -234,7 +236,7 @@
 NOSCRIPT=http://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi
 BETTERPRIVACY=http://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
 ## Where to download Mozilla language packs
-MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/xpi
+MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.4/linux-i686/xpi
 
 ## Put more extensions here
 EXTENSIONS_DIR=extensions
@@ -306,22 +308,31 @@
 directory-structure: 
 	rm -fr $(DEST)
 	mkdir -p $(APPDIR)
+	mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile
+	mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins
 	mkdir -p $(LIBSDIR)
 	mkdir -p $(DATADIR)/Tor
 	mkdir -p $(DATADIR)/Vidalia
 	mkdir -p $(DATADIR)/Polipo
-	mkdir -p $(DATADIR)/profile
 	mkdir -p $(DOCSDIR)
 	mkdir -p $(TB_TMPDIR)
 
 ## Package up all the Vidalia and Tor pre-requisites
 ## Firefox and Pidgin are installed in their own targets
 install-qt:
+	mkdir -p $(BUNDLE)/Contents/Frameworks/QtGui.framework/Versions/4
+	mkdir -p $(BUNDLE)/Contents/Frameworks/QtCore.framework/Versions/4
+	mkdir -p $(BUNDLE)/Contents/Frameworks/QtNetwork.framework/Versions/4
+	mkdir -p $(BUNDLE)/Contents/Frameworks/QtXml.framework/Versions/4
 	# copy the frameworks
-	cp -R /Library/Frameworks/QtGui.framework $(BUNDLE)/Contents/Frameworks
-	cp -R /Library/Frameworks/QtCore.framework $(BUNDLE)/Contents/Frameworks
-	cp -R /Library/Frameworks/QtNetwork.framework $(BUNDLE)/Contents/Frameworks
-	cp -R /Library/Frameworks/QtXml.framework $(BUNDLE)/Contents/Frameworks
+	cp -R /Library/Frameworks/QtGui.framework/QtGui $(BUNDLE)/Contents/Frameworks/QtGui.framework/
+	cp -R /Library/Frameworks/QtGui.framework/Versions/4/QtGui $(BUNDLE)/Contents/Frameworks/QtGui.framework/Versions/4
+	cp -R /Library/Frameworks/QtCore.framework/QtCore $(BUNDLE)/Contents/Frameworks/QtCore.framework/
+	cp -R /Library/Frameworks/QtCore.framework/Versions/4/QtCore $(BUNDLE)/Contents/Frameworks/QtCore.framework/Versions/4
+	cp -R /Library/Frameworks/QtNetwork.framework/QtNetwork $(BUNDLE)/Contents/Frameworks/QtNetwork.framework/
+	cp -R /Library/Frameworks/QtNetwork.framework/Versions/4/QtNetwork $(BUNDLE)/Contents/Frameworks/QtNetwork.framework/Versions/4
+	cp -R /Library/Frameworks/QtXml.framework/QtXml $(BUNDLE)/Contents/Frameworks/QtXml.framework/
+	cp -R /Library/Frameworks/QtXml.framework/Versions/4/QtXml $(BUNDLE)/Contents/Frameworks/QtXml.framework/Versions/4
 	# do the funky install_name_tool chicken dance for Qt framework & Vidalia
 	install_name_tool -id @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore \
 	$(BUNDLE)/Contents/Frameworks/QtCore.framework/Versions/4/QtCore
@@ -352,9 +363,9 @@
 	cp -R $(LIBEVENT)/libevent.a  $(LIBEVENT)/libevent_core.a $(LIBEVENT)/libevent_extra.a \
 	   $(LIBEVENT)/libevent.la $(LIBEVENT)/libevent_core.la $(LIBEVENT)/libevent_extra.la $(LIBSDIR)
 	# OpenSSL
-	#cp -R $(OPENSSL)/libcrypto.dylib $(OPENSSL)/libcrypto.0.9.7.dylib $(OPENSSL)/libssl.dylib \
+	cp -R $(OPENSSL)/libcrypto.dylib $(OPENSSL)/libcrypto.0.9.7.dylib $(OPENSSL)/libssl.dylib \
 	   $(OPENSSL)/libssl.0.9.7.dylib $(LIBSDIR)
-	cp -R $(OPENSSL)/libcrypto* $(OPENSSL)/libssl* $(LIBSDIR)
+	#cp -R $(OPENSSL)/libcrypto* $(OPENSSL)/libssl* $(LIBSDIR)
 	# Vidalia
 	cp $(VIDALIA) $(APPDIR)
 	# Polipo
@@ -380,8 +391,8 @@
 install-firefox:
 	cp -R $(FIREFOX) $(APPDIR)
 	# Due to various issues with a broken libxml2, we'll remove these...
-	rm -f $(APPDIR)/Firefox/components/libnkgnomevfs.so
-	rm -f $(APPDIR)/Firefox/components/libmozgnome.so
+	#rm -f $(APPDIR)/Firefox/components/libnkgnomevfs.so
+	#rm -f $(APPDIR)/Firefox/components/libmozgnome.so
 
 ## Copy over Pidgin
 install-pidgin:
@@ -393,10 +404,12 @@
 configure-apps:
 	## Configure Firefox preferences
 	#mkdir -p $(DEST)/.mozilla/Firefox/firefox.default
-	cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Contents/Resources/Data/profiles.ini
-	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Contents/Resources/Data/profile
-	cp $(CONFIG_SRC)/linux-prefs.js $(DEST)/Contents/Resources/Data/profile/prefs.js
+	cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini
+	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile
+	cp $(CONFIG_SRC)/linux-prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
 	cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents
+	cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents
+	cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/Resources
 	## Configure Pidgin
 ifeq ($(USE_PIDGIN),1)
 	mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
@@ -411,7 +424,7 @@
 	## Configure Polipo
 	cp $(CONFIG_SRC)/polipo.conf $(DEST)/Contents/Resources/Data/Polipo/polipo.conf
 	## Configure Tor
-	cp $(CONFIG_SRC)/torrc-linux $(DEST)/Contents/Resources/Data/Tor/torrc
+	cp $(CONFIG_SRC)/torrc-osx $(DEST)/Contents/Resources/Data/Tor/torrc
 	cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip
 	chmod 700 $(DATADIR)/Tor
 
@@ -423,7 +436,7 @@
 strip-it-stripper:
 	strip $(APPDIR)/tor
 	strip $(APPDIR)/polipo
-	strip $(APPDIR)/Vidalia
+	#strip $(APPDIR)/Vidalia
 	#strip $(LIBSDIR)/*
 
 ##
@@ -458,7 +471,6 @@
 	LANGCODE=$* make -f Makefile.osx bundle-localized
 compressed-bundle_%:
 	LANGCODE=$* make -f Makefile.osx compressed-bundle-localized
-
 bundle-localized_%.stamp:
 	make -f Makefile.osx copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final
 	touch bundle-localized_$*.stamp
@@ -486,17 +498,17 @@
 		do \
 			cp $$extension $$extension.zip; \
 			ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>\(.*\)</em:id>#\1#p;q;}'); \
-			mkdir -p $(BUNDLE)/Library/Application\ Support/Mozilla/Extensions/$(FF_VENDOR_ID)/$$ext_id; \
-			cp $$extension $(BUNDLE)/Library/Application\ Support/Mozilla/Extensions/$(FF_VENDOR_ID)/$$ext_id/$$extension.zip; \
-			(cd $(BUNDLE)/Library/Application\ Support/Mozilla/Extensions/$(FF_VENDOR_ID)/$$ext_id/ && unzip *.zip && rm *.zip); \
+			mkdir -p $(BUNDLE)/Library/Application\ Support/$(FF_VENDOR_ID)/Extensions/$$ext_id; \
+			cp $$extension $(BUNDLE)/Library/Application\ Support/$(FF_VENDOR_ID)/Extensions/$$ext_id/$$extension.zip; \
+			(cd $(BUNDLE)/Library/Application\ Support/$(FF_VENDOR_ID)/Extensions/$$ext_id/ && unzip *.zip && rm *.zip); \
 		done
 
 ## Language extensions need to be handled differently from other extensions
 install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
 ifneq ($(LANGCODE), en-US)
-	mkdir -p $(BUNDLE)/Contents/Resources/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org
-	cp langpack_$(LANGCODE).xpi $(BUNDLE)/Contents/Resources/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org/langpack_$(LANGCODE).zip
-	(cd $(BUNDLE)/Contents/Resources/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org && unzip *.zip && rm *.zip)
+	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/default/langpack-$(LANGCODE)@firefox.mozilla.org
+	cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/default/langpack-$(LANGCODE)@firefox.mozilla.org/langpack_$(LANGCODE).zip
+	(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/default/langpack-$(LANGCODE)@firefox.mozilla.org && unzip *.zip && rm *.zip)
 endif
 
 ## Set the language for Vidalia
@@ -516,16 +528,17 @@
 patch-firefox-language:
 	## Patch the default Firefox prefs.js
 	## Don't use {} because they aren't always interpreted correctly. Thanks, sh. 
-	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Contents/MacOS/Firefox/defaults/profile/
-	cp $(CONFIG_SRC)/linux-prefs.js $(BUNDLE)/Contents/MacOS/Firefox/defaults/profile/prefs.js
-	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Contents/Resources/Data/profile
-	cp $(CONFIG_SRC)/linux-prefs.js $(BUNDLE)/Contents/Resources/Data/profile/prefs.js
-	./patch-firefox-language.sh $(BUNDLE)/Contents/MacOS/Firefox/defaults/profile/prefs.js $(LANGCODE) -e
+	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile/
+	cp $(CONFIG_SRC)/linux-prefs.js $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile/prefs.js
+	cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile
+	cp $(CONFIG_SRC)/linux-prefs.js $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
+	./patch-firefox-language.sh $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile/prefs.js $(LANGCODE) -e
+	./patch-firefox-language.sh $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js $(LANGCODE) -e
 
 ## Fix prefs.js since extensions.checkCompatibility, false doesn't work
 update-extension-pref:
-	ext_ver=$$(sed -n '/em:version/{s,.*="\(.*\)".*,\1,p;q;}' $(BUNDLE)/Contents/Resources/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org/install.rdf); \
-	sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Contents/Resources/Data/profile/prefs.js
+	ext_ver=$$(sed -n '/em:version/{s,.*="\(.*\)".*,\1,p;q;}' $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org/install.rdf); \
+	sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
 
 final: install-qt
 	mv $(BUNDLE) $(BUNDLE).app

Added: torbrowser/trunk/build-scripts/config/PkgInfo
===================================================================
--- torbrowser/trunk/build-scripts/config/PkgInfo	                        (rev 0)
+++ torbrowser/trunk/build-scripts/config/PkgInfo	2010-07-19 13:30:39 UTC (rev 22659)
@@ -0,0 +1 @@
+TORBROWSER

Added: torbrowser/trunk/build-scripts/config/qt.conf
===================================================================
--- torbrowser/trunk/build-scripts/config/qt.conf	                        (rev 0)
+++ torbrowser/trunk/build-scripts/config/qt.conf	2010-07-19 13:30:39 UTC (rev 22659)
@@ -0,0 +1,2 @@
+[Paths]
+Plugins =

Added: torbrowser/trunk/build-scripts/config/torrc-osx
===================================================================
--- torbrowser/trunk/build-scripts/config/torrc-osx	                        (rev 0)
+++ torbrowser/trunk/build-scripts/config/torrc-osx	2010-07-19 13:30:39 UTC (rev 22659)
@@ -0,0 +1,11 @@
+# If non-zero, try to write to disk less frequently than we would otherwise.
+AvoidDiskWrites 1
+# Store working data, state, keys, and caches here.
+DataDirectory ./Contents/Resources/Data/Tor
+GeoIPFile ./Contents/ResourcesData/Tor/geoip
+# Where to send logging messages.  Format is minSeverity[-maxSeverity]
+# (stderr|stdout|syslog|file FILENAME).
+Log notice stdout
+# Bind to this address to listen to connections from SOCKS-speaking
+# applications.
+SocksListenAddress 127.0.0.1

Modified: torbrowser/trunk/build-scripts/config/vidalia.conf.ff-osx
===================================================================
--- torbrowser/trunk/build-scripts/config/vidalia.conf.ff-osx	2010-07-19 13:30:33 UTC (rev 22658)
+++ torbrowser/trunk/build-scripts/config/vidalia.conf.ff-osx	2010-07-19 13:30:39 UTC (rev 22659)
@@ -1,27 +1,12 @@
 [General]
 BrowserDirectory=.
-BrowserExecutable=firefox-bin
+BrowserExecutable=Contents/MacOS/firefox-bin
 LanguageCode=es
-ProxyExecutable=./Contents/MacOS/polipo
-ProxyExecutableArguments=-c ./Contents/Resources/Data/Polipo/polipo.conf
+ProxyExecutable=Contents/MacOS/polipo
+ProxyExecutableArguments=-c Contents/Resources/Data/Polipo/polipo.conf
 RunProxyAtStart=true
 
 [Tor]
 ControlPort=9051
-TorExecutable=./Contents/MacOS/tor
-Torrc=./Contents/Resources/Data/Tor/torrc
-
-[MessageLog]
-Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1@\0\0\0\xda\0\0\x3\xf9\0\0\x3`\0\0\x1@\0\0\0\xf0\0\0\x3\xf9\0\0\x3`\0\0\0\0\0\0)
-
-[ConfigDialog]
-Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1@\0\0\0\xda\0\0\x3\x97\0\0\x2\x7f\0\0\x1@\0\0\0\xf0\0\0\x3\x97\0\0\x2\x7f\0\0\0\0\0\0)
-
-[BandwidthGraph]
-Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x1\x1a\0\0\0.\0\0\0\0\0\0\0\0\0\0\x1\x1a\0\0\0.\0\0\0\0\0\0)
-
-[NetViewer]
-Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1@\0\0\0\xda\0\0\x4\x8b\0\0\x3\x43\0\0\x1@\0\0\0\xf0\0\0\x4\x8b\0\0\x3\x43\0\0\0\0\0\0)
-
-[MainWindow]
-Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1|\0\0\0\xa4\0\0\x3\x82\0\0\x2\x61\0\0\x1|\0\0\0\xba\0\0\x3\x82\0\0\x2\x61\0\0\0\0\0\0)
+TorExecutable=Contents/MacOS/tor
+Torrc=Contents/Resources/Data/Tor/torrc

Modified: torbrowser/trunk/src/RelativeLink/RelativeLinkOSX.sh
===================================================================
--- torbrowser/trunk/src/RelativeLink/RelativeLinkOSX.sh	2010-07-19 13:30:33 UTC (rev 22658)
+++ torbrowser/trunk/src/RelativeLink/RelativeLinkOSX.sh	2010-07-19 13:30:39 UTC (rev 22659)
@@ -16,11 +16,8 @@
 
 # If ${PWD} results in a zero length HOME, we can try something else...
 HOME="${0%%Contents/MacOS/TorBrowserBundle}"
-export $HOME
+export HOME
 
-#echo $(date) $HOME >/tmp/testlog
-echo $HOME $(date) /tmp/testlog
-
 DYLD_LIBRARY_PATH=${HOME}/Contents/Frameworks
 export LDPATH
 export DYLD_LIBRARY_PATH
@@ -54,5 +51,4 @@
 # not in debug mode, run proceed normally
 printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n"
 cd "${HOME}"
-exec "$HOME/Contents/MacOS/Vidalia --datadir $HOME/Contents/Resources/Data/Vidalia/"
-printf "\nExited cleanly. Goodbye.\n"
+$HOME/Contents/MacOS/Vidalia --datadir $HOME/Contents/Resources/Data/Vidalia/
Prev by Author: [or-cvs] r22658: {torbrowser} Add Qt app support (torbrowser/trunk/build-scripts)
Next by Author: [or-cvs] r22701: {website} bump alpha win32 vidalia bundle version to 0.2.2.14-alpha (website/trunk/include)
Previous by thread: [or-cvs] r22658: {torbrowser} Add Qt app support (torbrowser/trunk/build-scripts)
Next by thread: [or-cvs] r22660: {website} update to the current publish script. (website/trunk)
Index(es):
- Author
- Thread