X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=4283a27574020c2e32fe7fd0fb6a04a363af8435;hp=6a153935ca4cfe1535ace227517bc57ddf24e745;hb=1ad50a40447cf930bde69ee6b0a21b6d35c15104;hpb=30a02caea3c10699915bb4d499d1737e52c35a3b

diff --git a/dgit b/dgit
index 6a153935..4283a275 100755
--- a/dgit
+++ b/dgit
@@ -113,6 +113,7 @@ our $keyid;
 autoflush STDOUT 1;
 
 our $supplementary_message = '';
+our $need_split_build_invocation = 0;
 
 END {
     local ($@, $?);
@@ -1208,10 +1209,12 @@ our ($dsc_hash,$lastpush_hash);
 
 our $ud = '.git/dgit/unpack';
 
-sub prep_ud () {
-    rmtree($ud);
+sub prep_ud (;$) {
+    my ($d) = @_;
+    $d //= $ud;
+    rmtree($d);
     mkpath '.git/dgit';
-    mkdir $ud or die $!;
+    mkdir $d or die $!;
 }
 
 sub mktree_in_ud_here () {
@@ -1976,6 +1979,7 @@ END
     my $format = getfield $dsc, 'Format';
     printdebug "format $format\n";
     if (madformat($format)) {
+	# user might have not used dgit build, so maybe do this now:
 	commit_quilty_patch();
     }
     check_not_dirty();
@@ -2556,8 +2560,6 @@ sub quiltify ($$) {
     # should be contained within debian/patches.
 
     changedir '../fake';
-    remove_stray_gits();
-    mktree_in_ud_here();
     rmtree '.pc';
     runcmd @git, qw(add -Af .);
     my $oldtiptree=git_write_tree();
@@ -2922,6 +2924,13 @@ END
     my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
     rename $fakexdir, "fake" or die "$fakexdir $!";
 
+    changedir 'fake';
+
+    remove_stray_gits();
+    mktree_in_ud_here();
+
+    changedir '..';
+
     quilt_fixup_mkwork($headref);
 
     my $mustdeletepc=0;
@@ -3058,33 +3067,73 @@ sub changesopts () {
 
 sub massage_dbp_args ($;$) {
     my ($cmd,$xargs) = @_;
-    if ($cleanmode eq 'dpkg-source') {
+    # We need to:
+    #
+    #  - if we're going to split the source build out so we can
+    #    do strange things to it, massage the arguments to dpkg-buildpackage
+    #    so that the main build doessn't build source (or add an argument
+    #    to stop it building source by default).
+    #
+    #  - add -nc to stop dpkg-source cleaning the source tree,
+    #    unless we're not doing a split build and want dpkg-source
+    #    as cleanmode, in which case we can do nothing
+    #
+    # return values:
+    #    0 - source will NOT need to be built separately by caller
+    #   +1 - source will need to be built separately by caller
+    #   +2 - source will need to be built separately by caller AND
+    #        dpkg-buildpackage should not in fact be run at all!
+    debugcmd '#massaging#', @$cmd if $debuglevel>1;
+#print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
+    if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
 	$suppress_clean = 1;
-	return;
+	return 0;
     }
-    debugcmd '#massaging#', @$cmd if $debuglevel>1;
-    my @newcmd = shift @$cmd;
     # -nc has the side effect of specifying -b if nothing else specified
-    push @newcmd, '-nc';
     # and some combinations of -S, -b, et al, are errors, rather than
-    # later simply overriding earlier
-    push @newcmd, '-F' unless grep { m/^-[bBASFgG]$/ } (@$cmd, @$xargs);
-    push @newcmd, @$cmd;
-    @$cmd = @newcmd;
+    # later simply overriding earlie.  So we need to:
+    #  - search the command line for these options
+    #  - pick the last one
+    #  - perhaps add our own as a default
+    #  - perhaps adjust it to the corresponding non-source-building version
+    my $dmode = '-F';
+    foreach my $l ($cmd, $xargs) {
+	next unless $l;
+	@$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
+    }
+    push @$cmd, '-nc';
+#print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
+    my $r = 0;
+    if ($need_split_build_invocation) {
+	$r = $dmode =~ m/[S]/     ? +2 :
+	     $dmode =~ y/gGF/ABb/ ? +1 :
+	     $dmode =~ m/[ABb]/   ?  0 :
+	     die "$dmode ?";
+    }
+    push @$cmd, $dmode;
+#print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
+    return $r;
 }
 
 sub cmd_build {
     my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
-    massage_dbp_args \@dbp;
-    build_prep();
-    push @dbp, changesopts_version();
-    runcmd_ordryrun_local @dbp;
+    my $wantsrc = massage_dbp_args \@dbp;
+    if ($wantsrc > 0) {
+	build_source();
+    } else {
+	build_prep();
+    }
+    if ($wantsrc < 2) {
+	push @dbp, changesopts_version();
+	runcmd_ordryrun_local @dbp;
+    }
     printdone "build successful\n";
 }
 
 sub cmd_gbp_build {
     my @dbp = @dpkgbuildpackage;
-    massage_dbp_args \@dbp, \@ARGV;
+
+    my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
 
     my @cmd;
     if (length executable_on_path('git-buildpackage')) {
@@ -3094,18 +3143,22 @@ sub cmd_gbp_build {
     }
     push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
 
-    if ($cleanmode eq 'dpkg-source') {
-	$suppress_clean = 1;
+    if ($wantsrc > 0) {
+	build_source();
     } else {
-	push @cmd, '--git-cleaner=true';
+	if (!$suppress_clean) {
+	    push @cmd, '--git-cleaner=true';
+	}
+	build_prep();
     }
-    build_prep();
-    unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
-	canonicalise_suite();
-	push @cmd, "--git-debian-branch=".lbranch();
+    if ($wantsrc < 2) {
+	unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
+	    canonicalise_suite();
+	    push @cmd, "--git-debian-branch=".lbranch();
+	}
+	push @cmd, changesopts();
+	runcmd_ordryrun_local @cmd, @ARGV;
     }
-    push @cmd, changesopts();
-    runcmd_ordryrun_local @cmd, @ARGV;
     printdone "build successful\n";
 }
 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
@@ -3352,6 +3405,10 @@ sub parseopts () {
 	    } elsif (m/^--deliberately-($deliberately_re)$/s) {
 		push @ropts, $_;
 		push @deliberatelies, $&;
+	    } elsif (m/^--always-split-source-build$/s) {
+		# undocumented, for testing
+		push @ropts, $_;
+		$need_split_build_invocation = 1;
 	    } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
 		$val = $2 ? $' : undef; #';
 		$valopt->($oi->{Long});