- tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Provide some lower2upper mappings for package names
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 6c41c96e85bfb72836d782b626dc1b033bc93bbb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 09:06:39 2012 +0100 Provide some lower2upper mappings for package names We need these later, when we are fed lower-case strings and want them to be in upper case for our internal variables --- build-scripts/versions.mk | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index d021f5f..8baed26 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -46,6 +46,19 @@ TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… +# Provide some mappings between lower and upper case, which means we don't need +# to rely on shell shenanigans when we need the upper case version. This is +# necessary because our targets are lowercase, and our variables uppercase. +zlib=ZLIB +libpng=LIBPNG +qt=QT +openssl=OPENSSL +vidalia=VIDALIA +libevent=LIBEVENT +tor=TOR +firefox=FIREFOX +pidgin=PIDGIN + fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox -mkdir $(FETCH_DIR)

1 0

[torbrowser/maint-2.3] Update the unpack- targets with correct dependencies
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 48047444750af0cba78c6faab7f26d0c12dd4bde Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 12:19:32 2012 +0100 Update the unpack- targets with correct dependencies We also use tar -m here, to not confuse make about extraction time. --- build-scripts/versions.mk | 53 +++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 23 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e4191e9..9bd254d 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -63,7 +63,7 @@ pidgin=PIDGIN # The locations of the unpacked tarballs ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) -QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) +QT_DIR=$(FETCH_DIR)/qt-$(QT_VER) OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) @@ -127,33 +127,35 @@ $(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) rm -rf $(ZLIB_DIR) cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) -unpack-libpng: - -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) - cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE) +$(LIBPNG_DIR): $(FETCH_DIR)/$(LIBPNG_PACKAGE) + rm -rf $(LIBPNG_DIR) + cd $(FETCH_DIR) && tar -xmf $(LIBPNG_PACKAGE) -unpack-qt: - -rm -rf $(FETCH_DIR/qt-$(QT_VER) - cd $(FETCH_DIR) && tar -xvzf $(QT_PACKAGE) -unpack-openssl: - -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) - cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) +$(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) + rm -rf $(QT_DIR) $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) + cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) + mv $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR) -unpack-vidalia: - -rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER) - cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) +$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) + rm -rf $(OPENSSL_DIR) + cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -unpack-libevent: - -rm -rf $(FETCH_DIR)/libevent-$(LIBEVENT_VER) - cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) +$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) + rm -rf $(VIDALIA_DIR) + cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -unpack-tor: - -rm -rf $(FETCH_DIR)/tor-$(TOR_VER) - cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) +$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) + rm -rf $(LIBEVENT_DIR) + cd $(FETCH_DIR) && tar -xmf $(LIBEVENT_PACKAGE) -unpack-firefox: - -rm -rf $(FETCH_DIR)/mozilla-release - cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE) +$(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) + rm -rf $(TOR_DIR) + cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) + +$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* + rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-release + cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) mv $(FETCH_DIR)/mozilla-release $(FIREFOX_DIR) cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) @@ -164,4 +166,9 @@ clean-fetch-%: clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox -.PHONY: clean-fetch +clean-unpack-%: + rm -rf $($($*)_DIR) + +clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox + +.PHONY: clean-fetch clean-unpack

1 0

[torbrowser/maint-2.3] Define variables before including versions.mk
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 08e9eef89e2c7cf788885d177cc0c710d34bd61e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 11:12:24 2012 +0100 Define variables before including versions.mk Otherwise, the FETCH_DIR variable won't be there when targets and prerequisites are defined --- build-scripts/linux.mk | 6 +++--- build-scripts/osx.mk | 5 +++-- build-scripts/windows.mk | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 742bc65..cc19344 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -31,9 +31,6 @@ ### Configuration ### ##################### -## Include versions -include $(PWD)/versions.mk - ## Architecture ARCH_TYPE=$(shell uname -m) BUILD_NUM=7.2 @@ -49,6 +46,9 @@ FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE) BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL +## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now." diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e8fe22a..b00b9fc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -31,8 +31,6 @@ ### Configuration ### ##################### -## Include versions -include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 @@ -60,6 +58,9 @@ FETCH_DIR=$(PWD)/build-$(ARCH_TYPE) BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbosx-dist +## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now." diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8c00ff5..e27dd37 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -29,8 +29,6 @@ ### Configuration ### ##################### -## Include versions -include $(PWD)/versions.mk BUILD_NUM=7.1 PLATFORM=Windows @@ -70,6 +68,9 @@ FETCH_DIR=$(PWD)/build-alpha-windows BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist +## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now."

1 0

[torbrowser/maint-2.3] Make windows-4.0.js more like no-polipo-4.0.js
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 16d8869d1a8a6585037d669cd997b5c755b0d84c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 22:25:16 2012 +0100 Make windows-4.0.js more like no-polipo-4.0.js --- build-scripts/config/windows-4.0.js | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index c06f9e9..da7a878 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -69,13 +69,8 @@ user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6f user_pref("extensions.enabledScopes", 1); user_pref("extensions.pendingOperations", false); user_pref("extensions.torbutton.fresh_install", false); -user_pref("extensions.torbutton.http_port", 8118); -user_pref("extensions.torbutton.http_proxy", "127.0.0.1"); -user_pref("extensions.torbutton.https_port", 8118); -user_pref("extensions.torbutton.https_proxy", "127.0.0.1"); user_pref("extensions.torbutton.locked_mode", true); user_pref("extensions.torbutton.normal_exit", true); -user_pref("extensions.torbutton.proxies_applied", true); user_pref("extensions.torbutton.restore_tor", true); user_pref("extensions.torbutton.saved.auto_update", false); user_pref("extensions.torbutton.saved.share_proxy_settings", false); @@ -93,10 +88,10 @@ user_pref("extensions.update.notifyUser", true); user_pref("general.appname.override", "Netscape"); user_pref("general.appversion.override", "5.0 (Windows; en-US)"); user_pref("general.buildID.override", "0"); +user_pref("general.useragent.locale", "SHPONKA"); user_pref("general.oscpu.override", "Windows NT 6.1"); user_pref("general.platform.override", "Win32"); user_pref("general.productSub.override", "20100401"); -user_pref("general.useragent.locale", "SHPONKA"); user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"); user_pref("general.useragent.vendor", ""); user_pref("general.useragent.vendorSub", ""); @@ -121,14 +116,9 @@ user_pref("network.protocol-handler.warn-external.mailto", true); user_pref("network.protocol-handler.warn-external.news", true); user_pref("network.protocol-handler.warn-external.nntp", true); user_pref("network.protocol-handler.warn-external.snews", true); -user_pref("network.proxy.http", "127.0.0.1"); -user_pref("network.proxy.http_port", 8118); -user_pref("network.proxy.no_proxies_on", "127.0.0.1"); user_pref("network.proxy.socks", "127.0.0.1"); user_pref("network.proxy.socks_port", 9050); user_pref("network.proxy.socks_remote_dns", true); -user_pref("network.proxy.ssl", "127.0.0.1"); -user_pref("network.proxy.ssl_port", 8118); user_pref("network.proxy.type", 1); user_pref("network.security.ports.banned", "8118,8123,9050,9051"); user_pref("noscript.ABE.enabled", false); @@ -138,10 +128,10 @@ user_pref("noscript.autoReload", false); user_pref("noscript.contentBlocker", true); user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); user_pref("noscript.firstRunRedirection", false); -user_pref("noscript.forbidWebGL", true); user_pref("noscript.global", true); user_pref("noscript.gtemp", ""); user_pref("noscript.opacizeObject", 3); +user_pref("noscript.forbidWebGL", true); user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); user_pref("noscript.policynames", ""); user_pref("noscript.secureCookies", true);

