[tbb-commits] [tor-browser-bundle/maint-5.0] Bug 16910: Mac OS app bundle has wrong copyright year.

[gk at torproject.org]

commit 7d0d8bb670f93be292997d6483825f661a29583f
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Sep 8 10:29:10 2015 -0400

    Bug 16910: Mac OS app bundle has wrong copyright year.
    
    Insert the year associated with the last tor-browser commit when
    generating the Info.plist file for Mac OS.
---
 gitian/build-helpers/fix-info-plist.py    |    6 +++---
 gitian/descriptors/mac/gitian-firefox.yml |    4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gitian/build-helpers/fix-info-plist.py b/gitian/build-helpers/fix-info-plist.py
index ac531ec..fae29ed 100755
--- a/gitian/build-helpers/fix-info-plist.py
+++ b/gitian/build-helpers/fix-info-plist.py
@@ -10,17 +10,17 @@ import plistlib
 import sys
 
 def usage():
-    print >> sys.stderr, "usage: %s TORBROWSER_VERSION < Info.plist > FixedInfo.plist" % sys.argv[0]
+    print >> sys.stderr, "usage: %s TORBROWSER_VERSION YEAR < Info.plist > FixedInfo.plist" % sys.argv[0]
     sys.exit(2)
 
 _, args = getopt.gnu_getopt(sys.argv[1:], "")
 
-if len(args) != 1:
+if len(args) != 2:
     usage()
 
 TORBROWSER_VERSION = args[0]
+YEAR = args[1]
 
-YEAR = "2014"
 COPYRIGHT = "Tor Browser %s Copyright %s The Tor Project" % (TORBROWSER_VERSION, YEAR)
 
 plist = plistlib.readPlist(sys.stdin)
diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml
index e8f1046..1c34544 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -58,6 +58,8 @@ script: |
   tar xaf MacOSX10.7.sdk.tar.gz
   #
   cd tor-browser
+  TB_COMMIT_DATE=$(git show -s --format='%ci')
+  COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*}
   mv .mozconfig-mac .mozconfig
   # .git and the src takes up a lot of useless space, and we need the space to build
   #git archive HEAD | tar -x -C $OUTDIR/src
@@ -101,7 +103,7 @@ script: |
   # Adjust the Info.plist file
   INFO_PLIST=TorBrowser.app/Contents/Info.plist
   mv $INFO_PLIST tmp.plist
-  ~/build/fix-info-plist.py $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST
+  ~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST
   rm -f tmp.plist
   ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja
   ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja