wiki:Attic/6.6_Branch

Version 1 (modified by igloo, 7 years ago) (diff)

--

Here is a script to push 6.6 changes to the HEAD:

#!/bin/sh

set -e

cwd=`pwd`
others=../../darcs

top_dirs="nofib testsuite"

quiet=NO

message()
{
  if [ "$quiet" = "NO" ]; then
     echo $*
  fi
}

darcsall()
{
  message "== running darcs push $* at the top level"
  darcs push $* $cwd/$others/ghc
  for dir in $top_dirs; do
    other=$cwd/$others/ghc/$dir
    if test -d $dir/_darcs -a -d $other/_darcs; then
    message "== running darcs push $* in $dir"
    darcs push $* --repodir $dir $other
    else
    message "== $dir not present or not a repository; skipping"
    fi
  done
  for pkg in `cat libraries/core-packages libraries/extra-packages`; do
    other=$cwd/$others/ghc/libraries/$pkg
    if test -d libraries/$pkg/_darcs -a -d $other/_darcs; then
    message "== running darcs push $* in libraries/$pkg"
    darcs push $* --repodir libraries/$pkg $other
    else
    echo "warning: $pkg doesn't seem to exist, use 'darcs-all get' to get it"
    fi
  done
}

if test ! -d _darcs -o ! -d compiler; then
  echo "error: darcs-all must be run from the top level of the ghc tree."
  exit 1;
fi

case $* in
  *-q*) quiet=YES;;
esac

case $1 in
  *) darcsall $*;;
esac

Currently there are 17 patches that should not be pushed in the ghc repo, and 6 in the testsuite repo. They are (output of ./head-push --dry-run):

== running darcs push --dry-run at the top level
Would push the following changes:
Fri Sep 29 23:57:51 BST 2006  sof@galois.com
  * rejig library include/ files

Sun Oct  1 02:12:02 BST 2006  Ian Lynagh <igloo@earth.li>
  * MERGE: Improve unification error messages (again) (push to 6.6 branch)

Mon Oct  9 15:04:37 BST 2006  Ian Lynagh <igloo@earth.li>
  * Set version number to 6.6

Tue Oct 10 09:48:33 BST 2006  Simon Marlow <simonmar@microsoft.com>
  * fix broken <link> element, preventing the User's Guide from building

Wed Oct 11 13:47:40 BST 2006  Ian Lynagh <igloo@earth.li>
  tagged 6.6 release

Thu Oct 12 13:13:21 BST 2006  sven.panne@aedion.de
  * Track changes in source packaging scheme

Thu Oct 12 15:22:44 BST 2006  Simon Marlow <simonmar@microsoft.com>
  * Build the GHC package in stage 3 too
  This fixes the problem with the nightly builds not including the GHC
  package.

Mon Oct 16 11:44:11 BST 2006  Simon Marlow <simonmar@microsoft.com>
  * Fix deadlock on second call to newSession
  Tracked down by Krasimir Angelov

Mon Oct 16 12:16:30 BST 2006  Simon Marlow <simonmar@microsoft.com>
  * oops, I committed a broken version of "Fix deadlock on second call..."

Wed Oct 18 10:36:58 BST 2006  simonpj@microsoft.com
  * Fix loop in GADT type refinement

  Finding the in-scope set when building the GADT type refinement
  was bogusly using the result of the fixpoint.  Only shows up
  when forall'd types are involved (else the in-scope set isn't
  consulted).

  Test is tc214 (on the HEAD).  This fix is to the 6.6 branch, because
  the HEAD is ok.

  Fixes Trac #940.


Fri Oct 20 16:39:25 BST 2006  Simon Marlow <simonmar@microsoft.com>
  * In hashExpr, use Word32 rather than relying on wrapping behaviour of Int
  Fixes #952, as it turns out.

  When compiling via C, we are at the mercy of C's undefined behaviour
  with respect to overflow of signed integer operations, and this was
  biting us here.

  Perhaps we should always add the -fwrapv flag to gcc, but since
  Haskell doesn't define overflow on Int either, it seemed the right
  thing to do to fix this code anyway.

Sat Nov 11 14:15:31 GMT 2006  Ian Lynagh <igloo@earth.li>
  * MERGE: Figure out where the rest of the repositories are, based on defaultrepo

Wed Nov 15 00:55:51 GMT 2006  Ian Lynagh <igloo@earth.li>
  * MERGE: Fix error reporting for contexts during deriving (Trac 958)
   simonpj@microsoft.com**20061101122120

   When doing the fixpoint iteration for 'deriving' we have to be careful
   not to end up in a loop, even if we have -fallow-undecidable-instances.

   Test is tcfail169