1 0

[torbrowser/maint-2.2] Don't install openssl manpages
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 867b18767f0598c4f5a0d092bbfb8ef36f3ee32b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 5 04:50:10 2012 +0100 Don't install openssl manpages This takes a long time, and we never use the manpages anyway. --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 18ce2ba..8d2febd 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -71,7 +71,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install + cd $(OPENSSL_DIR) && make install_sw touch build-openssl QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 44157c5..6e5ae1d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -85,7 +85,7 @@ endif cd $(OPENSSL_DIR) && make depend # Do not use -j for the following make call, random build errors might happen. cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install + cd $(OPENSSL_DIR) && make install_sw touch build-openssl diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 28521f0..73a1b4f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -84,7 +84,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install + cd $(OPENSSL_DIR) && make install_sw touch build-openssl VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB)

1 0

[torbrowser/maint-2.3] Move the $package_DIR variables to versions.mk
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit a3864fee852f9d72277d01641b2601ae32872fd7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 17:51:38 2012 +0100 Move the $package_DIR variables to versions.mk On Windows, where we need a special directory structure due to the mozilla-build stuff, we use the REAL_FIREFOX_DIR variable to overwrite what we'd otherwise set in versions.mk --- build-scripts/linux.mk | 8 -------- build-scripts/osx.mk | 8 +------- build-scripts/versions.mk | 12 ++++++++++++ build-scripts/windows.mk | 6 ------ 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index cc19344..5073b70 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -52,14 +52,12 @@ include $(PWD)/versions.mk source-dance: fetch-source unpack-source echo "We're ready for building now." -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) build-zlib: cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib build-openssl: cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) @@ -67,7 +65,6 @@ build-openssl: cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install -QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: @@ -75,28 +72,24 @@ build-qt: cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make -j $(NUM_CORES) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_OPTS=--prefix=$(BUILT_DIR) build-libevent: cd $(LIBEVENT_DIR) && ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install -LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) LIBPNG_OPTS=--prefix=$(BUILT_DIR) build-libpng: cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) cd $(LIBPNG_DIR) && make cd $(LIBPNG_DIR) && make install -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: cd $(TOR_DIR) && ./configure $(TOR_OPTS) @@ -114,7 +107,6 @@ build-polipo: build-pidgin: echo "We're not building pidgin yet!" -FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index b00b9fc..c5cfdfb 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -64,7 +64,6 @@ include $(PWD)/versions.mk source-dance: fetch-source unpack-source echo "We're ready for building now." -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) ZLIB_OPTS=--prefix=$(BUILT_DIR) ZLIB_CFLAGS="-arch $(ARCH_TYPE)" build-zlib: @@ -72,7 +71,6 @@ build-zlib: cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib $(BACKWARDS_COMPAT) --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include build-openssl: cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) @@ -88,7 +86,7 @@ endif cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install -QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) + QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ -fast -release -no-framework -nomake demos -nomake examples $(SDK) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib @@ -97,7 +95,6 @@ build-qt: cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ -DCMAKE_BUILD_TYPE=debug .. build-vidalia: @@ -107,7 +104,6 @@ build-vidalia: && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) @@ -116,7 +112,6 @@ build-libevent: cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) @@ -125,7 +120,6 @@ build-tor: cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install -FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 238a209..e4191e9 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -60,6 +60,17 @@ tor=TOR firefox=FIREFOX pidgin=PIDGIN +# The locations of the unpacked tarballs +ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) +LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) +QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) +OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) +VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) +LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) +TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) +FIREFOX_DIR=$(FETCH_DIR)/firefox-$(FIREFOX_VER) + + fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) | $(FETCH_DIR) ; $(FETCH_DIR): @@ -143,6 +154,7 @@ unpack-tor: unpack-firefox: -rm -rf $(FETCH_DIR)/mozilla-release cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE) + mv $(FETCH_DIR)/mozilla-release $(FIREFOX_DIR) cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cd $(FIREFOX_DIR) && ./patch-any-src.sh diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e27dd37..862cd40 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -55,7 +55,6 @@ WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc MSVC_VER=9 -FIREFOX_DIR=/c/build/mozilla-build/mozilla-release MOZ_BUILD=/c/build/mozilla-build ## Build machine specific settings @@ -74,13 +73,11 @@ include $(PWD)/versions.mk source-dance: fetch-source unpack-source echo "We're ready for building now." -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) build-zlib: cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES) cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include build-openssl: cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) @@ -88,14 +85,12 @@ build-openssl: cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking @@ -104,7 +99,6 @@ build-libevent: cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)

1 0

