June 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.2] Fix Zlib's prefix. We now use the sane option.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit dc1c8b67fc6142b2e00f51715cf3f8f7939b7ae3 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat May 12 23:01:25 2012 +0200 Fix Zlib's prefix. We now use the sane option. --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e6d55b0..0a80f91 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -56,10 +56,10 @@ TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist ## Include versions (must happen after variable definitions above include $(PWD)/versions.mk +ZLIB_OPTS=prefix="$(BUILT_DIR)" BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" 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 + cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install touch $(STAMP_DIR)/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

1 0

[torbrowser/maint-2.2] Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit 37142a84f895473db35f1213ff30321d7722b15a Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue May 29 23:57:56 2012 +0200 Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs. --- build-scripts/windows.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 60a5b95..e6d55b0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -78,8 +78,9 @@ build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && make install touch $(STAMP_DIR)/build-qt -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here +build-vidalia: PATH+=:$(QT_LIB) build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) ..

1 0

[torbrowser/maint-2.2] Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit fb9824fa9edd7ae025686e9b5e8b55d5f9640fae Author: Shondoit Walker <shondoit(a)gmail.com> Date: Mon May 14 14:29:39 2012 +0200 Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway. --- build-scripts/config/dot_mozconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index c7eabd2..bb500b8 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -11,3 +11,4 @@ ac_add_options --enable-official-branding ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug +ac_add_options --disable-maintenance-service

1 0

[torbrowser/maint-2.3] Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit 37142a84f895473db35f1213ff30321d7722b15a Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue May 29 23:57:56 2012 +0200 Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs. --- build-scripts/windows.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 60a5b95..e6d55b0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -78,8 +78,9 @@ build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && make install touch $(STAMP_DIR)/build-qt -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here +build-vidalia: PATH+=:$(QT_LIB) build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) ..

1 0

[torbrowser/maint-2.3] Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit fb9824fa9edd7ae025686e9b5e8b55d5f9640fae Author: Shondoit Walker <shondoit(a)gmail.com> Date: Mon May 14 14:29:39 2012 +0200 Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway. --- build-scripts/config/dot_mozconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index c7eabd2..bb500b8 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -11,3 +11,4 @@ ac_add_options --enable-official-branding ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug +ac_add_options --disable-maintenance-service

1 0

[torbrowser/maint-2.3] Move mingw location to the internal path, so that we are not dependant on the install locations.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit 360cb483036ab6ea0728f83f897e546f5bcbafaf Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat May 5 00:13:49 2012 +0200 Move mingw location to the internal path, so that we are not dependant on the install locations. --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0a80f91..ecefc3e 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -17,7 +17,7 @@ BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries -MING=/c/MinGW/bin +MING=/mingw/bin QT_LIB=/c/Qt/$(QT_VER)/bin OPENSSL_LIB=$(COMPILED_BINS) WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin"

1 0

[torbrowser/maint-2.3] Linux: Update the Firefox package sequence to a sane variant.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat Jun 2 11:53:27 2012 +0200 Linux: Update the Firefox package sequence to a sane variant. --- build-scripts/linux.mk | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index ef72f13..81b0888 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -85,15 +85,12 @@ build-pidgin: build-firefox: config/dot_mozconfig $(FIREFOX_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official - cd $(FIREFOX_DIR) && make -f client.mk build + cd $(FIREFOX_DIR) && make -f client.mk build package INNER_MAKE_PACKAGE=true touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(BUILD_DIR)/Firefox - ## This is so ugly. Update it to use cool tar --transform soon. - cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package - cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(BUILD_DIR) - cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox + cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(BUILD_DIR)/Firefox build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right."

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit 4f99b60629bd66a0b4ac8352ca6aab2a63a1229c Merge: 722cec3 fb9824f Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 5 15:55:10 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig | 1 + build-scripts/linux.mk | 7 ++----- build-scripts/windows.mk | 9 +++++---- 3 files changed, 8 insertions(+), 9 deletions(-)

1 0

[torbrowser/master] Fix Zlib's prefix. We now use the sane option.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit dc1c8b67fc6142b2e00f51715cf3f8f7939b7ae3 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat May 12 23:01:25 2012 +0200 Fix Zlib's prefix. We now use the sane option. --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e6d55b0..0a80f91 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -56,10 +56,10 @@ TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist ## Include versions (must happen after variable definitions above include $(PWD)/versions.mk +ZLIB_OPTS=prefix="$(BUILT_DIR)" BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" 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 + cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install touch $(STAMP_DIR)/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

1 0

[torbrowser/maint-2.3] Fix Zlib's prefix. We now use the sane option.
by erinn＠torproject.org 05 Jun '12

05 Jun '12

commit dc1c8b67fc6142b2e00f51715cf3f8f7939b7ae3 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat May 12 23:01:25 2012 +0200 Fix Zlib's prefix. We now use the sane option. --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e6d55b0..0a80f91 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -56,10 +56,10 @@ TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist ## Include versions (must happen after variable definitions above include $(PWD)/versions.mk +ZLIB_OPTS=prefix="$(BUILT_DIR)" BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" 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 + cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install touch $(STAMP_DIR)/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

1 0