commit ba6ac61ef5a80eaf53dcc4f4b9622d2b9e12a9bb Author: Georg Koppen <gk@torproject.org> Date: Tue Jan 16 12:06:04 2018 +0000 Bug 24912: Don't build snowflake on the stable series yet --- projects/tor-browser/build | 11 +++++++++-- rbm.conf | 10 ++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index e87ef11..bfa250a 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -123,7 +123,12 @@ tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/os cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults [% IF c("var/linux") -%] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + [% IF ! c("var/snowflake") %] + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ + >> $TBDIR/$EXTOVERRIDESPATH + [% ELSE %] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + [% END %] [% END -%] [% IF c("var/windows") -%] # We don't have snowflake available on Windows yet @@ -134,7 +139,9 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TB [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495. - grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ + [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ + >> $TBDIR/$EXTOVERRIDESPATH [% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js diff --git a/rbm.conf b/rbm.conf index ed2319d..95b7447 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,8 +162,9 @@ targets: var: linux: 1 compiler: gcc - # We only build snowflake on linux and osx for now - snowflake: 1 + # We only build snowflake for linux and osx on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 container: suite: wheezy @@ -269,8 +270,9 @@ targets: FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac - # We only build snowflake on linux and osx for now - snowflake: 1 + # We only build snowflake for linux and osx on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python