This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 6be46bce55cea8b4da2b1d3af8feea928abaa752
Author: James McCoy <[email protected]>
Date:   Sun Nov 20 16:36:21 2016 -0500

    debuild: Recognize --build= and -F/-G/-g flags
    
    Signed-off-by: James McCoy <[email protected]>
---
 scripts/debuild.pl | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 005196c..5207df5 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -803,7 +803,32 @@ if ($command_version eq 'dpkg') {
        $_ eq '-A' and $binaryonly=$_, $binarytarget='binary-indep',
            push(@dpkg_opts, $_), next;
        $_ eq '-S' and $sourceonly=$_, push(@dpkg_opts, $_), next;
-           # Explained below, no implied -d
+       $_ eq '-F' and $binarytarget='binary', push(@dpkg_opts, $_), next;
+       $_ eq '-G' and $binarytarget='binary-arch', push(@dpkg_opts, $_), next;
+       $_ eq '-g' and $binarytarget='binary-indep', push(@dpkg_opts, $_), next;
+       if (/^--build=(.*)$/) {
+           my $argstr = $_;
+           my @builds = split(/,/, $1);
+           my ($binary, $source);
+           for my $build (@builds) {
+               if ($build =~ m/^(?:binary|full)$/) {
+                   $source++ if $1 eq 'full';
+                   $binary++;
+                   $binarytarget = 'binary';
+               }
+               elsif ($build eq 'any') {
+                   $binary++;
+                   $binarytarget = 'binary-arch';
+               }
+               elsif ($build eq 'all') {
+                   $binary++;
+                   $binarytarget = 'binary-indep';
+               }
+           }
+           $binaryonly = (!$source && $binary);
+           $sourceonly = ($source && !$binary);
+           push(@dpkg_opts, $argstr);
+       }
        /^-v(.*)/ and $since=$1, push(@dpkg_opts, $_), next;
        /^-m(.*)/ and $maint=$1, push(@debsign_opts, $_), push(@dpkg_opts, $_),
            next;
@@ -848,8 +873,33 @@ if ($command_version eq 'dpkg') {
            push(@dpkg_opts, $_), next;
        $_ eq '-A' and $binaryonly=$_, $binarytarget='binary-indep',
            push(@dpkg_opts, $_), next;
-       $_ eq '-S' and $sourceonly=$_, $checkbuilddep=0, push(@dpkg_opts, $_),
-           next;
+       $_ eq '-S' and $sourceonly=$_, push(@dpkg_opts, $_), next;
+       $_ eq '-F' and $binarytarget='binary', push(@dpkg_opts, $_), next;
+       $_ eq '-G' and $binarytarget='binary-arch', push(@dpkg_opts, $_), next;
+       $_ eq '-g' and $binarytarget='binary-indep', push(@dpkg_opts, $_), next;
+       if (/^--build=(.*)$/) {
+           my $argstr = $_;
+           my @builds = split(/,/, $1);
+           my ($binary, $source);
+           for my $build (@builds) {
+               if ($build =~ m/^(?:binary|full)$/) {
+                   $source++ if $1 eq 'full';
+                   $binary++;
+                   $binarytarget = 'binary';
+               }
+               elsif ($build eq 'any') {
+                   $binary++;
+                   $binarytarget = 'binary-arch';
+               }
+               elsif ($build eq 'all') {
+                   $binary++;
+                   $binarytarget = 'binary-indep';
+               }
+           }
+           $binaryonly = (!$source && $binary);
+           $sourceonly = ($source && !$binary);
+           push(@dpkg_opts, $argstr);
+       }
        /^-v(.*)/ and $since=$1, push(@dpkg_opts, $_), next;
        /^-m(.*)/ and $maint=$1, push(@debsign_opts, $_), push(@dpkg_opts, $_),
            next;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Reply via email to