[torbrowser/maint-2.3] Replace fetch-$package targets with $fetchdir/$package
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 98072ba5b4a1c0b20fa36ea8e1719d4c8ed2d9b5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 08:54:23 2012 +0100 Replace fetch-$package targets with $fetchdir/$package This allows us to use the make-provided mechanisms to track whether a new download needs to happen or not, and it also allows us to drop the explicit rm $package because these files cannot exist if the target is executed. Also work on the xpi targets. Idea from pmezard --- build-scripts/versions.mk | 73 +++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 35 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 8baed26..238a209 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,7 +2,7 @@ RELEASE_VER=2.2.35 -HTTPSEVERY_VER=1.2.2 +HTTPSEVERYWHERE_VER=1.2.2 FIREFOX_VER=10.0.2 LIBEVENT_VER=2.0.17-stable LIBPNG_VER=1.5.9 @@ -19,11 +19,6 @@ ZLIB_VER=1.2.6 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -## Extensions -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi - ## File names for the source packages ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz @@ -34,6 +29,9 @@ LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz TOR_PACKAGE=tor-$(TOR_VER).tar.gz PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 +TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi +NOSCRIPT_PACKAGE=addon-722-latest.xpi +HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) @@ -45,6 +43,9 @@ LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACK… TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… +TORBUTTON_URL=https://www.torproject.org/dist/torbutton/$(TORBUTTON_PACKAGE) +NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) +HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) # Provide some mappings between lower and upper case, which means we don't need # to rely on shell shenanigans when we need the upper case version. This is @@ -59,66 +60,61 @@ tor=TOR firefox=FIREFOX pidgin=PIDGIN -fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox - -mkdir $(FETCH_DIR) +fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) | $(FETCH_DIR) ; + +$(FETCH_DIR): + mkdir -p $(FETCH_DIR) + +# XXX +# If we can, we should definitely add some stuff here to check signatures - +# at least for those packages that support it. -fetch-zlib: - -rm -f $(FETCH_DIR)/$(ZLIB_PACKAGE) +$(FETCH_DIR)/$(ZLIB_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) -fetch-libpng: - -rm -f $(FETCH_DIR)/$(LIBPNG_PACKAGE) +$(FETCH_DIR)/$(LIBPNG_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL) -fetch-qt: - -rm -f $(FETCH_DIR)/$(QT_PACKAGE) +$(FETCH_DIR)/$(QT_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) -fetch-openssl: - -rm -f $(FETCH_DIR)/$(OPENSSL_PACKAGE) +$(FETCH_DIR)/$(OPENSSL_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) -fetch-vidalia: - -rm -f $(FETCH_DIR)/$(VIDALIA_PACKAGE) +$(FETCH_DIR)/$(VIDALIA_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) -fetch-libevent: - -rm -f $(FETCH_DIR)/$(LIBEVENT_PACKAGE) +$(FETCH_DIR)/$(LIBEVENT_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) -fetch-tor: - -rm -f $(FETCH_DIR)/$(TOR_PACKAGE) +$(FETCH_DIR)/$(TOR_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) -fetch-firefox: - -rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE) +$(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) -## Torbutton development version torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) + $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) -## NoScript development version noscript.xpi: - $(WGET) -O $@ $(NOSCRIPT) + $(WGET) --no-check-certificate -O $@ $(NOSCRIPT_URL) -## HTTPS Everywhere httpseverywhere.xpi: - $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) + $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL) ## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi + $(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi ## English comes as default, so nothing to do here for the language packe langpack_en-US.xpi: touch $@ -unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) -unpack-zlib: - -rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER) - cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) +$(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) + rm -rf $(ZLIB_DIR) + cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) unpack-libpng: -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) @@ -150,3 +146,10 @@ unpack-firefox: cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cd $(FIREFOX_DIR) && ./patch-any-src.sh + +clean-fetch-%: + rm -rf $(FETCH_DIR)/$($($*)_PACKAGE) + +clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox + +.PHONY: clean-fetch

1 0

[torbrowser/maint-2.3] Add dependencies for all build- targets
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 4078a8417ef7ab8be7a93efd36c69c50dde436e8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 19:10:00 2012 +0100 Add dependencies for all build- targets --- build-scripts/linux.mk | 34 +++++++++++++++++++++------------- build-scripts/osx.mk | 21 ++++++++++++++------- build-scripts/versions.mk | 9 ++++++++- build-scripts/windows.mk | 19 +++++++++++++------ 4 files changed, 56 insertions(+), 27 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 5073b70..8f25015 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -53,48 +53,55 @@ source-dance: fetch-source unpack-source echo "We're ready for building now." ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) -build-zlib: +build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install + touch build-zlib + +LIBPNG_OPTS=--prefix=$(BUILT_DIR) +build-libpng: $(LIBPNG_DIR) + cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) + cd $(LIBPNG_DIR) && make + cd $(LIBPNG_DIR) && make install + touch build-libpng OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib -build-openssl: +build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install + touch build-openssl QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib -build-qt: +build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install + touch build-qt VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. -build-vidalia: +build-vidalia: build-openssl build-qt $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make -j $(NUM_CORES) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install + touch build-vidalia LIBEVENT_OPTS=--prefix=$(BUILT_DIR) -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install - -LIBPNG_OPTS=--prefix=$(BUILT_DIR) -build-libpng: - cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) - cd $(LIBPNG_DIR) && make - cd $(LIBPNG_DIR) && make install + touch build-libevent TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) -build-tor: +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install + touch build-tor ## Polipo doesn't use autoconf, so we just have to hack their Makefile ## This probably needs to be updated if Polipo ever updates their Makefile @@ -107,9 +114,10 @@ build-polipo: build-pidgin: echo "We're not building pidgin yet!" -build-firefox: +build-firefox: $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build + touch build-firefox copy-firefox: -rm -rf $(FETCH_DIR)/Firefox diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index c5cfdfb..947c04e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -66,13 +66,14 @@ source-dance: fetch-source unpack-source ZLIB_OPTS=--prefix=$(BUILT_DIR) ZLIB_CFLAGS="-arch $(ARCH_TYPE)" -build-zlib: +build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_CFLAGS) ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install + touch build-zlib OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib $(BACKWARDS_COMPAT) --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include -build-openssl: +build-openssl: build-zlib $(OPENSSL_DIR) cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) cp patch-any-src.sh $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./patch-any-src.sh @@ -85,44 +86,50 @@ endif # Do not use -j for the following make call, random build errors might happen. cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install + touch build-openssl QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ -fast -release -no-framework -nomake demos -nomake examples $(SDK) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib -build-qt: +build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install + touch build-qt VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ -DCMAKE_BUILD_TYPE=debug .. -build-vidalia: +build-vidalia: build-openssl build-qt $(VIDALIA_DIR) export MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install + touch build-vidalia LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install + touch build-libevent TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) -build-tor: +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install + touch build-tor -build-firefox: +build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build + touch build-firefox copy-firefox: -rm -rf $(FETCH_DIR)/Firefox.app diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 9bd254d..da23ea1 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -171,4 +171,11 @@ clean-unpack-%: clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox -.PHONY: clean-fetch clean-unpack +clean-build-%: + rm -rf $($($*)_DIR) + rm -rf build-$* + +clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox + +.PHONY: clean-fetch clean-unpack clean-build + diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 862cd40..046baa4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -73,40 +73,46 @@ include $(PWD)/versions.mk source-dance: fetch-source unpack-source echo "We're ready for building now." -build-zlib: +build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES) cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install + touch build-zlib OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include -build-openssl: +build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install + touch build-openssl VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) -build-vidalia: +# XXX Once we build qt on windows, we'll want to add build-qt here +build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) + touch build-vidalia LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install + touch build-libevent TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin -build-tor: +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install + touch build-tor patch-mozbuild: cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZ_BUILD) @@ -114,9 +120,10 @@ patch-mozbuild: cp patch-mozilla-build.sh $(MOZ_BUILD) cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) -build-firefox: +build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/dot_mozconfig $(MOZ_BUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" + touch build-firefox copy-firefox: -rm -rf $(FIREFOX)

