X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=smock%2Fsmock.pl;h=a6d15af08ac1299f2666aca1f519878794883379;hb=6a274e6b86a9a2841530efc093e7e9ad6496e850;hp=d7ebbc562a03c7dc5465fff7fe427b1561debdbc;hpb=58729b97e6fdd6ece2766a2b6651330c1561387b;p=fedora-mingw.git

diff --git a/smock/smock.pl b/smock/smock.pl
index d7ebbc5..a6d15af 100755
--- a/smock/smock.pl
+++ b/smock/smock.pl
@@ -27,6 +27,8 @@ use File::Temp qw(tempfile);
 my @arches = ();
 my @distros = ();
 my $localrepo = $ENV{HOME} . "/public_html/smock/yum";
+my $dryrun = 0;
+my $chain = 0;
 my $help = 0;
 my $man = 0;
 
@@ -34,6 +36,8 @@ GetOptions (
     "arch=s" => \@arches,
     "distro=s" => \@distros,
     "localrepo=s" => \$localrepo,
+    "dryrun" => \$dryrun,
+    "chain" => \$chain,
     "help|?" => \$help,
     "man" => \$man
     ) or pod2usage (2);
@@ -87,6 +91,17 @@ You can list this option several times to build several distributions.
 
 Local repository.  Defaults to C<$HOME/public_html/smock/yum>
 
+=item B<--dryrun>
+
+Don't run any commands, just print the packages in the order
+in which they must be built.
+
+=item B<--chain>
+
+Don't run any commands, just print the packages in the correct
+format for chain building.  See:
+L<http://fedoraproject.org/wiki/Koji/UsingKoji#Chained_builds>
+
 =back
 
 =cut
@@ -181,7 +196,7 @@ sub dependency_in
     0;
 }
 
-my @names = keys %srpms;
+my @names = sort keys %srpms;
 foreach my $name (@names) {
     my @buildrequires = @{$srpms{$name}->{buildrequires}};
     @buildrequires = grep { $_ = dependency_in ($_, @names) } @buildrequires;
@@ -202,9 +217,48 @@ close $fh;
 
 my @buildorder = get_lines "tsort $filename";
 
-#foreach (@buildorder) {
-#    print "$_\n";
-#}
+# With --chain flag we print the packages in groups for chain building.
+
+if ($chain) {
+    my %group = ();
+    my $name;
+
+    print 'make chain-build CHAIN="';
+
+    foreach $name (@buildorder) {
+	my @br = @{$srpms{$name}->{buildrequires}};
+
+	# If a BR occurs within the current group, then start the next group.
+	my $occurs = 0;
+	foreach (@br) {
+	    if (exists $group{$_}) {
+		$occurs = 1;
+		last;
+	    }
+	}
+
+	if ($occurs) {
+	    %group = ();
+	    print ": ";
+	}
+
+	$group{$name} = 1;
+	print "$name ";
+    }
+    print "\"\n";
+
+    exit 0
+}
+
+# With --dryrun flag we just print the packages in build order then exit.
+
+if ($dryrun) {
+    foreach (@buildorder) {
+	print "$_\n";
+    }
+
+    exit 0
+}
 
 # Now we can build each SRPM.
 
@@ -243,15 +297,17 @@ if (! -d "$localrepo/scratch") {
 
 system "rm -f $localrepo/scratch/*";
 
-foreach my $name (@buildorder) {
-    my $version = $srpms{$name}->{version};
-    my $release = $srpms{$name}->{release};
-    my $srpm_filename = $srpms{$name}->{filename};
+# NB: Need to do the arch/distro in the outer loop to work
+# around the caching bug in mock/yum.
+foreach my $arch (@arches) {
+    foreach my $distro (@distros) {
+	foreach my $name (@buildorder) {
+	    my $version = $srpms{$name}->{version};
+	    my $release = $srpms{$name}->{release};
+	    my $srpm_filename = $srpms{$name}->{filename};
 
-    $release =~ s/\.fc?\d+$//; # "1.fc9" -> "1"
+	    $release =~ s/\.fc?\d+$//; # "1.fc9" -> "1"
 
-    foreach my $arch (@arches) {
-	foreach my $distro (@distros) {
 	    # Does the built (binary) package exist already?
 	    my $pattern = "$localrepo/$distro/$arch/RPMS/$name-$version-$release.*.rpm";
 	    #print "pattern = $pattern\n";