Changeset 19961 for util

Timestamp:

02/20/08 18:55:35 (9 months ago)

Author:

gwern

Message:

Update GHC 6.8.1 notes with my observations;
Add myself to AUTHORS;
Add my favorite book series to READTHEM;
Revamp the Pugs.cabal.in. This includes formatting, additional metadata, and adds a dependency on a more recent bytestring (to work with all the preceding patches), and also a Cabal, because we need that oldtime section syntax... for compatibility with GHC 6.6 & 6.8
Remove a regexp from util/build_pugs.pl because we can't have backwards compatbility with that old Cabals if we want 6.8.x as well, so it merely messes up the generated Cabal file.

Files:

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

util/build_pugs.pl

@@ -47 +47 @@
     my $thispugs = { @{ $opts->{GEN_PRELUDE} } }->{'--pugs'} or # laugh at me now.
         die "$0: no pugs passed in _+GEN_PRELUDE segment";
-    
+
     if ( grep '--precompile-prelude', @{ $opts->{GEN_PRELUDE} } ) {
         $PugsBuild::Config::Conf->{'precompile_prelude'}
@@ -57 +57 @@
     my ($version, $ghc, $ghc_pkg, $ghc_version, $setup, @args) = @{$opts->{GHC}};
 
-    $want_profiling = grep { /^-prof$/ } @args; 
-    @args = grep { !/^-prof$/ } @args; 
+    $want_profiling = grep { /^-prof$/ } @args;
+    @args = grep { !/^-prof$/ } @args;
 
     # Set heap options via environment here; Win32 needs it instead
-    # of setting on GHC flags line. 
+    # of setting on GHC flags line.
     my @rts_args;
     foreach my $arg (@args) {
@@ -171 +171 @@
             # Judy at this moment wants GNU make.
             $make = 'gmake' unless `$make --version` =~ /GNU/;
-            
+
             system("./configure") unless -e "src/Makefile";
             #system("$make clean");
@@ -266 +266 @@
         glob("$archive_dir/*/*/*.a"),
     );
-    
+
     my @o_files = map { glob("third-party/judy/Judy-1.0.3/src/$_/*.o"), }
                         qw( Judy1 JudyHS JudyCommon JudyL JudySL );
@@ -272 +272 @@
     print "Embedding @o_files into @archive_files\n";
     system($AR_EXE, "-r", $_, @o_files) for @archive_files;
-  
+
     if ($Config{ranlib} ne ':') {
         system(split(/ /,$Config{ranlib}), $_) for @archive_files;
@@ -321 +321 @@
         # also, remove all .pm.yml files there too.
         unlink($_) for glob(File::Spec->catfile(dirname($ppc_yml), "*.pm.yml"));
-        
+
         # finally regenerate the prelude.
         run($^X, qw<util/gen_prelude.pl -v -i src/perl6/Prelude.pm>,
@@ -354 +354 @@
     # Add GHC to PATH
     local $ENV{PATH} = dirname($ghc) . $Config{path_sep} . $ENV{PATH};
- 
+
     run($^X, qw<util/version_h.pl>);
 
@@ -505 +505 @@
 }
 
-sub write_buildinfo { 
+sub write_buildinfo {
     my ($version, $ghc, $ghc_pkg, $ghc_version, @args) = @_;
 
@@ -557 +557 @@
     while (<IN>) {
         # Adjust the dependency line based on Cabal version
-        if ($has_new_cabal) {
-            s/hs-source-dir/hs-source-dirs/;
-        }
-        else {
-            s/pugs-HsSyck -any, //;
-            s/pugs-hsregex -any, //;
-        }
+        s/pugs-HsSyck -any, //;
+        s/pugs-hsregex -any, //;
         s/__OPTIONS__/@args/;
         s/__VERSION__/$version/;
@@ -585 +580 @@
         $kind = $1,  next if /^_\+(.*)/;        # _+SEGMENT start
         undef $kind, next if $_ eq "_-$kind";   # _-SEGMENT end
-        
+
         s/^__(.*)__$/PugsBuild::Config->lookup($1)/e;
-        
+
         die "don't know where this option belongs: $_" unless $kind;
         push @{ $opts{$kind} }, $_;