1 0

[torbrowser/maint-2.3] Remove everything pointing to polipo
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit cf36a69e207ba169e34995afd17d9994665f30d5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 21:00:47 2012 +0100 Remove everything pointing to polipo --- build-scripts/INSTALL | 47 +------ build-scripts/config/polipo-Makefile | 144 ------------------ build-scripts/config/polipo.conf | 161 --------------------- build-scripts/config/vidalia.conf.ff+pidgin | 2 - build-scripts/config/vidalia.conf.ff+pidgin-linux | 2 - build-scripts/linux.mk | 14 +-- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 1 - docs/traces.txt | 2 +- src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb | 70 --------- src/osx-sandboxes/polipo-sandbox/polipo-wrapper | 70 --------- src/osx-sandboxes/polipo-sandbox/polipo.sb | 71 --------- 12 files changed, 4 insertions(+), 582 deletions(-) diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL index a73bfa8..d54ced1 100644 --- a/build-scripts/INSTALL +++ b/build-scripts/INSTALL @@ -21,7 +21,6 @@ Contents - Install Qt - Install msysDTK - Install WinRAR -- Building Polipo - Building zlib - Building OpenSSL - Building libevent @@ -38,11 +37,10 @@ An Introduction to Building Tor Browser Bundle To build Tor Browser Bundle, you need to have built: Vidalia (in /c/build/vidalia-<version> by default) Tor (in /c/build/tor-<version> by default) - Polipo (in /c/build/polipo-<version> by default) and have uncompressed Firefox Portable or produce a custom build Firefox FirefoxPortable (in /c/build/FirefoxPortable by default) -Instructions for building Vidalia, Polipo and Tor are included below. +Instructions for building Vidalia, and Tor are included below. As a prerequisite for all builds, we'll need a build directory: @@ -247,49 +245,6 @@ Extract the .tar.gz like so in your MSYS console: tar -C / -xvjf /c/Documents\ and\ Settings/Administrator/Desktop/msys-autoconf-2.59.tar.bz2 -Building Polipo -=============== - -In order to enable the forbiddenFile functionality, the GNU Regex -library is required. Download the -bin and -dev tarballs from: - - http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=73286… - -Extract them both into you MinGW directory, e.g. - - tar -C /c/MinGW/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/mingw-libgnurx-2.5.1-bin.tar.gz - tar -C /c/MinGW/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/mingw-libgnurx-2.5.1-dev.tar.gz - -Download Polipo sources: - - http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.1.tar.gz - http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.1.tar.gz.… - -Verify the PGP signature of the above files by following the developer directions: - - http://www.pps.jussieu.fr/~jch/software/pgp-validating.html - -Unpack the Polipo source code into /c/build/polipo-1.0.4.1/ : - - cd /c/build/ - tar -C . -vxzf /c/Documents\ and\ Settings/Administrator/Desktop/polipo-1.0.4.1.tar.gz - -Download a Tor contributed Polipo specific Makefile: - - https://svn.torproject.org/svn/tor/trunk/contrib/polipo/Makefile.mingw - -Replace the stock Polipo Makefile with the one above: - - mv Makefile Makefile-dist-unused - mv /c/Documents\ and\ Settings/Administrator/Desktop/Makefile.mingw Makefile - -Now build Polipo: - - make - -You should have a working binary. If you don't have gcc, it means your path is -broken. Ensure you applied the aforementioned /etc/fstab suggestion. - Building zlib ============= diff --git a/build-scripts/config/polipo-Makefile b/build-scripts/config/polipo-Makefile deleted file mode 100644 index 82e01fe..0000000 --- a/build-scripts/config/polipo-Makefile +++ /dev/null @@ -1,144 +0,0 @@ -BINDIR = $(PREFIX)/bin -MANDIR = $(PREFIX)/man -INFODIR = $(PREFIX)/info -LOCAL_ROOT = $(PREFIX)/usr/share/polipo/www -DISK_CACHE_ROOT = $(PREFIX)/var/cache/polipo - -# To compile with Unix CC: - -# CDEBUGFLAGS=-O - -# To compile with GCC: - -# CC = gcc -# CDEBUGFLAGS = -Os -g -Wall -std=gnu99 -CDEBUGFLAGS = -Os -g -Wall -# CDEBUGFLAGS = -Os -Wall -# CDEBUGFLAGS = -g -Wall - -# To compile on a pure POSIX system: - -# CC = c89 -# CC = c99 -# CDEBUGFLAGS=-O - -# To compile with icc 7, you need -restrict. (Their bug.) - -# CC=icc -# CDEBUGFLAGS = -O -restrict - -# On System V (Solaris, HP/UX) you need the following: - -# PLATFORM_DEFINES = -DSVR4 - -# On Solaris, you need the following: - -# LDLIBS = -lsocket -lnsl -lresolv - -# On mingw, you need - -# EXE=.exe -# LDLIBS = -lwsock32 - -FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \ - -DNO_DISK_CACHE - -# You may optionally also add any of the following to DEFINES: -# -# -DNO_DISK_CACHE to compile out the on-disk cache and local web server; -# -DNO_IPv6 to avoid using the RFC 3493 API and stick to stock -# Berkeley sockets; -# -DHAVE_IPv6 to force the use of the RFC 3493 API on systems other -# than GNU/Linux and BSD (let me know if it works); -# -DNO_FANCY_RESOLVER to compile out the asynchronous name resolution -# code; -# -DNO_STANDARD_RESOLVER to compile out the code that falls back to -# gethostbyname/getaddrinfo when DNS requests fail; -# -DNO_TUNNEL to compile out the code that handles CONNECT requests; -# -DNO_SOCKS to compile out the SOCKS gateway code. -# -DNO_FORBIDDEN to compile out the all of the forbidden URL code -# -DNO_REDIRECTOR to compile out the Squid-style redirector code -# -DNO_SYSLOG to compile out logging to syslog - -DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) - -CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) - -SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ - config.c local.c http.c client.c server.c auth.c tunnel.c \ - http_parse.c parse_time.c dns.c forbidden.c \ - md5import.c md5.c ftsimport.c fts_compat.c socks.c mingw.c - -OBJS = util.o event.o io.o chunk.o atom.o object.o log.o diskcache.o main.o \ - config.o local.o http.o client.o server.o auth.o tunnel.o \ - http_parse.o parse_time.o dns.o forbidden.o \ - md5import.o ftsimport.o socks.o mingw.o - -polipo$(EXE): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o polipo$(EXE) $(OBJS) $(MD5LIBS) $(LDLIBS) - -ftsimport.o: ftsimport.c fts_compat.c - -md5import.o: md5import.c md5.c - -.PHONY: all install install.binary install.man - -all: polipo$(EXE) polipo.info html/index.html localindex.html - -install: install.binary install.man - -install.binary: all - mkdir -p $(TARGET)$(BINDIR) - mkdir -p $(TARGET)$(LOCAL_ROOT) - mkdir -p $(TARGET)$(LOCAL_ROOT)/doc - rm -f $(TARGET)$(BINDIR)/polipo - cp -f polipo $(TARGET)$(BINDIR)/ - cp -f html/* $(TARGET)$(LOCAL_ROOT)/doc - cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html - -install.man: all - mkdir -p $(TARGET)$(MANDIR)/man1 - mkdir -p $(TARGET)$(INFODIR) - cp -f polipo.man $(TARGET)$(MANDIR)/man1/polipo.1 - cp polipo.info $(TARGET)$(INFODIR)/ - install-info --info-dir=$(TARGET)$(INFODIR) polipo.info - - -polipo.info: polipo.texi - makeinfo polipo.texi - -html/index.html: polipo.texi - mkdir -p html - makeinfo --html -o html polipo.texi - -polipo.html: polipo.texi - makeinfo --html --no-split --no-headers -o polipo.html polipo.texi - -polipo.pdf: polipo.texi - texi2pdf polipo.texi - -polipo.ps.gz: polipo.ps - gzip -c polipo.ps > polipo.ps.gz - -polipo.ps: polipo.dvi - dvips -Pwww -o polipo.ps polipo.dvi - -polipo.dvi: polipo.texi - texi2dvi polipo.texi - -polipo.man.html: polipo.man - groff -man -Thtml polipo.man > polipo.man.html - -TAGS: $(SRCS) - etags $(SRCS) - -.PHONY: clean - -clean: - -rm -f polipo$(EXE) *.o *~ core TAGS gmon.out - -rm -f polipo.cp polipo.fn polipo.log polipo.vr - -rm -f polipo.cps polipo.info* polipo.pg polipo.toc polipo.vrs - -rm -f polipo.aux polipo.dvi polipo.ky polipo.ps polipo.tp - -rm -f polipo.dvi polipo.ps polipo.ps.gz polipo.pdf polipo.html - -rm -rf ./html/ - -rm -f polipo.man.html diff --git a/build-scripts/config/polipo.conf b/build-scripts/config/polipo.conf deleted file mode 100644 index 32850f6..0000000 --- a/build-scripts/config/polipo.conf +++ /dev/null @@ -1,161 +0,0 @@ -### Basic configuration -### ******************* - -# Uncomment one of these if you want to allow remote clients to -# connect: - -# proxyAddress = "::0" # both IPv4 and IPv6 -# proxyAddress = "0.0.0.0" # IPv4 only - -proxyAddress = "127.0.0.1" -proxyPort = 8118 - -# If you do that, you'll want to restrict the set of hosts allowed to -# connect: - -# allowedClients = "127.0.0.1, 134.157.168.57" -# allowedClients = "127.0.0.1, 134.157.168.0/24" - -allowedClients = 127.0.0.1 -allowedPorts = 1-65535 - -# Uncomment this if you want your Polipo to identify itself by -# something else than the host name: - -proxyName = "localhost" - -# Uncomment this if there's only one user using this instance of Polipo: - -cacheIsShared = false - -# Uncomment this if you want to use a parent proxy: - -# parentProxy = "squid.example.org:3128" - -# Uncomment this if you want to use a parent SOCKS proxy: - -socksParentProxy = "localhost:9050" -socksProxyType = socks5 - - -### Memory -### ****** - -# Uncomment this if you want Polipo to use a ridiculously small amount -# of memory (a hundred C-64 worth or so): - -# chunkHighMark = 819200 -# objectHighMark = 128 - -# Uncomment this if you've got plenty of memory: - -# chunkHighMark = 50331648 -# objectHighMark = 16384 - -chunkHighMark = 67108864 - -### On-disk data -### ************ - -# Uncomment this if you want to disable the on-disk cache: - -diskCacheRoot = "" - -# Uncomment this if you want to put the on-disk cache in a -# non-standard location: - -# diskCacheRoot = "~/.polipo-cache/" - -# Uncomment this if you want to disable the local web server: - -localDocumentRoot = "" - -# Uncomment this if you want to enable the pages under /polipo/index? -# and /polipo/servers?. This is a serious privacy leak if your proxy -# is shared. - -# disableIndexing = false -# disableServersList = false - -disableLocalInterface = true -disableConfiguration = true - -### Domain Name System -### ****************** - -# Uncomment this if you want to contact IPv4 hosts only (and make DNS -# queries somewhat faster): -# -# dnsQueryIPv6 = no - -# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for -# double-stack hosts: -# -# dnsQueryIPv6 = reluctantly - -# Uncomment this to disable Polipo's DNS resolver and use the system's -# default resolver instead. If you do that, Polipo will freeze during -# every DNS query: - -dnsUseGethostbyname = yes - - -### HTTP -### **** - -# Uncomment this if you want to enable detection of proxy loops. -# This will cause your hostname (or whatever you put into proxyName -# above) to be included in every request: - -disableVia = true - -# Uncomment this if you want to slightly reduce the amount of -# information that you leak about yourself: - -# censoredHeaders = from, accept-language -# censorReferer = maybe - -censoredHeaders = from,accept-language,x-pad,link -censorReferer = maybe - -# Uncomment this if you're paranoid. This will break a lot of sites, -# though: - -# censoredHeaders = set-cookie, cookie, cookie2, from, accept-language -# censorReferer = true - -# Uncomment this if you want to use Poor Man's Multiplexing; increase -# the sizes if you're on a fast line. They should each amount to a few -# seconds' worth of transfer; if pmmSize is small, you'll want -# pmmFirstSize to be larger. - -# Note that PMM is somewhat unreliable. - -# pmmFirstSize = 16384 -# pmmSize = 8192 - -# Uncomment this if your user-agent does something reasonable with -# Warning headers (most don't): - -# relaxTransparency = maybe - -# Uncomment this if you never want to revalidate instances for which -# data is available (this is not a good idea): - -# relaxTransparency = yes - -# Uncomment this if you have no network: - -# proxyOffline = yes - -# Uncomment this if you want to avoid revalidating instances with a -# Vary header (this is not a good idea): - -# mindlesslyCacheVary = true - -# Suggestions from Incognito configuration -maxConnectionAge = 5m -maxConnectionRequests = 120 -serverMaxSlots = 8 -serverSlots = 2 -tunnelAllowedPorts = 1-65535 diff --git a/build-scripts/config/vidalia.conf.ff+pidgin b/build-scripts/config/vidalia.conf.ff+pidgin index d5d4a9b..43cb0f2 100644 --- a/build-scripts/config/vidalia.conf.ff+pidgin +++ b/build-scripts/config/vidalia.conf.ff+pidgin @@ -3,8 +3,6 @@ BrowserDirectory=FirefoxPortable BrowserExecutable=tbb-firefox.exe IMExecutable=PidginPortable\\PidginPortable.exe LanguageCode=en -ProxyExecutable=.\\App\\polipo.exe -ProxyExecutableArguments=-c .\\Data\\Polipo\\polipo.conf RunProxyAtStart=true [Tor] diff --git a/build-scripts/config/vidalia.conf.ff+pidgin-linux b/build-scripts/config/vidalia.conf.ff+pidgin-linux index 8354f0b..59d81bd 100644 --- a/build-scripts/config/vidalia.conf.ff+pidgin-linux +++ b/build-scripts/config/vidalia.conf.ff+pidgin-linux @@ -3,8 +3,6 @@ BrowserDirectory=. BrowserExecutable=firefox LanguageCode=en IMExecutable=./App/pidgin -ProxyExecutable=./App/polipo -ProxyExecutableArguments=-c Data/Polipo/polipo.conf RunProxyAtStart=true [Tor] diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index fb5c7c2..18ce2ba 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -103,14 +103,6 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && make install touch build-tor -## Polipo doesn't use autoconf, so we just have to hack their Makefile -## This probably needs to be updated if Polipo ever updates their Makefile -POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) -POLIPO_MAKEFILE=config/polipo-Makefile -build-polipo: - cp $(POLIPO_MAKEFILE) $(POLIPO_DIR)/Makefile - cd $(POLIPO_DIR) && make && PREFIX=$(FETCH_DIR)/built/ make install.binary - build-pidgin: echo "We're not building pidgin yet!" @@ -143,7 +135,6 @@ QT=$(COMPILED_LIBS) ZLIB=$(COMPILED_LIBS) ## Location of binary bundle components -POLIPO=$(COMPILED_BINS)/polipo TOR=$(COMPILED_BINS)/tor VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia ## Someday, this will be our custom Firefox @@ -322,7 +313,7 @@ ifeq ($(USE_PIDGIN),1) cp -R $(PIDGIN) $(APPDIR) endif -## Configure Firefox, Vidalia, Polipo and Tor +## Configure Firefox, Vidalia, and Tor configure-apps: ## Configure Firefox preferences mkdir -p $(DEST)/Data/profile/extensions @@ -340,8 +331,6 @@ ifeq ($(USE_PIDGIN),1) else cp config/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf endif - ## Configure Polipo - #cp config/polipo.conf $(DEST)/Data/Polipo/polipo.conf ## Configure Tor cp config/torrc-linux $(DEST)/Data/Tor/torrc cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip @@ -354,7 +343,6 @@ launcher: strip-it-stripper: strip $(APPDIR)/tor - #strip $(APPDIR)/polipo strip $(APPDIR)/vidalia strip $(LIBSDIR)/*.so* strip $(LIBSDIR)/libz/*.so* diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 8050092..82e0a1b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -294,7 +294,7 @@ install-docs: install-firefox: cp -R $(FIREFOX) $(APPDIR) -## Configure Firefox, Vidalia, Polipo and Tor +## Configure Firefox, Vidalia, and Tor configure-apps: ## Configure Firefox preferences #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index ccb7354..28521f0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -282,7 +282,6 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) - cp $(MING)/libgnurx-0.dll $(APPDIR) cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) diff --git a/docs/traces.txt b/docs/traces.txt index 1a9b9ca..f81c0cf 100644 --- a/docs/traces.txt +++ b/docs/traces.txt @@ -62,7 +62,7 @@ modified by Tor Browser Bundle. On a Windows XP installation, with Firefox installed, only one registry key is modified: HKLM\Software\Microsoft\Cryptography\RNG\Seed (by vidalia.exe, -tor.exe, FirefoxPortable.exe, firefox.exe, polipo.exe) +tor.exe, FirefoxPortable.exe, firefox.exe) Without Firefox installed, there appears to be no difference, although it is difficult to be certain since Windows makes changes to a large diff --git a/src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb b/src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb deleted file mode 100755 index a1bf44e..0000000 --- a/src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb +++ /dev/null @@ -1,70 +0,0 @@ -;; MacOSX Sandbox profile for bundled polipo -;; -;; Copyright 2010 Robert Malmgren AB. All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without modification, are -;; permitted provided that the following conditions are met: -;; -;; 1. Redistributions of source code must retain the above copyright notice, this list of -;; conditions and the following disclaimer. -;; -;; 2. Redistributions in binary form must reproduce the above copyright notice, this list -;; of conditions and the following disclaimer in the documentation and/or other materials -;; provided with the distribution. -;; -;; THIS SOFTWARE IS PROVIDED BY Robert Malmgren AB ``AS IS'' AND ANY EXPRESS OR IMPLIED -;; WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -;; FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR -;; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -;; ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -;; ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;; -;; The views and conclusions contained in the software and documentation are those of the -;; authors and should not be interpreted as representing official policies, either expressed -;; or implied, of Robert Malmgren AB. -;; -;; Written by andreas(a)romab.com -(version 1) - -(deny default) -(debug deny) - -(allow file-read-data - (literal "POLIPODIR/Contents/Resources/Data/Polipo/polipo.conf") - (literal "/dev/dtracehelper") - (literal "/dev/null") - (literal "/dev/urandom") - (literal "/private/var/run/resolv.conf") - (regex "^/usr/share/.*")) - -(allow file-read-metadata - (literal "/etc") - (literal "/private/etc/localtime") - (literal "/private/etc/resolv.conf") - (literal "/var") - (regex "^/usr/lib/*")) - -(allow file-write-data - (literal "/dev/dtracehelper")) - -(allow ipc-posix-shm) - -(allow mach-lookup - (global-name "com.apple.system.DirectoryService.libinfo_v1") - (global-name "com.apple.system.DirectoryService.membership_v1") - (global-name "com.apple.system.notification_center")) - -(allow network-inbound) - ; doesnt work for some reason. - ;(to tcp "localhost:8118")) - -(allow network-outbound - (to tcp "localhost:9050")) - -(allow process-exec - (literal "POLIPODIR/Contents/MacOS/polipo-bin")) - -(allow sysctl-read) diff --git a/src/osx-sandboxes/polipo-sandbox/polipo-wrapper b/src/osx-sandboxes/polipo-sandbox/polipo-wrapper deleted file mode 100755 index 8ae61dc..0000000 --- a/src/osx-sandboxes/polipo-sandbox/polipo-wrapper +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# Startup script, MacOSX Sandbox profile for tor -# -# Copyright 2010 Robert Malmgren AB. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without modification, are -# permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this list of -# conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, this list -# of conditions and the following disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY Robert Malmgren AB ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those of the -# authors and should not be interpreted as representing official policies, either expressed -# or implied, of Robert Malmgren AB. -# written by andreas(a)romab.com - -# tbb launchit script. -# this script launches polipo within the macosx sandbox. -# as we do not know where the user will install the tbb, we need -# to do some search and replace. -# -# Also, we will need to accept arguments comming from vidalia. -# -SW_VERS=/usr/bin/sw_vers -CUT=/usr/bin/cut -LSOF=/usr/sbin/lsof -AWK=/usr/bin/awk -TAIL=/usr/bin/tail -SED=/usr/bin/sed - -#find out osx version. - -VERSION=`$SW_VERS -productVersion| $CUT -f1,2 -d .` -DIR=`$LSOF -p $$|$TAIL -1| $AWK '{ print $NF }' | $SED s/[^/]*$//` -TDIR=`echo $DIR| $SED -e 's=Contents/MacOS/==g'` -TORAPPDIR=`echo $TDIR | $SED -e 's/\/$//g'` - -if [ "$VERSION"x = "10.6"x ]; then - #we know we use 10.6 fix the sandbox, do some search and replace - #and find current dir and the rebuild the sandbox - - #determine current dir. - #nuke the old sandbox - echo > $DIR/polipo-sandbox/polipo-bin.sb - #fix some stuff in the sandbox - $SED -e "s=POLIPODIR=$TORAPPDIR=g" $DIR/polipo-sandbox/polipo.sb >> $DIR/polipo-sandbox/polipo-bin.sb - /usr/bin/sandbox-exec -f $DIR/polipo-sandbox/polipo-bin.sb ${DIR}/polipo-bin $@ -fi - -if [ "$VERSION"x = "10.5"x ]; then - #10.5 use the policy written for 10.5 - #nuke the old sandbox - echo > $DIR/polipo-sandbox/polipo-bin.sb - $SED -e "s=POLIPODIR=$TORAPPDIR=g" $DIR/polipo-sandbox/polipo-10.5.sb >> $DIR/polipo-sandbox/polipo-bin.sb - /usr/bin/sandbox-exec -f $DIR/polipo-sandbox/polipo-bin.sb ${DIR}/polipo-bin $@ -fi diff --git a/src/osx-sandboxes/polipo-sandbox/polipo.sb b/src/osx-sandboxes/polipo-sandbox/polipo.sb deleted file mode 100644 index 3676c8e..0000000 --- a/src/osx-sandboxes/polipo-sandbox/polipo.sb +++ /dev/null @@ -1,71 +0,0 @@ -;; MacOSX Sandbox profile for bundled polipo -;; -;; Copyright 2010 Robert Malmgren AB. All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without modification, are -;; permitted provided that the following conditions are met: -;; -;; 1. Redistributions of source code must retain the above copyright notice, this list of -;; conditions and the following disclaimer. -;; -;; 2. Redistributions in binary form must reproduce the above copyright notice, this list -;; of conditions and the following disclaimer in the documentation and/or other materials -;; provided with the distribution. -;; -;; THIS SOFTWARE IS PROVIDED BY Robert Malmgren AB ``AS IS'' AND ANY EXPRESS OR IMPLIED -;; WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -;; FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR -;; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -;; ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -;; ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;; -;; The views and conclusions contained in the software and documentation are those of the -;; authors and should not be interpreted as representing official policies, either expressed -;; or implied, of Robert Malmgren AB. -;; -;; Written by andreas(a)romab.com -(version 1) - -(deny default) - -(allow file-ioctl - (literal "/dev/dtracehelper")) - -(allow file-read-data - (literal "POLIPODIR/Contents/Resources/Data/Polipo/polipo.conf") - (literal "/dev/dtracehelper") - (literal "/dev/null") - (literal "/dev/urandom") - (literal "/private/var/run/resolv.conf") - (subpath "/usr/share")) - -(allow file-read-metadata - (literal "/etc") - (literal "/private/etc/localtime") - (literal "/private/etc/resolv.conf") - (literal "/var") - (subpath "/usr/lib")) - -(allow file-write-data - (literal "/dev/dtracehelper")) - -(allow ipc-posix-shm) - -(allow mach-lookup - (global-name "com.apple.system.DirectoryService.libinfo_v1") - (global-name "com.apple.system.DirectoryService.membership_v1") - (global-name "com.apple.system.notification_center")) - -(allow network-inbound - (local tcp "localhost:8118")) - -(allow network-outbound - (remote tcp "localhost:9050")) - -(allow process-exec - (literal "POLIPODIR/Contents/MacOS/polipo-bin")) - -(allow sysctl-read)

