- tor-commits - lists.torproject.org

[torbrowser/maint-2.3] OSX: Use our zlib for Qt, instead of Qt's.
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit a3a838b7c52fe9749634b9dbb32731608ed11761 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 3 16:07:35 2012 +0100 OSX: Use our zlib for Qt, instead of Qt's. --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 81e10f0..dfa9a4b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -72,7 +72,7 @@ endif cd $(OPENSSL_DIR) && make install QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) -QT_BUILD_PREFS=-qt-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \ +QT_BUILD_PREFS=-system-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \ -fast -release -no-framework -nomake demos -nomake examples -sdk /Developer/SDKs/MacOSX10.5.sdk/ QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib build-qt:

1 0

[torbrowser/maint-2.3] OSX: Remove the universal option when building qt
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 5042c42451efea7cf96deeebbc4c3a33d6bc6d15 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Jan 28 14:30:52 2012 +0100 OSX: Remove the universal option when building qt The rationale is that we don't build universal bundles, so we don't need a universal qt. --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 13b802c..20ea849 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -83,7 +83,7 @@ endif cd $(OPENSSL_DIR) && make install QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) -QT_BUILD_PREFS=-system-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \ +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:

1 0

[torbrowser/maint-2.3] OSX: Extract backwards compatibility options
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit abed72ade4250c991542348ea1ae73b5106b64ed Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Jan 28 14:29:23 2012 +0100 OSX: Extract backwards compatibility options This should allow us to specify the backwards compatibility more easily, with fewer places to fiddle with. --- build-scripts/osx.mk | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index dfa9a4b..13b802c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -39,6 +39,17 @@ ARCH_TYPE=i386 BUILD_NUM=7.1 PLATFORM=MacOS +## Set OSX-specific backwards compatibility options +OSX_VERSION=10.5 +CC=CC=gcc-4.0 +# These can probably be left alone for OSX_VERSION 10.5 and up +SDK_PATH=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk +SDK=-sdk $(SDK_PATH) +MIN_VERSION=-mmacosx-version-min=$(OSX_VERSION) +CF_MIN_VERSION=-isysroot $(SDK_PATH) +LD_MIN_VERSION=-Wl,-syslibroot,$(SDK_PATH) +BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) + ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc @@ -57,7 +68,7 @@ build-zlib: cd $(ZLIB_DIR) && make install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include +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) cp patch-any-src.sh $(OPENSSL_DIR) @@ -73,7 +84,7 @@ endif QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) QT_BUILD_PREFS=-system-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \ - -fast -release -no-framework -nomake demos -nomake examples -sdk /Developer/SDKs/MacOSX10.5.sdk/ + -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: cd $(QT_DIR) && ./configure $(QT_OPTS) @@ -84,25 +95,25 @@ 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: - export MACOSX_DEPLOYMENT_TARGET=10.5 + export MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ && make && 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) -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch $(ARCH_TYPE)" -LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk" -LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking CC="gcc-4.0" +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: cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j2 cd $(LIBEVENT_DIR) && make install TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) -TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk" -TOR_LDFLAGS="-L$(BUILT_DIR)/lib -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk" -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="gcc-4.0" +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: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make

1 0

[torbrowser/maint-2.3] OSX/Lin: Prevent double-patching firefox
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 0930156217f120e77f4d2767580496e4f5f05385 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Jan 28 15:20:43 2012 +0100 OSX/Lin: Prevent double-patching firefox Now patching will just fail instead of silently reverting the fix. This prepares for a more general solution later on. --- build-scripts/linux.mk | 4 +++- build-scripts/osx.mk | 4 +++- build-scripts/patch-any-src.sh | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2131276..d3e942b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -115,11 +115,13 @@ build-pidgin: echo "We're not building pidgin yet!" FIREFOX_DIR=$(FETCH_DIR)/mozilla-release -build-firefox: +patch-firefox-source: cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-any-src.sh + +build-firefox: cd $(FIREFOX_DIR) && make -f client.mk build copy-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e77d85e..84dd620 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -125,11 +125,13 @@ build-tor: cd $(TOR_DIR) && make install FIREFOX_DIR=$(FETCH_DIR)/mozilla-release -build-firefox: +patch-firefox-source: cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-any-src.sh + +build-firefox: cd $(FIREFOX_DIR) && make -f client.mk build copy-firefox: diff --git a/build-scripts/patch-any-src.sh b/build-scripts/patch-any-src.sh index 602612a..90a564e 100755 --- a/build-scripts/patch-any-src.sh +++ b/build-scripts/patch-any-src.sh @@ -3,4 +3,4 @@ # Cycle through available patches for Firefox and apply them in order. Fail if # any of them don't apply cleanly. -for i in *patch; do patch -tp1 <$i || exit 1; done +for i in *patch; do patch -Ntp1 <$i || exit 1; done

