Unverified Commit 8dfe938c authored by boklm's avatar boklm
Browse files

Set firefox buildid based on version number

parent d275f1d8

projects/firefox/build

+7 −2
Original line number Diff line number Diff line
@@ -32,7 +32,12 @@ mkdir -p $distdir/Debug/Browser/browser/components 
cd /var/tmp/build/[% project %]-[% c("version") %]

mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig



# TODO: run get-moz-build-date

eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt))

if [ -z $MOZ_BUILD_DATE ]

then

    echo "MOZ_BUILD_DATE is not set"

    exit 1

fi



[% IF c("var/windows") %]

# FIXME
@@ -75,7 +80,7 @@ rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin 
# Adjust the Info.plist file

INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist

mv $INFO_PLIST tmp.plist

python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% exec("git show -s --format=%ci").remove("-.*") %]' < tmp.plist > $INFO_PLIST

python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST

rm -f tmp.plist

[% END %]

projects/firefox/config

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ remote_docker: 1 
var:

  firefox_version: 45.6.0esr

  torbrowser_update_channel: alpha

  copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'

  deps:

    - build-essential

    - unzip
@@ -70,6 +71,7 @@ input_files: 
  - project: docker-image

  - name: '[% c("var/compiler") %]'

    project: '[% c("var/compiler") %]'

  - filename: get-moz-build-date

  - filename: 'mozconfig-[% c("var/osname") %]'

    name: mozconfig

  - project: binutils

projects/firefox/get-moz-build-date

+2 −9
Original line number Diff line number Diff line
@@ -3,15 +3,8 @@ 


use strict;



my ($year) = split('-', `git show -s --format='%ci'`);

if ($? != 0) {

    print STDERR "Failed to get year from the git commit\n";

    print "exit 1\n";

    exit 1;

}



die "missing argument" unless @ARGV;

my $version = $ARGV[0];

die "wrong number of arguments" unless @ARGV == 2;

my ($year, $version) = @ARGV;

$version =~ s/\D+$//;

my @v = split(/[\.ab]/, $version);

push @v, '0' if @v < 4;

rbm.conf

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ pkg_type: build 


var:

  torbrowser_version: '6.5n'

  copyright_year: '2016'

  # 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