Changeset 16502 for util

Timestamp:

05/22/07 13:46:29 (18 months ago)

Author:

audreyt

Message:

* Thoroughly remove src/pcre and src/RRegex in favor of

third-party/hsregex/.

Files:

• util/build_pugs.pl (modified) (4 diffs)

util/build_pugs.pl

@@ -194 +194 @@
 =cut
 
-    foreach my $module (qw< filepath HsSyck >) {
+    foreach my $module (qw< filepath HsSyck hsregex >) {
         if ( my ($archive_dir) = (
                 glob("third-party/installed/*/$module-*"),
@@ -464 +464 @@
     #system $ghc, '--make', @_, @o, '-o' => 'pugs', 'src/Main.hs';
 
-    $push_pkgs->(qw(stm network mtl template-haskell base pugs-HsSyck));
+    $push_pkgs->(qw(stm network mtl template-haskell base pugs-HsSyck pugs-hsregex));
     if ($^O =~ /(?:MSWin32|mingw|msys|cygwin)/) {
         $push_pkgs->('Win32') unless $ghc_version =~ /^6.4(?:.0)?$/;
@@ -485 +485 @@
         $out = "pugs-prof$Config{_exe}";
         push @libs, '-prof';
-        push @pkgs, glob('third-party/HsSyck/dist/build/syck/*.o'), qw( dist/build/src/pcre/pcre.o );
+        push @pkgs, glob('third-party/HsSyck/dist/build/syck/*.o'), qw( third-party/hsregex/dist/build/pcre/pcre.o );
     }
     else {
@@ -568 +568 @@
         else {
             s/pugs-HsSyck -any, //;
+            s/pugs-hsregex -any, //;
         }
         s/__OPTIONS__/@args/;