Wed Nov 15 01:53:00 GMT 2006  Ian Lynagh <igloo@earth.li>
  * Fix compilation problems

Wed Nov 15 13:50:20 GMT 2006  Ian Lynagh <igloo@earth.li>
  * MERGE: Fix (yet another) odd interaction between selector thunks and compacting GC
    Tue Nov 14 12:31:57 GMT 2006  Simon Marlow <simonmar@microsoft.com>
    * Fix (yet another) odd interaction between selector thunks and compacting GC
    This should fix errors of the form

      internal error: scavenge_mark_stack: unimplemented/strange closure
        type 28 @ 0x2b92e5f79960

    But since it's quite difficult to reproduce the error, I can't be 100%
    certain it's gone.  I certainly can't reproduce it again after the
    fix, anyway.

Mon Nov 20 12:18:55 GMT 2006  Ian Lynagh <igloo@earth.li>
  * MERGE: Don't make ghc threaded if GhcNotThreaded is YES

Thu Nov 23 12:55:39 GMT 2006  Thorkil Naur <naur@post11.tele.dk>
  * Fix darcs-all for Mac OS X

  The regular exporession /\? which is used by darcs-all to stand for zero or one /'s
  seems to be a GNU extension of "basic" regular expressions. In any case, it is not
  supported by sed on Mac OS X 10.4.

  The patched darcs-all works on Max OS X and (SuSE) Linux.

Making no changes:  this is a dry run.
== running darcs push --dry-run in nofib
No recorded local changes to push!
== running darcs push --dry-run in testsuite
Would push the following changes:
Mon Sep 25 17:17:33 BST 2006  simonpj@microsoft.com
  * Accept output

Tue Sep 26 00:13:15 BST 2006  Ian Lynagh <igloo@earth.li>
  * Expect maessen_hashtab to fail in 6.6.

Tue Sep 26 00:14:48 BST 2006  Ian Lynagh <igloo@earth.li>
  * Expect tcfail140 to fail in 6.6.

Fri Sep 29 12:33:03 BST 2006  simonpj@microsoft.com
  * Accept output

Tue Oct  3 15:25:43 BST 2006  Simon Marlow <simonmar@microsoft.com>
  * accept output

Wed Oct 11 13:47:40 BST 2006  Ian Lynagh <igloo@earth.li>
  tagged 6.6 release

Making no changes:  this is a dry run.
== running darcs push --dry-run in libraries/base
No recorded local changes to push!
== running darcs push --dry-run in libraries/Cabal
No recorded local changes to push!
== running darcs push --dry-run in libraries/haskell98
No recorded local changes to push!
== running darcs push --dry-run in libraries/readline
No recorded local changes to push!
== running darcs push --dry-run in libraries/regex-base
No recorded local changes to push!
== running darcs push --dry-run in libraries/regex-compat
No recorded local changes to push!
== running darcs push --dry-run in libraries/regex-posix
No recorded local changes to push!
== running darcs push --dry-run in libraries/parsec
No recorded local changes to push!
== running darcs push --dry-run in libraries/stm
No recorded local changes to push!
== running darcs push --dry-run in libraries/template-haskell
No recorded local changes to push!
== running darcs push --dry-run in libraries/unix
No recorded local changes to push!
== running darcs push --dry-run in libraries/Win32
No recorded local changes to push!
warning: ALUT doesn't seem to exist, use 'darcs-all get' to get it
warning: GLUT doesn't seem to exist, use 'darcs-all get' to get it
warning: HGL doesn't seem to exist, use 'darcs-all get' to get it
warning: HUnit doesn't seem to exist, use 'darcs-all get' to get it
warning: ObjectIO doesn't seem to exist, use 'darcs-all get' to get it
warning: OpenAL doesn't seem to exist, use 'darcs-all get' to get it
warning: OpenGL doesn't seem to exist, use 'darcs-all get' to get it
warning: QuickCheck doesn't seem to exist, use 'darcs-all get' to get it
warning: X11 doesn't seem to exist, use 'darcs-all get' to get it
warning: arrows doesn't seem to exist, use 'darcs-all get' to get it
warning: cgi doesn't seem to exist, use 'darcs-all get' to get it
warning: fgl doesn't seem to exist, use 'darcs-all get' to get it
warning: haskell-src doesn't seem to exist, use 'darcs-all get' to get it
warning: html doesn't seem to exist, use 'darcs-all get' to get it
warning: mtl doesn't seem to exist, use 'darcs-all get' to get it
warning: network doesn't seem to exist, use 'darcs-all get' to get it
warning: time doesn't seem to exist, use 'darcs-all get' to get it
warning: xhtml doesn't seem to exist, use 'darcs-all get' to get it