From 96174dd10b0fd5f43656d582d5ecb2b4877641a8 Mon Sep 17 00:00:00 2001 From: Javier Jardón Date: Tue, 16 Aug 2011 17:21:14 +0100 Subject: configure.ac: Generate xz tarballs with ustar format by default --- configure.ac | 6 +++--- release.py | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index e95f8b0ab..d8de67f2c 100644 --- a/configure.ac +++ b/configure.ac @@ -80,12 +80,12 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability) +AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability tar-ustar no-dist-gzip dist-xz]) -# Support silent build rules, requires at least automake-1.11. Disable +# Support silent build rules. Disable # by either passing --disable-silent-rules to configure or passing V=1 # to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AM_SILENT_RULES([yes]) # Check for programs AC_PROG_CC diff --git a/release.py b/release.py index 41b180105..1821aa32f 100755 --- a/release.py +++ b/release.py @@ -88,12 +88,9 @@ class Project: def get_md5sums(self): md5sums = '' - cmd = 'md5sum %s-%s.tar.gz' % (self.package_name.lower(), self.package_version) + cmd = 'md5sum %s-%s.tar.xz' % (self.package_name.lower(), self.package_version) md5sums += self.exec_cmd(cmd) - cmd = 'md5sum %s-%s.tar.bz2' % (self.package_name.lower(), self.package_version) - md5sums += self.exec_cmd(cmd).strip() - return md5sums def get_bugzilla_info(self): @@ -259,7 +256,7 @@ class Project: def upload_tarball(self): username = self._get_username() - tarball = '%s-%s.tar.gz' % (self.package_name.lower(), self.package_version) + tarball = '%s-%s.tar.xz' % (self.package_name.lower(), self.package_version) cmd = 'scp %s %s@%s:' % (tarball, username, upload_server) self.exec_cmd(cmd) -- cgit