Bug 1479401: Include lib directory into the infer tar, and change maintainer. draft
authorRobert Bartlensky <rbartlensky@mozilla.com>
Mon, 30 Jul 2018 12:45:02 +0100
changeset 824262 a171d171b7e917df9bc12e9d47943791425cdaca
parent 824261 8158423867850e764b61b6ddf75346e93f20f386
push id117845
push userbmo:rbartlensky@mozilla.com
push dateMon, 30 Jul 2018 11:46:19 +0000
bugs1479401
milestone63.0a1
Bug 1479401: Include lib directory into the infer tar, and change maintainer. MozReview-Commit-ID: Ibyw9SCMVVB
build/build-infer/build-infer.py
taskcluster/docker/infer-build/Dockerfile
--- a/build/build-infer/build-infer.py
+++ b/build/build-infer/build-infer.py
@@ -22,23 +22,23 @@ def run_in(path, args, extra_env=None):
     Runs the given commands in the directory specified by <path>.
     '''
     env = dict(os.environ)
     env.update(extra_env or {})
     check_run(args, path)
     subprocess.run(args, cwd=path)
 
 
-def build_tar_package(tar, name, base, directory):
+def build_tar_package(tar, name, base, directories):
     name = os.path.realpath(name)
     run_in(base, [tar,
                   '-c',
                   '-%s' % ('J' if '.xz' in name else 'j'),
                   '-f',
-                  name, directory])
+                  name] + directories)
 
 
 def is_git_repo(dir):
     '''Check whether the given directory is a git repository.'''
     from subprocess import CalledProcessError
     try:
         check_run(['git', 'rev-parse'], dir)
         return True
@@ -108,9 +108,10 @@ if __name__ == '__main__':
     for p in config.get('patches', []):
         run_in(source_dir, ['git', 'apply', os.path.join(dir_path, p)])
     # build infer
     run_in(source_dir, ['./build-infer.sh', 'java'],
            extra_env={'NO_CMAKE_STRIP': '1'})
     package_name = 'infer'
     if not args.skip_tar:
         build_tar_package('tar', '%s.tar.xz' % (package_name),
-                          source_dir, os.path.join('infer', 'bin'))
+                          source_dir, [os.path.join('infer', 'bin'),
+                                       os.path.join('infer', 'lib')])
--- a/taskcluster/docker/infer-build/Dockerfile
+++ b/taskcluster/docker/infer-build/Dockerfile
@@ -1,11 +1,11 @@
 # %ARG DOCKER_IMAGE_PARENT
 FROM $DOCKER_IMAGE_PARENT
-MAINTAINER Mike Hommey <mhommey@mozilla.com>
+MAINTAINER Robert Bartlensky <rbartlensky@mozilla.com>
 
 VOLUME /builds/worker/checkouts
 VOLUME /builds/worker/workspace
 VOLUME /builds/worker/tooltool-cache
 
 ENV XZ_OPT=-T0
 
 RUN apt-get update && \