X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=show-build-order.pl;h=b55e10abe2ca746f1f541864707c8c5d0e115694;hb=7d1516cd3616f013653da2e98abc9bbed0b544f2;hp=a182d85978f78aeb0711fea3080015afac010bff;hpb=b928f8d086a402f5a220d1b0a90f9b4558eb7cd5;p=fedora-mingw.git

diff --git a/show-build-order.pl b/show-build-order.pl
index a182d85..b55e10a 100755
--- a/show-build-order.pl
+++ b/show-build-order.pl
@@ -54,16 +54,20 @@ sub main {
     }
 
     # Some packages we want to ignore for now.
-    delete $br{"mingw-cyrus-sasl"};
-    delete $br{"mingw-nsis"};
-    delete $br{"mingw-wix"};
-    delete $br{"mingw-example"};
+    delete $br{"mingw32-cyrus-sasl"};
+    delete $br{"mingw32-wix"};
+    delete $br{"mingw32-example"};
+    delete $br{"mingw32-gdb"};
+    delete $br{"mingw32-python"};
+    delete $br{"mingw32-pidgin"};
+    delete $br{"mingw32-nspr"};
+    delete $br{"mingw32-nss"};
 
     # There is a dependency loop (gcc -> runtime/w32api -> gcc)
     # which has to be manually resolved below.  Break that loop.
-    my @gcc_brs = @{$br{"mingw-gcc"}};
-    @gcc_brs = grep { $_ ne "mingw-runtime" && $_ ne "mingw-w32api" } @gcc_brs;
-    $br{"mingw-gcc"} = \@gcc_brs;
+    my @gcc_brs = @{$br{"mingw32-gcc"}};
+    @gcc_brs = grep { $_ ne "mingw32-runtime" && $_ ne "mingw32-w32api" } @gcc_brs;
+    $br{"mingw32-gcc"} = \@gcc_brs;
 
     # Use tsort to generate a topological ordering.
     open TSORT,">/tmp/tsort.tmp" or die "/tmp/tsort.tmp: $!";
@@ -90,7 +94,7 @@ sub main {
 
     while (<PACKAGES>) {
 	chomp;
-	if (/^mingw-(.*)/) {
+	if (/^mingw32-(.*)/ && exists $br{$_}) {
 	    $packagename = $_;
 	    my $dirname = $1;
 
@@ -102,22 +106,22 @@ sub main {
 	    my $br;
 	    foreach $br (@brs) {
 		if (! rpm_installed ($br) && !exists $installed{$br}) {
-		    print "as root # rpm -Uvh $br*.rpm\n";
+		    print "# as root: rpm -Uvh $br*.rpm\n";
 		    $installed{$br} = 1;
 		}
 	    }
 
-	    # Special case for mingw-gcc deps.
-	    if ($packagename eq "mingw-gcc" &&
-		(!rpm_installed ("mingw-runtime") ||
-		 !rpm_installed ("mingw-w32api"))) {
-		print "rpmbuild -ba --define \"_sourcedir $pwd/runtime-bootstrap\" runtime-bootstrap/mingw-runtime-bootstrap.spec\n";
-	        print "as root # rpm -Uvh mingw-runtime-bootstrap*.rpm\n";
-		$installed{"mingw-runtime-bootstrap"} = 1;
-
-		print "rpmbuild -ba --define \"_sourcedir $pwd/w32api-bootstrap\" w32api-bootstrap/mingw-w32api-bootstrap.spec\n";
-	        print "as root # rpm -Uvh mingw-w32api-bootstrap*.rpm\n";
-		$installed{"mingw-w32api-bootstrap"} = 1;
+	    # Special case for mingw32-gcc deps.
+	    if ($packagename eq "mingw32-gcc" &&
+		(!rpm_installed ("mingw32-runtime") ||
+		 !rpm_installed ("mingw32-w32api"))) {
+		print "rpmbuild -ba --define \"_sourcedir $pwd/runtime-bootstrap\" runtime-bootstrap/mingw32-runtime-bootstrap.spec\n";
+	        print "# as root: rpm -Uvh mingw32-runtime-bootstrap*.rpm\n";
+		$installed{"mingw32-runtime-bootstrap"} = 1;
+
+		print "rpmbuild -ba --define \"_sourcedir $pwd/w32api-bootstrap\" w32api-bootstrap/mingw32-w32api-bootstrap.spec\n";
+	        print "# as root: rpm -Uvh mingw32-w32api-bootstrap*.rpm\n";
+		$installed{"mingw32-w32api-bootstrap"} = 1;
 	    }
 
 	    # Spec file.
@@ -162,8 +166,8 @@ sub remove_trailers {
     s/-devel$//;
     s/-doc$//;
 
-    # mingw-gcc-c++ etc.
-    s/^mingw-gcc-.*/mingw-gcc/;
+    # mingw32-gcc-c++ etc.
+    s/^mingw32-gcc-.*/mingw32-gcc/;
 
     return $_;
 }