[Pkg-haskell-commits] r1276 - in /packages/hat/branches/upstream/2.06: Makefile Makefile.inc configure docs/download.html docs/index.html docs/status.html script/confhat script/confhc-hat script/echo.c script/fixghc script/harch

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Sat Jan 17 14:49:11 UTC 2009


Author: arjan
Date: Sat Jan 17 14:49:11 2009
New Revision: 1276

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1276
Log: (empty)

Modified:
    packages/hat/branches/upstream/2.06/Makefile
    packages/hat/branches/upstream/2.06/Makefile.inc
    packages/hat/branches/upstream/2.06/configure
    packages/hat/branches/upstream/2.06/docs/download.html
    packages/hat/branches/upstream/2.06/docs/index.html
    packages/hat/branches/upstream/2.06/docs/status.html
    packages/hat/branches/upstream/2.06/script/confhat
    packages/hat/branches/upstream/2.06/script/confhc-hat
    packages/hat/branches/upstream/2.06/script/echo.c
    packages/hat/branches/upstream/2.06/script/fixghc
    packages/hat/branches/upstream/2.06/script/harch

Modified: packages/hat/branches/upstream/2.06/Makefile
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/Makefile?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/Makefile (original)
+++ packages/hat/branches/upstream/2.06/Makefile Sat Jan 17 14:49:11 2009
@@ -8,28 +8,27 @@
 		script/echo.c script/confhat script/confhc-hat script/fixghc \
 		script/hat-graph.inst script/pkgdirlist \
 		src/Makefile.inc include/*.h
-HATLIB  = src/lib/Makefile* src/lib/*.[ch] \
-	  src/lib/*.hs      src/lib/*.hx     src/lib/hat.cabal \
-	  src/lib/Hat/*.hs  src/lib/hat-package.conf
-#          src/lib/Data/*.h[sx]        src/lib/Hat/Data/*.hs \
-#          src/lib/Control/*.hs        src/lib/Control/Monad/*.hs \
-#          src/lib/System/*.hs         src/lib/System/IO/*.hs \
-#          src/lib/System/Console/*.hs src/lib/Debug/*.hs \
-#          src/lib/Text/*.hs           src/lib/Text/PrettyPrint/*.hs \
-#          src/lib/Text/ParserCombinators/*.hs \
-#          src/lib/Text/ParserCombinators/Parsec/*.hs \
-#	  src/lib/Test/*.hs \
-#          src/lib/Foreign/*.h[sx]     src/lib/Hat/Foreign/*.hs \
-#          src/lib/Foreign/Marshal/*.hs #src/hat/lib/Foreign/C/*.hs
-HATUI	= src/tools/Makefile* src/tools/*.[ch] src/tools/*.hs
-HATTRANS= src/trans/Makefile* \
-	$(shell hmake -package base -package packedstring -M HatTrans.hs \
-		-Isrc/trans -Isrc/compiler98 \
+HATLIB  = src/hatlib/Makefile* src/hatlib/*.[ch] \
+	  src/hatlib/*.hs      src/hatlib/*.hx     src/hatlib/hat.cabal \
+	  src/hatlib/Hat/*.hs  src/hatlib/hat-package.conf \
+          src/hatlib/Data/*.h[sx]        src/hatlib/Hat/Data/*.hs \
+          src/hatlib/Control/*.hs        src/hatlib/Control/Monad/*.hs \
+          src/hatlib/System/*.hs         src/hatlib/System/IO/*.hs \
+          src/hatlib/System/Console/*.hs src/hatlib/Debug/*.hs \
+          src/hatlib/Text/*.hs           src/hatlib/Text/PrettyPrint/*.hs \
+          src/hatlib/Text/ParserCombinators/*.hs \
+          src/hatlib/Text/ParserCombinators/Parsec/*.hs \
+	  src/hatlib/Test/*.hs \
+          src/hatlib/Foreign/*.h[sx]     src/hatlib/Hat/Foreign/*.hs \
+          src/hatlib/Foreign/Marshal/*.hs #src/hat/lib/Foreign/C/*.hs
+HATUI	= src/hattools/Makefile* src/hattools/*.[ch] src/hattools/*.hs
+HATTRANS= src/hattrans/Makefile* \
+	$(shell hmake -package lang -M HatTrans.hs \
+		-Isrc/hattrans -Isrc/compiler98 \
 		| cut -d':' -f1 | sed -e 's/\.o$$/.hs/' | sed -e '/^. /d' )
 DOC = docs/*
 MAN = man/*.1.in man/*.1
-HATTOOLSET= hat-stack hat-check hat-detect hat-delta hat-anim hat-observe \
-		hat-trail hat-view 
+HATTOOLSET= hat-stack hat-check hat-detect hat-delta hat-anim hat-observe hat-trail hat-view 
 HATTOOLS= $(patsubst %, lib/$(MACHINE)/%, $(HATTOOLSET))
 
 TARGDIR= targets
@@ -67,24 +66,24 @@
 $(TARGETS): % : $(TARGDIR)/$(MACHINE)/%
 
 $(TARGDIR)/$(MACHINE)/hat-trans-nhc: $(HATTRANS)
-	cd src/trans;     $(MAKE) HC=$(BUILDWITH) all
+	cd src/hattrans;     $(MAKE) HC=$(BUILDWITH) all
 	touch $(TARGDIR)/$(MACHINE)/hat-trans-nhc
 $(TARGDIR)/$(MACHINE)/hat-trans-ghc: $(HATTRANS)
-	cd src/trans;     $(MAKE) HC=$(BUILDWITH) all
+	cd src/hattrans;     $(MAKE) HC=$(BUILDWITH) all
 	touch $(TARGDIR)/$(MACHINE)/hat-trans-ghc
 
 $(TARGDIR)/$(MACHINE)/hat-lib-nhc: $(HATLIB)
-	cd src/lib;	       $(MAKE) HC=$(BUILDWITH) all
+	cd src/hatlib;	       $(MAKE) HC=$(BUILDWITH) all
 	touch $(TARGDIR)/$(MACHINE)/hat-lib-nhc
 $(TARGDIR)/$(MACHINE)/hat-lib-ghc: $(HATLIB)
-	cd src/lib;	       $(MAKE) HC=$(BUILDWITH) all
+	cd src/hatlib;	       $(MAKE) HC=$(BUILDWITH) all
 	touch $(TARGDIR)/$(MACHINE)/hat-lib-ghc
 
 $(TARGDIR)/$(MACHINE)/hat-tools-nhc: $(HATUI)
-	cd src/tools;      $(MAKE) HC=$(BUILDWITH) all
+	cd src/hattools;      $(MAKE) HC=$(BUILDWITH) all
 	touch $(TARGDIR)/$(MACHINE)/hat-tools-nhc
 $(TARGDIR)/$(MACHINE)/hat-tools-ghc: $(HATUI)
-	cd src/tools;      $(MAKE) HC=$(BUILDWITH) all
+	cd src/hattools;      $(MAKE) HC=$(BUILDWITH) all
 	touch $(TARGDIR)/$(MACHINE)/hat-tools-ghc
 
 
@@ -113,13 +112,13 @@
 ##### cleanup
 
 clean:
-	cd src/trans;       $(MAKE) clean
-	cd src/lib;         $(MAKE) clean
-	cd src/tools;       $(MAKE) clean
+	cd src/hattrans;       $(MAKE) clean
+	cd src/hatlib;         $(MAKE) clean
+	cd src/hattools;       $(MAKE) clean
 	rm -rf $(BUILDDIR)/obj*			# all object files
 
 realclean: clean
-	cd src/trans;          $(MAKE) realclean
+	cd src/hattrans;          $(MAKE) realclean
 	cd $(TARGDIR)/$(MACHINE);  rm -f $(TARGETS)
 	cd $(TARGDIR)/$(MACHINE);  rm -f config.cache
 	rm -rf $(LIBDIR)/$(MACHINE)

Modified: packages/hat/branches/upstream/2.06/Makefile.inc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/Makefile.inc?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/Makefile.inc (original)
+++ packages/hat/branches/upstream/2.06/Makefile.inc Sat Jan 17 14:49:11 2009
@@ -9,9 +9,9 @@
 STRIP = strip
 
 
-HATVERSION = 2.06
+HATVERSION = 2.05
 # HATVERSION is the version number for hat.
-#   (odd minor number = darcs version;  even minor number = release version)
+#   (odd minor number = CVS version;  even minor number = release version)
 
 HATFILEVERSION = 2.04
 # HATFILEVERSION is now a separate number for the hat file format

Modified: packages/hat/branches/upstream/2.06/configure
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/configure?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/configure (original)
+++ packages/hat/branches/upstream/2.06/configure Sat Jan 17 14:49:11 2009
@@ -9,7 +9,7 @@
 
 # When incrementing this version number, don't forget to change the
 # corresponding definition in the Makefile!
-HATVERSION="2.06" export HATVERSION
+HATVERSION="2.05" export HATVERSION
 
 # Hat tools whose scripts are /only/ a simple redirect to the executable.
 #HATTOOLS="hat-stack hat-check hat-observe hat-detect hat-view hat-trail \
@@ -297,11 +297,11 @@
   if glib-config --version >/dev/null 2>&1
   then
     echo '              yes (detected)'
-    echo '#define HAVE_GLIB 1' >src/tools/checkglib.h
+    echo '#define HAVE_GLIB 1' >src/hattools/checkglib.h
     GLIB=glib
   else
     echo '              no  (using slower replacement)'
-    echo '' >src/tools/checkglib.h
+    echo '' >src/hattools/checkglib.h
     GLIB=local
   fi
 
@@ -388,28 +388,28 @@
            cp $file $DESTDIR$INCDIR
       fi
     done
-    #for dir in `script/pkgdirlist base`
-    #do
-    #  mkdir -p $DESTDIR$INCDIR/$dir
-    #  for file in $BUILDINCDIR/hat/$dir/*.hx
-    #  do
-    #    if [ -f $file ]
-    #    then echo "	$dir/`basename $file`"
-    #         cp $file $DESTDIR$INCDIR/$dir
-    #    fi
-    #  done
-    #done
-    #for dir in `script/pkgdirlist QuickCheck`
-    #do
-    #  mkdir -p $DESTDIR$INCDIR/$dir
-    #  for file in $BUILDINCDIR/hat/$dir/*.hx
-    #  do
-    #    if [ -f $file ]
-    #    then echo "	$dir/`basename $file`"
-    #         cp $file $DESTDIR$INCDIR/$dir
-    #    fi
-    #  done
-    #done
+    for dir in `script/pkgdirlist base`
+    do
+      mkdir -p $DESTDIR$INCDIR/$dir
+      for file in $BUILDINCDIR/hat/$dir/*.hx
+      do
+        if [ -f $file ]
+        then echo "	$dir/`basename $file`"
+             cp $file $DESTDIR$INCDIR/$dir
+        fi
+      done
+    done
+    for dir in `script/pkgdirlist QuickCheck`
+    do
+      mkdir -p $DESTDIR$INCDIR/$dir
+      for file in $BUILDINCDIR/hat/$dir/*.hx
+      do
+        if [ -f $file ]
+        then echo "	$dir/`basename $file`"
+             cp $file $DESTDIR$INCDIR/$dir
+        fi
+      done
+    done
     case $BUILDWITH in
       ghc*) echo "Installing hat as a ghc package:" ;;
       nhc*) echo "Installing hat as an nhc98 package:" ;;
@@ -428,8 +428,8 @@
     then mkdir -p $DESTDIR$BINDIR;  echo ' (created)'
     else echo ' (exists)'
     fi
-    echo "	harch"		# is already available from hmake
-    cp script/harch $DESTDIR$BINDIR
+   #echo "	harch"		# is already available from hmake
+   #cp script/harch $DESTDIR$BINDIR
     echo "	hat-graph"
    #cp script/hat-graph $DESTDIR$BINDIR
     sed -e "s|ScriptDir|$BINDIR|" script/hat-graph.inst \
@@ -447,7 +447,7 @@
         ln $DESTDIR$BINDIR/hat-template $DESTDIR$BINDIR/$hattool
     done
     echo
-    chmod +x $DESTDIR$BINDIR/harch
+   #chmod +x $DESTDIR$BINDIR/harch
     chmod +x $DESTDIR$BINDIR/hat-trans
     chmod +x $DESTDIR$BINDIR/hat-template $DESTDIR$BINDIR/hat-graph
     rm $DESTDIR$BINDIR/hat-template

Modified: packages/hat/branches/upstream/2.06/docs/download.html
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/docs/download.html?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/docs/download.html (original)
+++ packages/hat/branches/upstream/2.06/docs/download.html Sat Jan 17 14:49:11 2009
@@ -11,11 +11,17 @@
 <hr>
 
 <p>
-The latest stable release of Hat is 2.06, available in various
+The latest stable release of Hat is 2.04, available in various
 distribution formats (listed below).  Important patches for the stable
 version are also provided (at the bottom of the page).  The development
-tree is at version 2.07 and is mainly available via
-<a href="darcs.html">darcs</a>.
+tree is at version 2.05 and is mainly available via
+<a href="darcs.html">darcs</a>.  However, as a special exception, an
+interim package of 2.05 has been made available below, specifically for
+those wanting to build Hat with the recently-released ghc-6.6.  (It
+already incorporates all the 2.04 patches below, plus many other
+bugfixes.  However, its compatibility with the standard base library
+package is now somewhat poor.  Fuller compatibility will have to wait
+until the next proper release cycle.)
 
 <p>
 Bugfixes and important changes to the system are described in the
@@ -35,14 +41,6 @@
 <table width=450 border=1 cellspacing=0 cellpadding=2>
 <tr bgcolor="#dddddd"><th>package</th> <th>machine</th>
                     <th>version</th> <th>date</th> <th>size</th></tr>
-
-<tr bgcolor="#ddffdd">
-  <td><a href="ftp://ftp.cs.york.ac.uk/pub/haskell/hat/hat-2.06.tar.gz">
-      Sources (.tar.gz)</a></td>
-  <td>any</td>
-  <td><font color=red>2.06</font></td>
-  <td>2008-10-2</td>
-  <td>1.6Mb</td></tr>
 
 <tr bgcolor="#ddffdd">
   <td><a href="ftp://ftp.cs.york.ac.uk/pub/haskell/hat/hat-2.05.tar.gz">
@@ -85,8 +83,8 @@
 <b>Tarfiles and RPMs:</b><br>
 <a href="ftp://ftp.cs.york.ac.uk/pub/haskell/hat/">
 <tt>ftp://ftp.cs.york.ac.uk/pub/haskell/hat/</tt></a><br>
-<a href="http://www.cs.york.ac.uk/fp/hat/hat-2.06.tar.gz">
-<tt>http://www.cs.york.ac.uk/fp/hat/hat-2.06.tar.gz</tt></a><br>
+<a href="http://www.cs.york.ac.uk/fp/hat/hat-2.05.tar.gz">
+<tt>http://www.cs.york.ac.uk/fp/hat/hat-2.05.tar.gz</tt></a><br>
 <b>RPMs for RedHat:</b><br>
 <a href="http://www.dtek.chalmers.se/~d95mback/nhc98/">
 <tt>http://www.dtek.chalmers.se/~d95mback/nhc98/</tt></a><br>
@@ -261,7 +259,7 @@
 <tt>http://www.cs.york.ac.uk/fp/hat/</tt></a>
 
 <p>
-This page last modified: 2nd Oct 2008<br>
+This page last modified: 25th May 2006<br>
 <a href="http://www.cs.york.ac.uk/fp/">
 York Functional Programming Group</a><br>
 

Modified: packages/hat/branches/upstream/2.06/docs/index.html
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/docs/index.html?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/docs/index.html (original)
+++ packages/hat/branches/upstream/2.06/docs/index.html Sat Jan 17 14:49:11 2009
@@ -31,7 +31,7 @@
 <center><b>download/build/install</b></center>
 <dl>
 <dd><!--img src="new_tiny.gif" alt="new"-->
-    Version 2.06 released 2nd Oct 2008.</dd>
+    Version 2.05 released 22nd Oct 2006.</dd>
 <dd><a href="download.html">Download <b>Hat</b></a></dd>
 <dd><a href="requirements.html">System requirements</a></dd>
 <dd><a href="install.html">Build and install instructions</a></dd>
@@ -99,8 +99,7 @@
 <dd><a href="publications.html">Technical publications</a></dd>
 <dd><a href="bugs.html">Known bugs</a></dd>
 <dd><a href="todo.html">Wish list</a></dd>
-<dd><a href="darcs.html">darcs repository</a></dd>
-<dd><a href="http://www.cs.york.ac.uk/fp/hat/Memos">Internal developer memos</a></dd>
+<dd><a href="cvs.html">Anonymous CVS repository</a></dd>
 </dl>
 
 <p>
@@ -370,7 +369,7 @@
 <tt>http://www.cs.york.ac.uk/fp/hat/</tt></a>
 
 <p>
-This page last modified: 2nd Oct 2008<br>
+This page last modified: 22nd Oct 2006<br>
 <a href="http://www.cs.york.ac.uk/fp/">
 York Functional Programming Group</a><br>
 

Modified: packages/hat/branches/upstream/2.06/docs/status.html
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/docs/status.html?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/docs/status.html (original)
+++ packages/hat/branches/upstream/2.06/docs/status.html Sat Jan 17 14:49:11 2009
@@ -11,14 +11,14 @@
 <hr>
 
 <p>
-The latest stable release is 2.06.  The CVS development tree is now
-at version 2.07.  Bugfixes and important changes to the system are
+The latest stable release is 2.04.  The CVS development tree is now
+at version 2.05.  Bugfixes and important changes to the system are
 described here for the two most recent released versions.
 
 <p>
 
 <hr>
-<h3>Hat 2.06 (2008-10-02) features</h3>
+<h3>Hat 2.05 (CVS) features</h3>
 <ul>
 <li> New tool: hat-delta (debugging by comparison of traces).
 <li> New tool: pretty-hat (displays a graph of the trace itself).
@@ -140,7 +140,7 @@
 <tt>http://www.cs.york.ac.uk/fp/hat/</tt></a>
 
 <p>
-This page last modified: 2nd Oct 2008<br>
+This page last modified: 17th May 2005<br>
 <a href="http://www.cs.york.ac.uk/fp/">
 York Functional Programming Group</a><br>
 

Modified: packages/hat/branches/upstream/2.06/script/confhat
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/script/confhat?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/script/confhat (original)
+++ packages/hat/branches/upstream/2.06/script/confhat Sat Jan 17 14:49:11 2009
@@ -7,28 +7,31 @@
 COMP=$1
 PREFIX=$2
 HC=`echo $COMP | cut -c1-3`	# e.g. ghc
-VER=`echo $COMP | cut -c4-`	# e.g. 6.2.1
+VER=`echo $COMP | cut -c4-`	# e.g. -5.04.1
 
 TRUE=/bin/true
 if [ ! -x $TRUE ]
 then TRUE=/usr/bin/true
 fi
 
-#DIRS="Data Control Control/Monad Debug Foreign Foreign/Marshal System \
-#	System/Console System/IO Test Text Text/ParserCombinators \
-#	Text/ParserCombinators/Parsec Text/PrettyPrint"
+DIRS="Data Control Control/Monad Debug Foreign Foreign/Marshal System \
+	System/Console System/IO Test Text Text/ParserCombinators \
+	Text/ParserCombinators/Parsec Text/PrettyPrint"
 HATDIRS="Hat `for dir in $DIRS; do echo Hat/$dir; done`"
 
-echo "Built with $HC"
-if [ "$HC" = "ghc" -a -d lib/$MACHINE/lib/$COMP ]
+if [ "$HC" = "ghc" -a -d lib/$MACHINE/hatlib/$COMP ]
 then
   # discover ghc version (technique courtesy of Simon Marlow)
-  echo "main = print __GLASGOW_HASKELL__" >ghcsym.hs;
-  $COMP -cpp ghcsym.hs -o ghcsym.out;
-  GHCSYM=`./ghcsym.out`
+  echo __GLASGOW_HASKELL__ >ghcsym.hs;
+  $COMP -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
+  GHCSYM=`grep -v '^#' ghcsym.out | grep -v '^$'`
   rm -f ghcsym.hs ghcsym.out;
 
-#  # installation location for ghc
+#  # discover ghc location
+#  libdir=`$COMP -v 2>&1 | head -n 2 | tail -1 | cut -c28- | head -n 1`
+#  libdir=`dirname $libdir`
+#  libdir=$DESTDIR$libdir
+#  incdir=$libdir/imports/hat
   libdir=$DESTDIR$PREFIX/lib/hat-$HATVERSION/$MACHINE/ghc-$GHCSYM
   incdir=$DESTDIR$PREFIX/imports/hat-$HATVERSION/ghc-$GHCSYM
   echo >&2 "Installing hat package for ghc under $libdir"
@@ -36,33 +39,33 @@
   mkdir -p $incdir
 
   # install ghc package components
-  echo -P$incdir >lib/$MACHINE/lib/$COMP/ghcincdir
-  cp -p lib/$MACHINE/lib/$COMP/libHShat.a $libdir  && \
+  echo -P$incdir >lib/$MACHINE/hatlib/$COMP/ghcincdir
+  cp -p lib/$MACHINE/hatlib/$COMP/libHShat.a $libdir  && \
   ranlib $libdir/libHShat.a && \
   if [ -d $incdir ]
   then
     rm -rf $incdir/Hat && \
-    { ghc-pkg$VER --remove-package=hat || echo "(You can ignore this error)"; }
+    { ghc-pkg$VER --remove-package=hat || $TRUE; }
   else
     mkdir $incdir
   fi && \
   for dir in $HATDIRS; \
-      do mkdir $incdir/$dir && \
-         cp lib/$MACHINE/lib/$COMP/$dir/*.hi $incdir/$dir; \
+      do mkdir $incdir/$dir; \
+      done  && \
+  for dir in $HATDIRS; \
+      do cp lib/$MACHINE/hatlib/$COMP/$dir/*.hi $incdir/$dir; \
       done  && \
   if [ $GHCSYM -ge 604 ]
   then
-      { cat  lib/$MACHINE/lib/$COMP/hat-package.conf ;
+      { cat  lib/$MACHINE/hatlib/$COMP/hat-package.conf ;
         echo "import-dirs:	$incdir";
         echo "library-dirs:	$libdir";
-      } | ghc-pkg$VER register -
+      } | ghc-pkg$VER --user register -
   else
-    cat lib/$MACHINE/lib/$COMP/hat-package.conf | ghc-pkg$VER --add-package
+    cat lib/$MACHINE/hatlib/$COMP/hat-package.conf | ghc-pkg$VER --add-package
   fi 
-else
-  echo "Not built with GHC"
 fi
-if [ -d lib/$MACHINE/lib/nhc98 ]
+if [ -d lib/$MACHINE/hatlib/nhc98 ]
 then
   # discover nhc98 location
   nhc98=`which nhc98`
@@ -75,7 +78,7 @@
   mkdir -p $incdir
 
   # install nhc98 package components
-  cp -p lib/$MACHINE/lib/nhc98/libHShat.a $libdir/$MACHINE  && \
+  cp -p lib/$MACHINE/hatlib/nhc98/libHShat.a $libdir/$MACHINE  && \
   if [ -d $incdir/hat ]
   then rm -rf $incdir/hat
   fi
@@ -87,6 +90,6 @@
       do mkdir $incdir/packages/hat/$dir; \
       done  && \
   for dir in $HATDIRS; \
-      do cp lib/$MACHINE/lib/$COMP/$dir/*.hi $incdir/packages/hat/$dir; \
+      do cp lib/$MACHINE/hatlib/$COMP/$dir/*.hi $incdir/packages/hat/$dir; \
       done
 fi

Modified: packages/hat/branches/upstream/2.06/script/confhc-hat
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/script/confhc-hat?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/script/confhc-hat (original)
+++ packages/hat/branches/upstream/2.06/script/confhc-hat Sat Jan 17 14:49:11 2009
@@ -52,11 +52,11 @@
 # ...
 
 
-# First look for GHC.  Determining version number here is due to Ian Lynagh.
+# First look for GHC.  Determining version number here is due to Simon Marlow.
 ghcsym () {
-  echo "main = print __GLASGOW_HASKELL__" >ghcsym.hs;
-  $1 -cpp -o ghcsym.out ghcsym.hs
-  ./ghcsym.out >$2
+  echo __GLASGOW_HASKELL__ >ghcsym.hs;
+  $1 -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
+  grep -v '^#' ghcsym.out | grep -v '^$' > $2
   rm -f ghcsym.hs ghcsym.out;
 }
 

Modified: packages/hat/branches/upstream/2.06/script/echo.c
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/script/echo.c?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/script/echo.c (original)
+++ packages/hat/branches/upstream/2.06/script/echo.c Sat Jan 17 14:49:11 2009
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <stdio.h>
 
 int main (int argc, char** argv) {

Modified: packages/hat/branches/upstream/2.06/script/fixghc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/script/fixghc?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/script/fixghc (original)
+++ packages/hat/branches/upstream/2.06/script/fixghc Sat Jan 17 14:49:11 2009
@@ -57,9 +57,6 @@
                  exts) echon " -syslib lang";;
                  misc) ;;
                  base) ;;
-                 packedstring) ;;
-                 directory) ;;
-                 containers) ;;
                  *)    echon " -syslib $1" ;;
                esac ;;
       *) echon " $1" ;;
@@ -86,11 +83,6 @@
                case $1 in
                  base) ;;
                  haskell98) ;;
-                 readline) ;;
-                 packedstring) ;;
-                 directory) ;;
-                 process) ;;
-                 containers) ;;
                  *)    echon " -package $1" ;;
                esac ;;
       *) echon " $1" ;;
@@ -101,7 +93,7 @@
   exit 0
 fi
 
-if [ $ghcversion -ge 504 -a $ghcversion -lt 605 ]
+if [ $ghcversion -ge 504 ]
 then
   while test "'$1'" != "''" 
   do
@@ -110,63 +102,6 @@
                case $1 in
                  exts) echon " -package lang";;
                  misc) ;;
-                 *)    echon " -package $1" ;;
-               esac ;;
-      -package) shift
-                case $1 in
-                  readline) ;;
-                  packedstring) ;;
-                  directory) ;;
-                  process) ;;
-                  containers) ;;
-                  *)    echon " -package $1" ;;
-                esac ;;
-      *) echon " $1" ;;
-    esac
-    shift
-  done
-  echo
-  exit 0
-fi
-
-if [ $ghcversion -ge 605  -a $ghcversion -lt 607 ]
-then
-  while test "'$1'" != "''" 
-  do
-    case $1 in
-      -syslib|-package) shift
-               case $1 in
-                 exts) ;;
-                 misc) ;;
-                 util) ;;
-                 lang) ;;
-                 text) ;;
-                 packedstring) ;;
-                 directory) ;;
-                 process) ;;
-                 containers) ;;
-                 *)    echon " -package $1" ;;
-               esac ;;
-      *) echon " $1" ;;
-    esac
-    shift
-  done
-  echo
-  exit 0
-fi
-
-if [ $ghcversion -ge 607 ]
-then
-  while test "'$1'" != "''" 
-  do
-    case $1 in
-      -syslib|-package) shift
-               case $1 in
-                 exts) ;;
-                 misc) ;;
-                 util) ;;
-                 lang) ;;
-                 text) ;;
                  *)    echon " -package $1" ;;
                esac ;;
       *) echon " $1" ;;

Modified: packages/hat/branches/upstream/2.06/script/harch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/branches/upstream/2.06/script/harch?rev=1276&op=diff
==============================================================================
--- packages/hat/branches/upstream/2.06/script/harch (original)
+++ packages/hat/branches/upstream/2.06/script/harch Sat Jan 17 14:49:11 2009
@@ -16,7 +16,7 @@
   if uname -p >/dev/null 2>&1
   then PROCESSOR=`uname -p`
     case "$PROCESSOR" in
-    unknown|*\ *|*-*)
+    unknown|*\ *)
       PROCESSOR=`uname -m`
       ;;
     esac
@@ -75,8 +75,6 @@
 		  6*) OS=Darwin6;;
 		  7*) OS=Darwin7;;
 		  8*) OS=Darwin8;;
-		  9*) OS=Darwin9;;
-		  10*) OS=Darwin10;;
 		  *)  OS=Darwin-$REL;;
 		esac;;
   IRIX*)	case $REL in




More information about the Pkg-haskell-commits mailing list