commit 6addbb462522428c8aecbd901510d6a523188686
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 14 08:47:38 2020 +0000
Bug 40088: Use MOZ_BUILD_DATE for extension manifest timestamps
---
projects/fenix/build | 14 ++++++++++++++
projects/fenix/config | 1 +
2 files changed, 15 insertions(+)
diff --git a/projects/fenix/build b/projects/fenix/build
index 806044b..7569250 100644
--- a/projects/fenix/build
+++ b/projects/fenix/build
@@ -6,6 +6,10 @@ builddir=/var/tmp/build/[% project %]
mkdir -p $distdir/[% project %]
mkdir -p /var/tmp/build
+cat > get-moz-build-date << "EOF"
+[% INCLUDE "get-moz-build-date" %]
+EOF
+
[% IF !c("var/fetch_gradle_dependencies") %]
[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]
# XXX: Make this more generic and not only for geckoview-beta.
@@ -45,6 +49,16 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
# not only for geckoview-beta.
cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar
+ eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %])
+ if [ -z $MOZ_BUILD_DATE ]
+ then
+ echo "MOZ_BUILD_DATE is not set"
+ exit 1
+ else
+ # We only need a MMddHHmmss format and thus no year.
+ MOZ_BUILD_DATE=${MOZ_BUILD_DATE:4}
+ fi
+
$GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint
# XXX We need the build variant in lower case. Do something smarter here.
v=[% c("variant") %]
diff --git a/projects/fenix/config b/projects/fenix/config
index 034714f..64b9620 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -11,6 +11,7 @@ var:
fenix_version: '81.1.0b[% c("var/beta_version") %]'
beta_version: 1
torbrowser_branch: 10.0
+ copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.