Commit ba6ac61e authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 24912: Don't build snowflake on the stable series yet

parent eb12aafc

projects/tor-browser/build

+9 −2
Original line number Diff line number Diff line
@@ -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") -%]

  [% 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

rbm.conf

+6 −4
Original line number Diff line number Diff line
@@ -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