[Pkg-haskell-commits] r1272 - in /packages/hat/trunk: ./ debian/ docs/ script/ src/hatlib/ src/hattools/ src/hattrans/ src/lib/ src/tools/ src/trans/
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Mon Oct 13 05:50:15 UTC 2008
Author: arjan
Date: Mon Oct 13 05:50:14 2008
New Revision: 1272
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1272
Log:
New upstream release
Added:
packages/hat/trunk/src/lib/
- copied from r1271, packages/hat/branches/upstream/current/src/lib/
packages/hat/trunk/src/tools/
- copied from r1271, packages/hat/branches/upstream/current/src/tools/
packages/hat/trunk/src/trans/
- copied from r1271, packages/hat/branches/upstream/current/src/trans/
Removed:
packages/hat/trunk/src/hatlib/
packages/hat/trunk/src/hattools/
packages/hat/trunk/src/hattrans/
Modified:
packages/hat/trunk/Makefile
packages/hat/trunk/Makefile.inc
packages/hat/trunk/configure
packages/hat/trunk/debian/changelog
packages/hat/trunk/docs/download.html
packages/hat/trunk/docs/index.html
packages/hat/trunk/docs/status.html
packages/hat/trunk/script/confhat
packages/hat/trunk/script/confhc-hat
packages/hat/trunk/script/echo.c
packages/hat/trunk/script/fixghc
packages/hat/trunk/script/harch
Modified: packages/hat/trunk/Makefile
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/Makefile?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/Makefile (original)
+++ packages/hat/trunk/Makefile Mon Oct 13 05:50:14 2008
@@ -8,27 +8,28 @@
script/echo.c script/confhat script/confhc-hat script/fixghc \
script/hat-graph.inst script/pkgdirlist \
src/Makefile.inc include/*.h
-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 \
+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 \
| 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
@@ -66,24 +67,24 @@
$(TARGETS): % : $(TARGDIR)/$(MACHINE)/%
$(TARGDIR)/$(MACHINE)/hat-trans-nhc: $(HATTRANS)
- cd src/hattrans; $(MAKE) HC=$(BUILDWITH) all
+ cd src/trans; $(MAKE) HC=$(BUILDWITH) all
touch $(TARGDIR)/$(MACHINE)/hat-trans-nhc
$(TARGDIR)/$(MACHINE)/hat-trans-ghc: $(HATTRANS)
- cd src/hattrans; $(MAKE) HC=$(BUILDWITH) all
+ cd src/trans; $(MAKE) HC=$(BUILDWITH) all
touch $(TARGDIR)/$(MACHINE)/hat-trans-ghc
$(TARGDIR)/$(MACHINE)/hat-lib-nhc: $(HATLIB)
- cd src/hatlib; $(MAKE) HC=$(BUILDWITH) all
+ cd src/lib; $(MAKE) HC=$(BUILDWITH) all
touch $(TARGDIR)/$(MACHINE)/hat-lib-nhc
$(TARGDIR)/$(MACHINE)/hat-lib-ghc: $(HATLIB)
- cd src/hatlib; $(MAKE) HC=$(BUILDWITH) all
+ cd src/lib; $(MAKE) HC=$(BUILDWITH) all
touch $(TARGDIR)/$(MACHINE)/hat-lib-ghc
$(TARGDIR)/$(MACHINE)/hat-tools-nhc: $(HATUI)
- cd src/hattools; $(MAKE) HC=$(BUILDWITH) all
+ cd src/tools; $(MAKE) HC=$(BUILDWITH) all
touch $(TARGDIR)/$(MACHINE)/hat-tools-nhc
$(TARGDIR)/$(MACHINE)/hat-tools-ghc: $(HATUI)
- cd src/hattools; $(MAKE) HC=$(BUILDWITH) all
+ cd src/tools; $(MAKE) HC=$(BUILDWITH) all
touch $(TARGDIR)/$(MACHINE)/hat-tools-ghc
@@ -112,13 +113,13 @@
##### cleanup
clean:
- cd src/hattrans; $(MAKE) clean
- cd src/hatlib; $(MAKE) clean
- cd src/hattools; $(MAKE) clean
+ cd src/trans; $(MAKE) clean
+ cd src/lib; $(MAKE) clean
+ cd src/tools; $(MAKE) clean
rm -rf $(BUILDDIR)/obj* # all object files
realclean: clean
- cd src/hattrans; $(MAKE) realclean
+ cd src/trans; $(MAKE) realclean
cd $(TARGDIR)/$(MACHINE); rm -f $(TARGETS)
cd $(TARGDIR)/$(MACHINE); rm -f config.cache
rm -rf $(LIBDIR)/$(MACHINE)
Modified: packages/hat/trunk/Makefile.inc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/Makefile.inc?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/Makefile.inc (original)
+++ packages/hat/trunk/Makefile.inc Mon Oct 13 05:50:14 2008
@@ -9,9 +9,9 @@
STRIP = strip
-HATVERSION = 2.05
+HATVERSION = 2.06
# HATVERSION is the version number for hat.
-# (odd minor number = CVS version; even minor number = release version)
+# (odd minor number = darcs version; even minor number = release version)
HATFILEVERSION = 2.04
# HATFILEVERSION is now a separate number for the hat file format
Modified: packages/hat/trunk/configure
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/configure?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/configure (original)
+++ packages/hat/trunk/configure Mon Oct 13 05:50:14 2008
@@ -9,7 +9,7 @@
# When incrementing this version number, don't forget to change the
# corresponding definition in the Makefile!
-HATVERSION="2.05" export HATVERSION
+HATVERSION="2.06" 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/hattools/checkglib.h
+ echo '#define HAVE_GLIB 1' >src/tools/checkglib.h
GLIB=glib
else
echo ' no (using slower replacement)'
- echo '' >src/hattools/checkglib.h
+ echo '' >src/tools/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/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/changelog?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/debian/changelog (original)
+++ packages/hat/trunk/debian/changelog Mon Oct 13 05:50:14 2008
@@ -1,3 +1,9 @@
+hat (2.06-1~pre1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Arjan Oosting <arjan at debian.org> Mon, 13 Oct 2008 07:49:25 +0200
+
hat (2.05+rerolled-7) unstable; urgency=low
* debian/rules:
Modified: packages/hat/trunk/docs/download.html
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/docs/download.html?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/docs/download.html (original)
+++ packages/hat/trunk/docs/download.html Mon Oct 13 05:50:14 2008
@@ -11,17 +11,11 @@
<hr>
<p>
-The latest stable release of Hat is 2.04, available in various
+The latest stable release of Hat is 2.06, 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.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.)
+tree is at version 2.07 and is mainly available via
+<a href="darcs.html">darcs</a>.
<p>
Bugfixes and important changes to the system are described in the
@@ -41,6 +35,14 @@
<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">
@@ -83,8 +85,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.05.tar.gz">
-<tt>http://www.cs.york.ac.uk/fp/hat/hat-2.05.tar.gz</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>
<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>
@@ -259,7 +261,7 @@
<tt>http://www.cs.york.ac.uk/fp/hat/</tt></a>
<p>
-This page last modified: 25th May 2006<br>
+This page last modified: 2nd Oct 2008<br>
<a href="http://www.cs.york.ac.uk/fp/">
York Functional Programming Group</a><br>
Modified: packages/hat/trunk/docs/index.html
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/docs/index.html?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/docs/index.html (original)
+++ packages/hat/trunk/docs/index.html Mon Oct 13 05:50:14 2008
@@ -31,7 +31,7 @@
<center><b>download/build/install</b></center>
<dl>
<dd><!--img src="new_tiny.gif" alt="new"-->
- Version 2.05 released 22nd Oct 2006.</dd>
+ Version 2.06 released 2nd Oct 2008.</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,7 +99,8 @@
<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="cvs.html">Anonymous CVS repository</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>
</dl>
<p>
@@ -369,7 +370,7 @@
<tt>http://www.cs.york.ac.uk/fp/hat/</tt></a>
<p>
-This page last modified: 22nd Oct 2006<br>
+This page last modified: 2nd Oct 2008<br>
<a href="http://www.cs.york.ac.uk/fp/">
York Functional Programming Group</a><br>
Modified: packages/hat/trunk/docs/status.html
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/docs/status.html?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/docs/status.html (original)
+++ packages/hat/trunk/docs/status.html Mon Oct 13 05:50:14 2008
@@ -11,14 +11,14 @@
<hr>
<p>
-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
+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
described here for the two most recent released versions.
<p>
<hr>
-<h3>Hat 2.05 (CVS) features</h3>
+<h3>Hat 2.06 (2008-10-02) 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: 17th May 2005<br>
+This page last modified: 2nd Oct 2008<br>
<a href="http://www.cs.york.ac.uk/fp/">
York Functional Programming Group</a><br>
Modified: packages/hat/trunk/script/confhat
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/script/confhat?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/script/confhat (original)
+++ packages/hat/trunk/script/confhat Mon Oct 13 05:50:14 2008
@@ -7,31 +7,28 @@
COMP=$1
PREFIX=$2
HC=`echo $COMP | cut -c1-3` # e.g. ghc
-VER=`echo $COMP | cut -c4-` # e.g. -5.04.1
+VER=`echo $COMP | cut -c4-` # e.g. 6.2.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`"
-if [ "$HC" = "ghc" -a -d lib/$MACHINE/hatlib/$COMP ]
+echo "Built with $HC"
+if [ "$HC" = "ghc" -a -d lib/$MACHINE/lib/$COMP ]
then
# discover ghc version (technique courtesy of Simon Marlow)
- echo __GLASGOW_HASKELL__ >ghcsym.hs;
- $COMP -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
- GHCSYM=`grep -v '^#' ghcsym.out | grep -v '^$'`
+ echo "main = print __GLASGOW_HASKELL__" >ghcsym.hs;
+ $COMP -cpp ghcsym.hs -o ghcsym.out;
+ GHCSYM=`./ghcsym.out`
rm -f ghcsym.hs ghcsym.out;
-# # 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
+# # installation location for ghc
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"
@@ -39,33 +36,33 @@
mkdir -p $incdir
# install ghc package components
- echo -P$incdir >lib/$MACHINE/hatlib/$COMP/ghcincdir
- cp -p lib/$MACHINE/hatlib/$COMP/libHShat.a $libdir && \
+ echo -P$incdir >lib/$MACHINE/lib/$COMP/ghcincdir
+ cp -p lib/$MACHINE/lib/$COMP/libHShat.a $libdir && \
ranlib $libdir/libHShat.a && \
if [ -d $incdir ]
then
rm -rf $incdir/Hat && \
- { ghc-pkg$VER --remove-package=hat || $TRUE; }
+ { ghc-pkg$VER --remove-package=hat || echo "(You can ignore this error)"; }
else
mkdir $incdir
fi && \
for dir in $HATDIRS; \
- do mkdir $incdir/$dir; \
- done && \
- for dir in $HATDIRS; \
- do cp lib/$MACHINE/hatlib/$COMP/$dir/*.hi $incdir/$dir; \
+ do mkdir $incdir/$dir && \
+ cp lib/$MACHINE/lib/$COMP/$dir/*.hi $incdir/$dir; \
done && \
if [ $GHCSYM -ge 604 ]
then
- { cat lib/$MACHINE/hatlib/$COMP/hat-package.conf ;
+ { cat lib/$MACHINE/lib/$COMP/hat-package.conf ;
echo "import-dirs: $incdir";
echo "library-dirs: $libdir";
- } | ghc-pkg$VER --user register -
+ } | ghc-pkg$VER register -
else
- cat lib/$MACHINE/hatlib/$COMP/hat-package.conf | ghc-pkg$VER --add-package
+ cat lib/$MACHINE/lib/$COMP/hat-package.conf | ghc-pkg$VER --add-package
fi
+else
+ echo "Not built with GHC"
fi
-if [ -d lib/$MACHINE/hatlib/nhc98 ]
+if [ -d lib/$MACHINE/lib/nhc98 ]
then
# discover nhc98 location
nhc98=`which nhc98`
@@ -78,7 +75,7 @@
mkdir -p $incdir
# install nhc98 package components
- cp -p lib/$MACHINE/hatlib/nhc98/libHShat.a $libdir/$MACHINE && \
+ cp -p lib/$MACHINE/lib/nhc98/libHShat.a $libdir/$MACHINE && \
if [ -d $incdir/hat ]
then rm -rf $incdir/hat
fi
@@ -90,6 +87,6 @@
do mkdir $incdir/packages/hat/$dir; \
done && \
for dir in $HATDIRS; \
- do cp lib/$MACHINE/hatlib/$COMP/$dir/*.hi $incdir/packages/hat/$dir; \
+ do cp lib/$MACHINE/lib/$COMP/$dir/*.hi $incdir/packages/hat/$dir; \
done
fi
Modified: packages/hat/trunk/script/confhc-hat
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/script/confhc-hat?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/script/confhc-hat (original)
+++ packages/hat/trunk/script/confhc-hat Mon Oct 13 05:50:14 2008
@@ -52,11 +52,11 @@
# ...
-# First look for GHC. Determining version number here is due to Simon Marlow.
+# First look for GHC. Determining version number here is due to Ian Lynagh.
ghcsym () {
- echo __GLASGOW_HASKELL__ >ghcsym.hs;
- $1 -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
- grep -v '^#' ghcsym.out | grep -v '^$' > $2
+ echo "main = print __GLASGOW_HASKELL__" >ghcsym.hs;
+ $1 -cpp -o ghcsym.out ghcsym.hs
+ ./ghcsym.out >$2
rm -f ghcsym.hs ghcsym.out;
}
Modified: packages/hat/trunk/script/echo.c
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/script/echo.c?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/script/echo.c (original)
+++ packages/hat/trunk/script/echo.c Mon Oct 13 05:50:14 2008
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include <stdio.h>
int main (int argc, char** argv) {
Modified: packages/hat/trunk/script/fixghc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/script/fixghc?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/script/fixghc (original)
+++ packages/hat/trunk/script/fixghc Mon Oct 13 05:50:14 2008
@@ -57,6 +57,9 @@
exts) echon " -syslib lang";;
misc) ;;
base) ;;
+ packedstring) ;;
+ directory) ;;
+ containers) ;;
*) echon " -syslib $1" ;;
esac ;;
*) echon " $1" ;;
@@ -83,6 +86,11 @@
case $1 in
base) ;;
haskell98) ;;
+ readline) ;;
+ packedstring) ;;
+ directory) ;;
+ process) ;;
+ containers) ;;
*) echon " -package $1" ;;
esac ;;
*) echon " $1" ;;
@@ -93,7 +101,7 @@
exit 0
fi
-if [ $ghcversion -ge 504 ]
+if [ $ghcversion -ge 504 -a $ghcversion -lt 605 ]
then
while test "'$1'" != "''"
do
@@ -102,6 +110,63 @@
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/trunk/script/harch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/script/harch?rev=1272&op=diff
==============================================================================
--- packages/hat/trunk/script/harch (original)
+++ packages/hat/trunk/script/harch Mon Oct 13 05:50:14 2008
@@ -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,6 +75,8 @@
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