Noissue - Add '.revision'-file to devbuilds

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import ConfigParser
 import errno
 import glob
 import io
 import json
 import os
@@ skipping 336 matching lines @@
         relpath='devenvPoller__.js',
     )
     files['devenvVersion__'] = str(random.random())
 
     if metadata.has_option('general', 'testScripts'):
         files['qunit/index.html'] = createScriptPage(
             params, 'testIndex.html.tmpl', ('general', 'testScripts'),
         )
 
 
-def add_revision_file(base_dir, files):
-    if os.path.exists(os.path.join(base_dir, '.git')):
-        cmd = ['git', 'rev-parse', 'HEAD']
-        files['.revision'] = subprocess.check_output(cmd, cwd=base_dir).strip()
-
-
 def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuild=False, keyFile=None, devenv=False):
     metadata = readMetadata(baseDir, type)
     version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
     if outFile == None:
         file_extension = get_extension(type, keyFile is not None)
         outFile = getDefaultFileName(metadata, version, file_extension)
 
     params = {
         'type': type,
@@ skipping 18 matching lines @@
     if metadata.has_section('preprocess'):
         files.preprocess(
             [f for f, _ in metadata.items('preprocess')],
             {'needsExt': True},
         )
 
     if metadata.has_section('import_locales'):
         import_locales(params, files)
 
     files['manifest.json'] = createManifest(params, files)
-
-    if not releaseBuild and not devenv:
-        add_revision_file(baseDir, files)

[Sebastian Noack, 2019/10/11 21:18:43]

Splitting this out into a function seems unnecessary. Moreover, it seems more
logical to keep the checks together in order to state more obviously that we do
this for all devbuilds built from Git:

  building_from_git = os.path.exists(os.path.join(baseDir, '.git'))
  if not releaseBuild and not devenv and building_from_git:
      cmd = ['git', 'rev-parse', 'HEAD']
      files['.revision'] = subprocess.check_output(cmd, cwd=baseDir)

Note that I also removed the strip() as plain text files are supposed to end
with a new line:
https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-n...

[tlucas, 2019/10/14 12:14:54]

Done.

+    building_from_git = os.path.exists(os.path.join(baseDir, '.git'))
+    if not releaseBuild and not devenv and building_from_git:
+        cmd = ['git', 'rev-parse', 'HEAD']
+        files['.revision'] = subprocess.check_output(cmd, cwd=baseDir)
 
     if type == 'chrome':
         fix_translations_for_chrome(files)
 
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)