- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26396: build mingw-w64-pthread with --no-insert-timestamp
by gk＠torproject.org 18 Jun '18

18 Jun '18

commit 5a43ceb3e0f3379f13764a8cd87d469fa7d774ed Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 18 11:44:39 2018 +0200 Bug 26396: build mingw-w64-pthread with --no-insert-timestamp --- projects/mingw-w64/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 502ea94..1e25290 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -43,6 +43,7 @@ make install mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ + LDFLAGS="-Wl,--no-insert-timestamp" \ --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 make -j[% c("buildconf/num_procs") %] make install

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_26250_v5'
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit 85db911cee972e286b358bdabc50e0796823654d Merge: dc35588 61aac87 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 15 22:01:27 2018 +0200 Merge remote-tracking branch 'gk/bug_26250_v5' projects/rust/binaryen.patch | 22 ---------------------- projects/rust/build | 9 +-------- projects/rust/config | 6 ++---- projects/rust/unwind.patch | 34 +++++++++++++++++++--------------- 4 files changed, 22 insertions(+), 49 deletions(-)

1 0

[tor-browser-build/master] Bug 26250: Bump Rust version to 1.26.1
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit 61aac87c00ca7a1da9a1be9f2d181c7841769d4c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 06:12:38 2018 +0000 Bug 26250: Bump Rust version to 1.26.1 Bumping Rust to 1.26.1 avoids intermittent Firefox compilation failures we have seen, similar to those Mozilla got and documented in https://bugzilla.mozilla.org/show_bug.cgi?id=1445413. --- projects/rust/binaryen.patch | 22 ---------------------- projects/rust/build | 9 +-------- projects/rust/config | 6 ++---- projects/rust/unwind.patch | 34 +++++++++++++++++++--------------- 4 files changed, 22 insertions(+), 49 deletions(-) diff --git a/projects/rust/binaryen.patch b/projects/rust/binaryen.patch deleted file mode 100644 index fee9b6a..0000000 --- a/projects/rust/binaryen.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 820f26810baf35c1961763f6b0013e4f7e7380da Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Thu, 12 Apr 2018 13:10:13 +0000 -Subject: [PATCH] Use our gcc/c++ - - -diff --git a/src/librustc_binaryen/build.rs b/src/librustc_binaryen/build.rs -index f23ff3cee5..2496dd1be9 100644 ---- a/src/librustc_binaryen/build.rs -+++ b/src/librustc_binaryen/build.rs -@@ -26,6 +26,8 @@ fn main() { - - Config::new("../binaryen") - .define("BUILD_STATIC_LIB", "ON") -+ .define("CMAKE_C_COMPILER", "gcc") -+ .define("CMAKE_CXX_COMPILER", "c++") - .build_target("binaryen") - .build(); - --- -2.16.3 - diff --git a/projects/rust/build b/projects/rust/build index af0f62b..936f49f 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -52,20 +52,13 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] cd /var/tmp/build/rustc-[% c('version') %]-src -[% IF c("var/linux") %] - # binaryen hardcodes /usr/bin/cc and /usr/bin/c++ as the C and C++ compiler. - # But that is too old on Debian Wheezy which is why we need to patch it, so - # we can use our own GCC instead. - patch -p1 < $rootdir/binaryen.patch -[% END %] - [% IF c("var/windows-i686") %] # Cross-compiling for Windows 32bit is currently not possible without any # patches. The reason for that is libstd expecting DWARF unwinding while most # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. # See: https://github.com/rust-lang/rust/issues/12859 for discussion about # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to - # fix this problem. We backport and apply the patch from neersighted. + # fix this problem. We apply the patch from neersighted. patch -p1 < $rootdir/unwind.patch [% END %] diff --git a/projects/rust/config b/projects/rust/config index 771b50b..b5547f9 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,8 +1,8 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.25.0 +version: 1.26.1 var: - prev_version: 1.24.1 + prev_version: 1.25.0 container: use_container: 1 @@ -71,7 +71,5 @@ input_files: sig_ext: asc file_gpg_id: 1 gpg_keyring: rust.gpg - - filename: binaryen.patch - enable: '[% c("var/linux") %]' - filename: unwind.patch enable: '[% c("var/windows-i686") %]' diff --git a/projects/rust/unwind.patch b/projects/rust/unwind.patch index 8e2e0fc..3a191b9 100644 --- a/projects/rust/unwind.patch +++ b/projects/rust/unwind.patch @@ -1,4 +1,4 @@ -From f967c575e502e507ed51b7ed8d1e2a08525e6ae6 Mon Sep 17 00:00:00 2001 +From dd808373aefe6247975455006bbfb89aa6410ed9 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard <bjorn(a)neersighted.com> Date: Tue, 3 Apr 2018 19:01:07 -0600 Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux @@ -32,15 +32,15 @@ rethinking of how iOS is special-cased above, to avoid further duplication. Input on how to best structure this file is requested. diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index c85b04ddc0..2f58f0d9fa 100644 +index e6aa78fba5..624f2ccfbe 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -145,6 +145,11 @@ pub fn std_cargo(build: &Build, +@@ -146,6 +146,11 @@ pub fn std_cargo(build: &Builder, cargo.env("MACOSX_DEPLOYMENT_TARGET", target); } + // FIXME: Temporary detection of SJLJ MinGW compilers. -+ if build.build.contains("linux") && target == "i686-pc-windows-gnu" { ++ if build.build.build.contains("linux") && target == "i686-pc-windows-gnu" { + features.push_str(" sjlj_eh"); + } + @@ -48,7 +48,7 @@ index c85b04ddc0..2f58f0d9fa 100644 // stage0. This works fine if the local rust and being-built rust have the // same view of what the default allocator is, but fails otherwise. Since diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml -index c1fe4a89d6..6c8cb330d8 100644 +index 1201759885..a06ef7e0e6 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -49,3 +49,4 @@ force_alloc_system = [] @@ -57,18 +57,19 @@ index c1fe4a89d6..6c8cb330d8 100644 wasm_syscall = [] +sjlj_eh = ["unwind/sjlj_eh"] diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml -index fbd9789d2f..5e319c67fa 100644 +index fbd9789d2f..15a20d7ff4 100644 --- a/src/libunwind/Cargo.toml +++ b/src/libunwind/Cargo.toml -@@ -14,3 +14,6 @@ doc = false +@@ -14,3 +14,7 @@ doc = false [dependencies] core = { path = "../libcore" } libc = { path = "../rustc/libc_shim" } + +[features] +sjlj_eh = [] ++ diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs -index e6fff7963f..6a57cf7c93 100644 +index aa73b11fb3..16c21be736 100644 --- a/src/libunwind/libunwind.rs +++ b/src/libunwind/libunwind.rs @@ -10,11 +10,6 @@ @@ -83,15 +84,15 @@ index e6fff7963f..6a57cf7c93 100644 use libc::{c_int, c_void, uintptr_t}; #[repr(C)] -@@ -84,7 +79,6 @@ pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reaso - exception: *mut _Unwind_Exception); +@@ -85,7 +80,6 @@ pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reaso extern "C" { - #[unwind] + #[cfg_attr(stage0, unwind)] + #[cfg_attr(not(stage0), unwind(allowed))] - pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; -@@ -216,26 +210,49 @@ if #[cfg(all(any(target_os = "ios", not(target_arch = "arm"))))] { +@@ -217,28 +211,52 @@ if #[cfg(all(any(target_os = "ios", not(target_arch = "arm"))))] { pc } } @@ -103,7 +104,8 @@ index e6fff7963f..6a57cf7c93 100644 +if #[cfg(all(target_os = "ios", target_arch = "arm"))] { + // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() extern "C" { - #[unwind] + #[cfg_attr(stage0, unwind)] + #[cfg_attr(not(stage0), unwind(allowed))] - pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; - pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, - trace_argument: *mut c_void) @@ -121,7 +123,8 @@ index e6fff7963f..6a57cf7c93 100644 + +} else if #[cfg(feature = "sjlj_eh")] { extern "C" { - #[unwind] + #[cfg_attr(stage0, unwind)] + #[cfg_attr(not(stage0), unwind(allowed))] + pub fn _Unwind_SjLj_Resume(e: *mut _Unwind_Exception) -> !; pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; + pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, @@ -140,7 +143,8 @@ index e6fff7963f..6a57cf7c93 100644 } +} else { + extern "C" { -+ #[unwind] ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] + pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; + pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; + pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn,

1 0

[tor-browser-build/master] Bug 25540: Don't ship sandboxed-tor-browser anymore
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit dc355882e235178d0a1889a7d96c5721faad2716 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 11:54:02 2018 +0000 Bug 25540: Don't ship sandboxed-tor-browser anymore sandboxed-tor-browser is not maintained anymore and Yawning requested to not ship it anymore in our alphas once we switch to Firefox 60 ESR. --- projects/goerrors/config | 17 ----------------- projects/gogb/config | 23 ----------------------- projects/gogb/gb-build-dir.patch | 31 ------------------------------- projects/release/build | 3 --- projects/release/config | 7 ------- projects/sandbox/build | 26 -------------------------- projects/sandbox/config | 32 -------------------------------- 7 files changed, 139 deletions(-) diff --git a/projects/goerrors/config b/projects/goerrors/config deleted file mode 100644 index 3c11fab..0000000 --- a/projects/goerrors/config +++ /dev/null @@ -1,17 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/pkg/errors -git_hash: 248dadf4e9068a0b3e79f02ed0a610d935de5302 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/pkg/errors - -input_files: - - project: container-image - - name: go - project: go diff --git a/projects/gogb/config b/projects/gogb/config deleted file mode 100644 index dcf30f6..0000000 --- a/projects/gogb/config +++ /dev/null @@ -1,23 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/constabulary/gb -git_hash: 06cc925cce6592e922dcc4839a8b44feb384e71e -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/constabulary/gb - go_lib_install: github.com/constabulary/gb/cmd/gb - go_lib_deps: - - goerrors - -input_files: - - project: container-image - - name: go - project: go - - name: goerrors - project: goerrors - - filename: gb-build-dir.patch diff --git a/projects/gogb/gb-build-dir.patch b/projects/gogb/gb-build-dir.patch deleted file mode 100644 index a52ca69..0000000 --- a/projects/gogb/gb-build-dir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a7b198e3a32509197150d7c2767262a7319ff339 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Tue, 6 Dec 2016 21:34:16 +0000 -Subject: [PATCH] Make the gb build directory deterministic - - -diff --git a/context.go b/context.go -index 53c00da..d040082 100644 ---- a/context.go -+++ b/context.go -@@ -3,7 +3,6 @@ package gb - import ( - "fmt" - "io" -- "io/ioutil" - "os" - "os/exec" - "path/filepath" -@@ -136,7 +135,8 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) { - }, - GcToolchain(), - } -- workdir, err := ioutil.TempDir("", "gb") -+ workdir := filepath.Join(os.TempDir(), "gb") -+ err := os.Mkdir(workdir, 0777) - if err != nil { - return nil, err - } --- -2.10.2 - diff --git a/projects/release/build b/projects/release/build index a73f017..882d26d 100644 --- a/projects/release/build +++ b/projects/release/build @@ -20,9 +20,6 @@ mkdir -p "$destdir" [% END -%] [% IF c("var/torbrowser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - [% IF ! c("var/release") %] - mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip - [% END %] [% END -%] cd "$destdir" cat > .htaccess <<EOF diff --git a/projects/release/config b/projects/release/config index 2aba446..236325b 100644 --- a/projects/release/config +++ b/projects/release/config @@ -87,13 +87,6 @@ input_files: - '[% c("var/build_target") %]' - 'torbrowser-linux-x86_64[% c("var/debug-build") %]' - - name: sandbox-linux-x86_64 - project: sandbox - enable: '[% c("var/torbrowser-linux-x86_64") && ! c("var/release") %]' - target: - - '[% c("var/build_target") %]' - - torbrowser-linux-x86_64 - - name: linux-i686 project: tor-browser enable: '[% c("var/torbrowser-linux-i686") %]' diff --git a/projects/sandbox/build b/projects/sandbox/build deleted file mode 100644 index 8a3edb3..0000000 --- a/projects/sandbox/build +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir - -tar -C /var/tmp/dist -xf [% c('input_files_by_name/gogb') %] - -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] - -# we don't have access to the git repository during the build -sed -i Makefile -e 's|git rev-parse --short HEAD > data/revision|echo [% c("abbrev") %] > data/revision|' -# Unset GOOS and GOARCH as they change some file names, and we don't need -# them as we are only building on x86_64 -unset GOOS -unset GOARCH -make -cp bin/sandboxed-tor-browser $distdir - -cd $distdir/.. -[% c('zip', { - zip_src => [ project ], - zip_args => dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/sandbox/config b/projects/sandbox/config deleted file mode 100644 index 11fe6be..0000000 --- a/projects/sandbox/config +++ /dev/null @@ -1,32 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.0.16 -git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser -git_hash: 'sandboxed-tor-browser-[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: obfs4.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - suite: jessie - arch: amd64 - deps: - - libx11-dev - - pkg-config - - libgtk-3-dev - - libnotify-dev - - zip - -targets: - nightly: - git_hash: master - version: '[% c("abbrev") %]' - tag_gpg_id: 0 - -input_files: - - project: container-image - - name: go - project: go - - name: gogb - project: gogb