1 0

[torbrowser/maint-2.3] Use -j for make where possible
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 2db2b6b051c79a92164b230bebc74578688f288c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 3 16:17:14 2012 +0100 Use -j for make where possible --- build-scripts/linux.mk | 14 +++++++++----- build-scripts/osx.mk | 15 ++++++++++----- build-scripts/windows.mk | 12 ++++++++---- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 51d6af7..2131276 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -39,6 +39,10 @@ ARCH_TYPE=$(shell uname -m) BUILD_NUM=7.2 PLATFORM=Linux +## Build machine specific settings +# Number of cpu cores used to build in parallel +NUM_CORES=2 + ## Location of directory for source unpacking FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc @@ -52,7 +56,7 @@ 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 + cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) @@ -68,21 +72,21 @@ QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3 QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: cd $(QT_DIR) && ./configure $(QT_OPTS) - cd $(QT_DIR) && make + 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 + 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 -j2 + cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) @@ -96,7 +100,7 @@ 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) - cd $(TOR_DIR) && make -j2 + cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install ## Polipo doesn't use autoconf, so we just have to hack their Makefile diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 20ea849..e77d85e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -50,6 +50,10 @@ CF_MIN_VERSION=-isysroot $(SDK_PATH) LD_MIN_VERSION=-Wl,-syslibroot,$(SDK_PATH) BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) +## Build machine specific settings +# Number of cpu cores used to build in parallel +NUM_CORES=2 + ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc @@ -64,7 +68,7 @@ ZLIB_OPTS=--prefix=$(BUILT_DIR) ZLIB_CFLAGS="-arch $(ARCH_TYPE)" build-zlib: cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_CFLAGS) ./configure $(ZLIB_OPTS) - cd $(ZLIB_DIR) && make + cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) @@ -79,6 +83,7 @@ else cd $(OPENSSL_DIR) && ./Configure darwin-i386-cc $(OPENSSL_OPTS) 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 @@ -88,7 +93,7 @@ QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3 QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib build-qt: cd $(QT_DIR) && ./configure $(QT_OPTS) - cd $(QT_DIR) && make -j2 + cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) @@ -98,7 +103,7 @@ build-vidalia: export MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ - && make && make dist-osx-libraries + && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) @@ -107,7 +112,7 @@ LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) build-libevent: cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) - cd $(LIBEVENT_DIR) && make -j2 + cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) @@ -116,7 +121,7 @@ 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: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make + cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install FIREFOX_DIR=$(FETCH_DIR)/mozilla-release diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8feb6f9..52d93ed 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -60,6 +60,10 @@ MSVC_VER=9 FIREFOX_DIR=/c/build/mozilla-build/mozilla-release MOZ_BUILD=/c/build/mozilla-build +## Build machine specific settings +# Number of cpu cores used to build in parallel +NUM_CORES=2 + ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-windows ## Location of directory for prefix/destdir/compiles/etc @@ -72,7 +76,7 @@ source-dance: fetch-source unpack-source 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 + 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) @@ -88,7 +92,7 @@ VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dy build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. - cd $(VIDALIA_DIR)/build && make + cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" @@ -96,7 +100,7 @@ LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dyn LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking build-libevent: cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) - cd $(LIBEVENT_DIR) && make -j2 + cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) @@ -106,7 +110,7 @@ TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix= build-tor:PATH+=:$(BUILT_DIR)/bin build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make + cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install patch-mozbuild:

1 0

