From fa8d6c96fd118fb29e9d3b94ef3df07979f93684 Mon Sep 17 00:00:00 2001 From: Mirko Tietgen Date: Mon, 1 Aug 2016 17:13:55 +0200 Subject: [PATCH] Bug 17066 - build-git-snapshot: add basetgz parameter and update master version number 3.22 This adds a basetgz parameter to specify a pbuilder image. I use this to build against different distributions. This also updates the version number for master builds to 16.06. Version for 3.22.x --- debian/build-git-snapshot | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot index 62447fd..1e1505d 100755 --- a/debian/build-git-snapshot +++ b/debian/build-git-snapshot @@ -27,15 +27,17 @@ use warnings; use Getopt::Long; use POSIX qw/strftime/; +my $basetgz; my $buildresult; my $distribution='squeeze-dev'; my $git_checks='all'; -my $version='3.21~git'; +my $version='16.06~git'; my $auto_version=1; my $need_help; my $debug; GetOptions( + 'basetgz|b=s' => \$basetgz, 'buildresult|r=s' => \$buildresult, 'distribution|D=s' => \$distribution, 'git-checks|g=s' => \$git_checks, @@ -137,7 +139,8 @@ sub build_package { sys_command_output( qq{git archive --format=tar --prefix="koha-$newversion/" HEAD | gzip -9 > "../koha_$newversion.tar.gz"} ); my $pdebuildopts = $buildresult ? "--buildresult $buildresult" : ""; - sys_command_output_screen( "pdebuild $pdebuildopts" ); + my $pdebuildbasetgz = $basetgz ? "-- --basetgz /var/cache/pbuilder/" . $basetgz . ".tgz" : ""; + sys_command_output_screen( "pdebuild $pdebuildbasetgz $pdebuildopts" ); } everything_is_committed() or die "cannot build: uncommited changes"; -- 2.8.1