1 0

[tor-browser-build/master] Bug 23231: Remove our STL Wrappers workaround for Windows 64bit
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit aa79addec263ad31bad46f589e5964173b07d24f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 14 19:52:09 2018 +0000 Bug 23231: Remove our STL Wrappers workaround for Windows 64bit The fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1443823 makes our workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 obsolete, and we can remove it as it landed on esr60. --- projects/firefox/STL_win64.patch | 24 ------------------------ projects/firefox/build | 4 ---- projects/firefox/config | 2 -- 3 files changed, 30 deletions(-) diff --git a/projects/firefox/STL_win64.patch b/projects/firefox/STL_win64.patch deleted file mode 100644 index e528905..0000000 --- a/projects/firefox/STL_win64.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8f8c1a1069d4907d3cedae578975225d8caeecaf Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Sat, 12 Aug 2017 22:00:13 +0200 -Subject: [PATCH] Bug 23231: disable STL Wrappers on Windows - -Workaround for: -https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 ---- - old-configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/old-configure.in b/old-configure.in -index f5a2f05..e247551 100644 ---- a/old-configure.in -+++ b/old-configure.in -@@ -1338,7 +1338,7 @@ MOZ_CXX11 - AC_LANG_C - - case "${OS_TARGET}" in --Darwin) -+WINNT|Darwin) - ;; - *) - STL_FLAGS="-I${DIST}/stl_wrappers" diff --git a/projects/firefox/build b/projects/firefox/build index 1b3a0d0..9f849b0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -132,10 +132,6 @@ fi export CC='gcc -m32' [% END -%] -[% IF c("var/windows-x86_64") %] - patch -p1 < $rootdir/STL_win64.patch -[% END -%] - [% IF c("var/windows") %] patch -p1 < $rootdir/nsis-uninstall.patch [% END -%] diff --git a/projects/firefox/config b/projects/firefox/config index 9d0829d..c2cbebd 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -104,8 +104,6 @@ input_files: - project: gcc name: gcc enable: '[% c("var/windows") %]' - - filename: STL_win64.patch - enable: '[% c("var/windows-x86_64") %]' - filename: nsis-uninstall.patch enable: '[% c("var/windows") %]' - project: rust

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_23231'
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit 5e72f5077d7c974e30c9f48f2c554ded6e8358d1 Merge: b9a2dfe aa79add Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 15 11:31:19 2018 +0200 Merge remote-tracking branch 'gk/bug_23231' projects/firefox/STL_win64.patch | 24 ------------------------ projects/firefox/build | 4 ---- projects/firefox/config | 2 -- 3 files changed, 30 deletions(-)

