Changeset 8171 for inc

Timestamp:

12/11/05 03:56:59 (3 years ago)

Author:

autrijus

Message:

* Fix PJF++'s GHC probing logic by normalizing the version

numbers in directories, so we are fine even when GHC 6.10.999
is released.

Files:

• inc/Module/Install/Pugs.pm (modified) (2 diffs)

inc/Module/Install/Pugs.pm

@@ -192 +192 @@
         if (-d $ghc_root) {
             # Looks like we've found a GHC directory.  Find the latest
-            # ghc inside that.  Sorted from lexically highest to lowest.
-
-            # XXX - This will bite us should GHC contain a two-digit
-            #       revision.  Eg, 6.9.0 vs 6.10.0
-
-            my @ghc_choices = reverse glob(qq{$ghc_root/ghc-*});
+            # ghc inside that.  Sort versions from highest to lowest.
+
+            my @ghc_choices = sort {
+                _normalize_version($b) cmp _normalize_version($a)
+            } glob(qq{$ghc_root/ghc-*});
 
             GHC_TEST:
@@ -245 +244 @@
 }
 
+sub _normalize_version {
+    my $dir = shift;
+    $dir =~ /.*ghc-(.*)$/i or die "Invalid version: $dir";
+    my $ver = $1;
+    $ver =~ s{(\d+)}{sprintf('%09s', $1)}eg;
+    return $ver;
+}
+
 =head2 assert_ghc_pkg