1 0

[torbrowser/maint-2.3] Remove all occurences of CONFIG_SRC
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 21e3c22670f0ceb1760b3403ff1a217301112e9d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 23 17:49:50 2012 +0100 Remove all occurences of CONFIG_SRC We don't need the variable, as this is a hardcoded path inside the TBB directory structure. By getting rid of it we make our lives easier down the road when we add dependencies --- build-scripts/linux.mk | 33 +++++++++++++++------------------ build-scripts/osx.mk | 31 ++++++++++++++----------------- build-scripts/windows.mk | 31 ++++++++++++++----------------- 3 files changed, 43 insertions(+), 52 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8f25015..fb5c7c2 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -106,7 +106,7 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) ## Polipo doesn't use autoconf, so we just have to hack their Makefile ## This probably needs to be updated if Polipo ever updates their Makefile POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) -POLIPO_MAKEFILE=$(CONFIG_SRC)/polipo-Makefile +POLIPO_MAKEFILE=config/polipo-Makefile build-polipo: cp $(POLIPO_MAKEFILE) $(POLIPO_DIR)/Makefile cd $(POLIPO_DIR) && make && PREFIX=$(FETCH_DIR)/built/ make install.binary @@ -114,8 +114,8 @@ build-polipo: build-pidgin: echo "We're not building pidgin yet!" -build-firefox: $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR) - cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: config/dot_mozconfig $(FIREFOX_DIR) + cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build touch build-firefox @@ -156,9 +156,6 @@ WGET:=$(shell which wget) ## Size of split archive volumes for WinRAR SPLITSIZE=1440k -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST=generic-bundle @@ -329,24 +326,24 @@ endif configure-apps: ## Configure Firefox preferences mkdir -p $(DEST)/Data/profile/extensions - cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Data/profiles.ini - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Data/profile - cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js + cp -R config/firefox-profiles.ini $(DEST)/Data/profiles.ini + cp config/bookmarks.html $(DEST)/Data/profile + cp config/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js ## Configure Pidgin ifeq ($(USE_PIDGIN),1) mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple + cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple endif ## Configure Vidalia ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf endif ## Configure Polipo - #cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo/polipo.conf + #cp config/polipo.conf $(DEST)/Data/Polipo/polipo.conf ## Configure Tor - cp $(CONFIG_SRC)/torrc-linux $(DEST)/Data/Tor/torrc + cp config/torrc-linux $(DEST)/Data/Tor/torrc cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip chmod 700 $(DEST)/Data/Tor @@ -433,10 +430,10 @@ patch-firefox-language: ## Patch the default Firefox prefs.js ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/ - cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ - cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Data/profile - cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/Data/profile/prefs.js + cp config/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ + cp config/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + cp config/bookmarks.html $(BUNDLE)/Data/profile + cp config/no-polipo-4.0.js $(BUNDLE)/Data/profile/prefs.js ./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e ./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 947c04e..8050092 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -126,8 +126,8 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && make install touch build-tor -build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) - cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig +build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) + cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build touch build-firefox @@ -162,9 +162,6 @@ WGET:=$(shell which wget) ## Size of split archive volumes for WinRAR SPLITSIZE=1440k -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST=generic-bundle @@ -301,24 +298,24 @@ install-firefox: configure-apps: ## Configure Firefox preferences #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default - 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)/no-polipo-4.0.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/MacOS/Vidalia.app/Contents/Resources - cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources + cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini + cp config/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile + cp config/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + cp config/Info.plist $(DEST)/Contents + cp config/PkgInfo $(DEST)/Contents + cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources + cp config/vidalia.icns $(DEST)/Contents/Resources ## Configure Vidalia mkdir -p $(DEST)/Library/Vidalia ifeq ($(USE_SANDBOX),1) - cp $(CONFIG_SRC)/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf + cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf + cp config/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf endif ## Configure Tor - cp $(CONFIG_SRC)/torrc-osx $(DEST)/Library/Vidalia/torrc + cp config/torrc-osx $(DEST)/Library/Vidalia/torrc cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip chmod 700 $(DATADIR)/Tor @@ -407,8 +404,8 @@ endif patch-firefox-language: ## Patch the default Firefox prefs.js ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. - cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile + cp config/no-polipo-4.0.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + cp config/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile ./patch-firefox-language.sh $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js $(LANGCODE) -e ## Fix prefs.js since extensions.checkCompatibility, false doesn't work diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 046baa4..ccb7354 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -120,8 +120,8 @@ patch-mozbuild: cp patch-mozilla-build.sh $(MOZ_BUILD) cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) -build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/dot_mozconfig $(MOZ_BUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat - cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat + cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" touch build-firefox @@ -150,9 +150,6 @@ LIBEVENT=$(COMPILED_LIBS) ## Size of split archive volumes for WinRAR SPLITSIZE=1440k -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST="Generic Bundle" @@ -321,32 +318,32 @@ configure-apps: mkdir -p $(DEST)/FirefoxPortable/Data/profile ## Configure Firefox preferences - cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js - cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ + cp config/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js + cp config/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js + cp config/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 ## Configure FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings + cp config/FirefoxPortable.ini $(DEST)/FirefoxPortable + cp config/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings ## Configure PidginPortable ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable + cp config/PidginPortable.ini $(DEST)/PidginPortable mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings + cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple + cp config/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings endif ## Configure Vidalia ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif ## Configure Tor - cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor + cp config/torrc $(DEST)/Data/Tor cp $(TOR)/src/config/geoip $(DEST)/Data/Tor launcher: @@ -440,7 +437,7 @@ patch-firefox-language: ## Copy Firefox preferences from a run of FirefoxPortable to be the default apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) + cp $(DEST)/FirefoxPortable/Data/profile/prefs.js config print-version: @echo $(RELEASE_VER)-$(BUILD_NUM)

1 0