1 0

[tor-browser-build/master] Bug 26304: Bump zlib to latest stable (1.2.11)
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit b9a2dfe610121f88be74d8569ee2b9f904132670 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 06:18:26 2018 +0000 Bug 26304: Bump zlib to latest stable (1.2.11) --- projects/zlib/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/zlib/config b/projects/zlib/config index 4ac96c9..2a98469 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.2.8 +version: 1.2.11 git_hash: 'v[% c("version") %]' git_url: https://github.com/madler/zlib.git gpg_keyring: zlib.gpg

1 0

[tor-browser-build/master] Bug 26205: Don't build the uninstaller for Windows during Firefox compilation
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 0f6ebe396fad0834388fd2424218582b32493816 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jun 12 22:02:03 2018 -0400 Bug 26205: Don't build the uninstaller for Windows during Firefox compilation --- projects/firefox/build | 4 ++ projects/firefox/config | 2 + projects/firefox/nsis-uninstall.patch | 73 +++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 09620ae..1b3a0d0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -136,6 +136,10 @@ fi patch -p1 < $rootdir/STL_win64.patch [% END -%] +[% IF c("var/windows") %] + patch -p1 < $rootdir/nsis-uninstall.patch +[% END -%] + [% IF c("var/osx") %] patch -p1 < $rootdir/no-dmg.patch [% END -%] diff --git a/projects/firefox/config b/projects/firefox/config index 120ad35..9d0829d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -106,6 +106,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' + - filename: nsis-uninstall.patch + enable: '[% c("var/windows") %]' - project: rust name: rust - project: llvm diff --git a/projects/firefox/nsis-uninstall.patch b/projects/firefox/nsis-uninstall.patch new file mode 100644 index 0000000..765ef67 --- /dev/null +++ b/projects/firefox/nsis-uninstall.patch @@ -0,0 +1,73 @@ +From 4ef264b601ac92a0b385c40bd011ef94618a176a Mon Sep 17 00:00:00 2001 +From: Sukhbir Singh <sukhbir(a)torproject.org> +Date: Tue, 12 Jun 2018 21:58:24 -0400 +Subject: [PATCH 1/1] Bug 26205: Don't build the uninstaller for Windows during + Firefox compilation + +--- + browser/Makefile.in | 4 ---- + browser/installer/Makefile.in | 4 ---- + .../mozbuild/mozbuild/repackaging/installer.py | 17 +---------------- + 3 files changed, 1 insertion(+), 24 deletions(-) + +diff --git a/browser/Makefile.in b/browser/Makefile.in +index 2eb9e708f68e..0c9442183942 100644 +--- a/browser/Makefile.in ++++ b/browser/Makefile.in +@@ -6,10 +6,6 @@ include $(topsrcdir)/config/rules.mk + + ifdef MAKENSISU + +-# For Windows build the uninstaller during the application build since the +-# uninstaller is included with the application for mar file generation. +-libs:: +- $(MAKE) -C installer/windows uninstaller + ifdef MOZ_MAINTENANCE_SERVICE + $(MAKE) -C installer/windows maintenanceservice_installer + endif +diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in +index 1bf11252ee06..dee6d5434106 100644 +--- a/browser/installer/Makefile.in ++++ b/browser/installer/Makefile.in +@@ -98,10 +98,6 @@ ifdef NECKO_WIFI + DEFINES += -DNECKO_WIFI + endif + +-ifdef MAKENSISU +-DEFINES += -DHAVE_MAKENSISU=1 +-endif +- + ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) + MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore + MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png +diff --git a/python/mozbuild/mozbuild/repackaging/installer.py b/python/mozbuild/mozbuild/repackaging/installer.py +index 9b49eb555153..1e6f6e73c3d8 100644 +--- a/python/mozbuild/mozbuild/repackaging/installer.py ++++ b/python/mozbuild/mozbuild/repackaging/installer.py +@@ -27,22 +27,7 @@ def repackage_installer(topsrcdir, tag, setupexe, package, output, package_name, + tmpdir = tempfile.mkdtemp() + old_cwd = os.getcwd() + try: +- if package: +- z = zipfile.ZipFile(package) +- z.extractall(tmpdir) +- z.close() +- +- # Copy setup.exe into the root of the install dir, alongside the +- # package. +- shutil.copyfile(setupexe, mozpath.join(tmpdir, mozpath.basename(setupexe))) +- +- # archive_exe requires us to be in the directory where the package is +- # unpacked (the tmpdir) +- os.chdir(tmpdir) +- +- sfx_package = mozpath.join(topsrcdir, sfx_stub) +- +- archive_exe(package_name, tag, sfx_package, output) ++ pass + + finally: + os.chdir(old_cwd) +-- +2.17.1 +

