← Back to branch summary

~jbicha/firefox/update-dependencies

« back to all changes in this revision

Viewing changes to debian/build/create-tarball.py

  • Committer: Rico Tzschichholz
  • Date: 2017-02-02 07:48:01 UTC
  • Revision ID: ricotz@ubuntu.com-20170202074801-qgdtrnkp1tu1sdm6
* New upstream release from the beta channel (FIREFOX_52_0b2_BUILD1)
* Unconditionally build-dep on libffi-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/build/create-tarball.py
15
15
import tempfile
16
16
import select
17
17
 
18
 
def CheckCall(args, cwd=None, quiet=False, env=None):
 
18
def CheckCall(args, cwd=None, quiet=False):
19
19
  with open(os.devnull, "w") as devnull:
20
 
    p = subprocess.Popen(args, cwd=cwd, env=env,
 
20
    p = subprocess.Popen(args, cwd=cwd,
21
21
                         stdout = devnull if quiet == True else None,
22
22
                         stderr = devnull if quiet == True else None)
23
23
    r = p.wait()
314
314
        with ScopedWorkingDirectory('..'):
315
315
          topsrcdir = '%s-%s' % (name, version)
316
316
          with ScopedRename(name, topsrcdir):
317
 
            env = {'XZ_OPT': '--threads=0'}
318
 
            args = ['tar', '-Jc', '--exclude=.git', '--exclude=.gitattributes', '--exclude=.gitmodules', '--exclude=.hg', '--exclude=.hgignore', '--exclude=.hgtags', '--exclude=.svn']
 
317
            args = ['tar', '-jc', '--exclude-vcs']
319
318
            for exclude in settings['excludes']:
320
319
              args.append('--no-wildcards-match-slash') if exclude['wms'] == False else args.append('--wildcards-match-slash')
321
320
              args.append('--exclude')
322
321
              args.append(os.path.join(topsrcdir , exclude['path']))
323
322
            args.append('-f')
324
 
            args.append(os.path.join(orig_cwd, '%s_%s.orig.tar.xz' % (name, version)))
 
323
            args.append(os.path.join(orig_cwd, '%s_%s.orig.tar.bz2' % (name, version)))
325
324
            for include in settings['includes']:
326
325
              args.append(os.path.join(topsrcdir, include))
327
326
 
328
 
            CheckCall(args, env=env)
 
327
            CheckCall(args)
329
328
 
330
329
def main():
331
330
  creator = TarballCreator()