Commit d2179847 authored by Richard Pospesel's avatar Richard Pospesel
Browse files

Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel

parent 6ca5fba3

projects/browser/build

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ cd $distdir 
  [% SET mar_file = c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %]

  MAR=$MARTOOLS/mar \

  MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \

  MAR_CHANNEL_ID=torbrowser-torproject-[% c("var/channel") %] \

  MAR_CHANNEL_ID=[% c("var/mar_channel_id") %] \

  $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR"

[% END -%]

projects/release/dmg2mar

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version 
export TOR_APPNAME_BUNDLE_OSX='[% c("var/Project_Name") -%]'

export TOR_APPNAME_DMGFILE='[% c("var/ProjectName") -%]'

export TOR_APPNAME_MARFILE='[% c("var/project-name") -%]'

[% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/channel") %]
 
[% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/mar_channel_id") %]

projects/release/update_responses_config.yml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ versions: 
[% IF c("var/create_unsigned_incrementals") -%]

        releases_dir: [% path(c('output_dir')) %]/unsigned

[% END -%]

        mar_channel_id: [% c('var/mar_channel_id') %]

        platformVersion: [% pc('firefox', 'var/firefox_platform_version') %]

        detailsURL: https://blog.torproject.org/new-release-tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]

        incremental_from:

rbm.conf

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ var: 
    - 12.5a3

  updater_enabled: 1

  build_mar: 1

  mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'



  # By default, we sort the list of installed packages. This allows sharing

  # containers with identical list of packages, even if they are not listed

  # in the same order. In the cases where the installation order is

tools/dmg2mar

+5 −5
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ sub get_dmg_files_from_sha256sums { 
}



sub convert_files {

    my ($channel) = @_;

    my ($mar_channel_id) = @_;

    my $pm = Parallel::ForkManager->new(get_nbprocs);

    $pm->run_on_finish(

      sub {
@@ -149,7 +149,7 @@ sub convert_files { 


        unlink $output;

        local $ENV{MOZ_PRODUCT_VERSION} = $file->{version};

        local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel";

        local $ENV{MAR_CHANNEL_ID} = $mar_channel_id;

        local $ENV{TMPDIR} = $tmpdir;

        (undef, $err, $success) =  capture_exec('make_full_update.sh', '-q',

                                        $output, $appdir);
@@ -178,9 +178,9 @@ sub remove_incremental_mars { 
$ENV{LC_ALL} = 'C';





exit_error "Please specify update channel" unless @ARGV == 1;

my $channel = $ARGV[0];

exit_error "Please specify the mar channel id" unless @ARGV == 1;

my $mar_channel_id = $ARGV[0];



extract_martools;

convert_files $channel;

convert_files $mar_channel_id;

remove_incremental_mars;