1 0

[tor-browser-build/master] Bug 26203: Update mozconfig for Windows nightly build
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 656090e748599053adfb9d0c31b6955ba7ef8129 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jun 12 22:04:06 2018 -0400 Bug 26203: Update mozconfig for Windows nightly build Also enable rust for all builds. --- projects/firefox/build | 8 +++----- projects/firefox/config | 1 - projects/firefox/mozconfig-windows-i686 | 3 +++ projects/firefox/mozconfig-windows-x86_64 | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 81032c6..09620ae 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -65,11 +65,9 @@ EOF export SELFRANDO_skip_shuffle= [% END -%] -[% IF ! c("var/windows") %] - mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] - export PATH="/var/tmp/dist/rust/bin:$PATH" -[% END -%] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] +export PATH="/var/tmp/dist/rust/bin:$PATH" [% IF c("var/linux") %] # Add llvm so stylo can build diff --git a/projects/firefox/config b/projects/firefox/config index 5bde93d..120ad35 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -108,7 +108,6 @@ input_files: enable: '[% c("var/windows-x86_64") %]' - project: rust name: rust - enable: '[% ! c("var/windows") %]' - project: llvm name: llvm enable: '[% c("var/linux") %]' diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index dfb3326..daeaed4 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -24,3 +24,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests +ac_add_options --disable-stylo # Bugzilla 1390583 +ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/ +ac_add_options --disable-jemalloc # Bugzilla 1466192 diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 669c124..568d88d 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -18,12 +18,12 @@ ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar -# We can't build the sandbox code with mingw-w64: -# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 -ac_add_options --disable-sandbox # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests +ac_add_options --disable-stylo # Bugzilla 1390583 +ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/ +ac_add_options --disable-jemalloc # Bugzilla 1466192