[torbrowser/maint-2.3] Remove the fix-install-rdf target
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit dcd0e9f36b2cfa6cd64f58ff0848606d0c1b4487 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Feb 18 21:03:35 2012 +0100 Remove the fix-install-rdf target Extensions are now compatible with newer FF by default, and we haven't used it for a while anyway --- build-scripts/linux.mk | 7 ------- build-scripts/osx.mk | 7 ------- build-scripts/windows.mk | 7 ------- 3 files changed, 0 insertions(+), 21 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 1c785d5..67db913 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -433,13 +433,6 @@ install-extensions: $(DEFAULT_EXTENSIONS) done ## Language extensions need to be handled differently from other extensions -fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) -ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) -endif - install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Data/profile/extensions diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index edd3b7b..bda3216 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -396,13 +396,6 @@ install-extensions: $(DEFAULT_EXTENSIONS) ## Language extensions need to be handled differently from other extensions -fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) -ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) -endif - install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 6c09ec8..3250219 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -410,13 +410,6 @@ copy-files_%: generic-bundle.stamp BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile -fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) -ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) -endif - install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ## Make a dummy profile to stop Firefox creating some large files cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE)

1 0

[torbrowser/maint-2.3] Patch firefox during unpacking
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit a5036654af593d684a729e256b7b5abb3700fca0 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 22 20:47:35 2012 +0100 Patch firefox during unpacking This means we can simply depend on the patch files and start fresh completely when one of them changes. --- build-scripts/linux.mk | 7 +------ build-scripts/osx.mk | 7 +------ build-scripts/versions.mk | 3 +++ build-scripts/windows.mk | 5 ----- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d3e942b..5e3d045 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -115,13 +115,8 @@ build-pidgin: echo "We're not building pidgin yet!" FIREFOX_DIR=$(FETCH_DIR)/mozilla-release -patch-firefox-source: - cp ../src/current-patches/firefox/* $(FIREFOX_DIR) - cp patch-any-src.sh $(FIREFOX_DIR) - cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig - cd $(FIREFOX_DIR) && ./patch-any-src.sh - build-firefox: + cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build copy-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 84dd620..9268112 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -125,13 +125,8 @@ build-tor: cd $(TOR_DIR) && make install FIREFOX_DIR=$(FETCH_DIR)/mozilla-release -patch-firefox-source: - cp ../src/current-patches/firefox/* $(FIREFOX_DIR) - cp patch-any-src.sh $(FIREFOX_DIR) - cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig - cd $(FIREFOX_DIR) && ./patch-any-src.sh - build-firefox: + cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build copy-firefox: diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 5b21a88..dd7c31a 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -116,3 +116,6 @@ unpack-tor: unpack-firefox: -rm -rf $(FETCH_DIR)/mozilla-release cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE) + 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 52d93ed..55e3c2d 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -119,11 +119,6 @@ patch-mozbuild: cp patch-mozilla-build.sh $(MOZ_BUILD) cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) -patch-firefox-source: - cp ../src/current-patches/firefox/* $(FIREFOX_DIR) - cp patch-any-src.sh $(FIREFOX_DIR) - cd $(FIREFOX_DIR) && ./patch-any-src.sh - build-firefox: cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)"

1 0

[torbrowser/maint-2.3] Move duplicated extension fetching code to versions.mk
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit fdc2c70a056dd96a60077d591d6102a6ee25010c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 16 07:13:28 2012 +0100 Move duplicated extension fetching code to versions.mk --- build-scripts/linux.mk | 24 ------------------------ build-scripts/osx.mk | 24 ------------------------ build-scripts/versions.mk | 20 ++++++++++++++++++++ build-scripts/windows.mk | 24 ------------------------ 4 files changed, 20 insertions(+), 72 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 67db913..742bc65 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -367,30 +367,6 @@ remove-bundle-shared-lib-symlinks: ./remove-shared-lib-symlinks $(LIBSDIR)/libz ## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) - -## NoScript development version -noscript.xpi: - $(WGET) -O $@ $(NOSCRIPT) - -## HTTPS Everywhere -httpseverywhere.xpi: - $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## English comes as default -#langpack_en-US.xpi: -# touch $@ - -## ## Customize the bundle ## diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bda3216..e8fe22a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -330,30 +330,6 @@ strip-it-stripper: strip $(APPDIR)/Vidalia.app/Contents/MacOS/Vidalia ## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(WGET) --no-check-certificate -O $@ $(TORBUTTON) - -## NoScript development version -noscript.xpi: - $(WGET) --no-check-certificate -O $@ $(NOSCRIPT) - -## HTTPS Everywhere -httpseverywhere.xpi: - $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## English comes as default -#langpack_en-US.xpi: -# touch $@ - -## ## Customize the bundle ## diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 910d25a..d021f5f 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -81,6 +81,26 @@ fetch-firefox: -rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) +## Torbutton development version +torbutton.xpi: + $(WGET) -O $@ $(TORBUTTON) + +## NoScript development version +noscript.xpi: + $(WGET) -O $@ $(NOSCRIPT) + +## HTTPS Everywhere +httpseverywhere.xpi: + $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) + +## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE +langpack_%.xpi: + $(WGET) -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-zlib: diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 3250219..8c00ff5 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -352,30 +352,6 @@ launcher: cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" ## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(PYGET) -O $@ $(TORBUTTON) - -## English comes as default -langpack_en-US.xpi: - touch $@ - -## NoScript development version -noscript.xpi: - $(PYGET) -O $@ $(NOSCRIPT) - -## HTTPS Everywhere -httpseverywhere.xpi: - $(PYGET) -O $@ $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(PYGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## ## Customize the bundle ##

1 0

[torbrowser/maint-2.3] Remove betterprivacy
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 124f2c888d11c5c0ff5a1aed6a65418ab671b467 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 16 05:58:10 2012 +0100 Remove betterprivacy It was unused and probably won't be back --- build-scripts/linux.mk | 10 ---------- build-scripts/osx.mk | 11 +---------- build-scripts/versions.mk | 1 - build-scripts/windows.mk | 9 --------- 4 files changed, 1 insertions(+), 30 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 5e3d045..1c785d5 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -378,10 +378,6 @@ torbutton.xpi: noscript.xpi: $(WGET) -O $@ $(NOSCRIPT) -## BetterPrivacy -betterprivacy.xpi: - $(WGET) -O $@ $(BETTERPRIVACY) - ## HTTPS Everywhere httpseverywhere.xpi: $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) @@ -436,12 +432,6 @@ install-extensions: $(DEFAULT_EXTENSIONS) (cd $(BUNDLE)/Data/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \ done -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/ && unzip *.zip && rm *.zip); - - ## Language extensions need to be handled differently from other extensions fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 9268112..edd3b7b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -337,10 +337,6 @@ strip-it-stripper: torbutton.xpi: $(WGET) --no-check-certificate -O $@ $(TORBUTTON) -## BetterPrivacy -betterprivacy.xpi: - $(WGET) --no-check-certificate -O $@ $(BETTERPRIVACY) - ## NoScript development version noscript.xpi: $(WGET) --no-check-certificate -O $@ $(NOSCRIPT) @@ -413,16 +409,11 @@ ifneq ($(LANGCODE), en-US) cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && unzip *.zip && rm *.zip) - install-httpseverywhere: httpseverywhere.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org && unzip *.zip && rm *.zip) - + install-noscript: noscript.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} cp noscript.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 56f96e6..910d25a 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -22,7 +22,6 @@ FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} ## Extensions TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_V… NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-… -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## File names for the source packages diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 55e3c2d..6c09ec8 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -363,10 +363,6 @@ torbutton.xpi: langpack_en-US.xpi: touch $@ -## BetterPrivacy -betterprivacy.xpi: - $(PYGET) -O $@ $(BETTERPRIVACY) - ## NoScript development version noscript.xpi: $(PYGET) -O $@ $(NOSCRIPT) @@ -440,11 +436,6 @@ install-httpseverywhere: httpseverywhere.xpi cp httpseverywhere.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org && $(SEVENZIP) x *.zip && rm *.zip) -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && $(SEVENZIP) x *.zip && rm *.zip) - install-noscript: noscript.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} cp noscript.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip

1 0

[torbrowser/maint-2.3] Remove the fetch-source-osx target
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 1cc85e8c2dbc5c7f22468212ec517e14486defde Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 08:18:35 2012 +0100 Remove the fetch-source-osx target It was unused, and won't be needed in the future --- build-scripts/versions.mk | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index dd7c31a..56f96e6 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -48,7 +48,6 @@ PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox -fetch-source-osx: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fetch-firefox -mkdir $(FETCH_DIR) fetch-zlib:

1 0