1 0

[tor-browser-build/master] Bug 25837: Integrate fxc2 for Windows Tor Browser builds
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 57693e01837f0fc7c60bb056e5b752f5f67a987b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jun 14 13:21:18 2018 +0000 Bug 25837: Integrate fxc2 for Windows Tor Browser builds This commit adds support for building and bundling fxc2 which is required for Windows cross-compilation on Linux. --- projects/firefox/build | 18 ++++++++++++++++++ projects/firefox/config | 8 ++++++++ projects/fxc2/build | 30 ++++++++++++++++++++++++++++++ projects/fxc2/config | 14 ++++++++++++++ 4 files changed, 70 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 0fd3da2..81032c6 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -34,6 +34,23 @@ EOF export PATH="$mingwdir/helpers:$PATH" [% END -%] +[% IF c("var/windows") %] + # Unpack fxc2. + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf [% c('input_files_by_name/fxc2') %] + fxcdir=/var/tmp/dist/fxc2/bin + cp $mingwdir/[% c("arch") %]-w64-mingw32/bin/libwinpthread-1.dll $fxcdir + export PATH="$fxcdir:$PATH" + # fxc2 requires Wine. + [% IF c("var/windows-x86_64") %] + export WINEARCH=win64 + [% END %] + export HOME=/var/tmp/home + mkdir -p $HOME + WINEROOT=$HOME/.wine/drive_c + wine wineboot -i +[% END -%] + [% IF c("var/linux") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] @@ -161,6 +178,7 @@ rm -f js/src/configure cp -a obj-*/dist/firefox/* $distdir/Browser/ cp -a $rootdir/msvcr100.dll $distdir/Browser cp -a $gcclibs/libssp-0.dll $distdir/Browser + cp -a $fxcdir/d3dcompiler_47.dll $distdir/Browser [% END %] # Make MAR-based update tools available for use during the bundle phase. diff --git a/projects/firefox/config b/projects/firefox/config index 6cb17c7..5bde93d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -65,6 +65,11 @@ targets: arch_deps: - rsync + windows: + var: + arch_deps: + - wine + windows-i686: var: martools_filename: mar-tools-win32.zip @@ -107,3 +112,6 @@ input_files: - project: llvm name: llvm enable: '[% c("var/linux") %]' + - project: fxc2 + name: fxc2 + enable: '[% c("var/windows") %]' diff --git a/projects/fxc2/build b/projects/fxc2/build new file mode 100644 index 0000000..46a7db8 --- /dev/null +++ b/projects/fxc2/build @@ -0,0 +1,30 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" + +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.gz +cd /var/tmp/build/[% project %]-[% c("version") %] + +[% IF c("var/windows-i686") -%] + make x86 +[% ELSE -%] + make x64 +[% END -%] + +mkdir -p $distdir/bin/ +cp fxc2.exe $distdir/bin/ +[% IF c("var/windows-i686") -%] + cp dll/d3dcompiler_47_32.dll $distdir/bin/d3dcompiler_47.dll +[% ELSE -%] + cp dll/d3dcompiler_47.dll $distdir/bin/ +[% END -%] + +cd /var/tmp/dist + +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/fxc2/config b/projects/fxc2/config new file mode 100644 index 0000000..aac9158 --- /dev/null +++ b/projects/fxc2/config @@ -0,0 +1,14 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/azadi/fxc2.git +git_hash: 079f5c7b9f6ea0b7e5504bb53abf8709cc92835d +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]'

1 0