From 53217546142b7eca3e645b71a0b7482b9b15004d Mon Sep 17 00:00:00 2001
From: Don Stewart <dons@cse.unsw.edu.au>
Date: Sat, 3 Sep 2005 04:09:37 +0000
Subject: [PATCH] More cabalisation improvements
---
Makefile | 7 -------
System/Eval/Haskell.hs | 7 +++++--
...ePkgConfCabal.y => ParsePkgConfCabal.y_in} | 0
plugins.cabal | 19 +++++++++----------
plugins.cabal.hsx | 19 ++++++++++---------
5 files changed, 24 insertions(+), 28 deletions(-)
rename System/Plugins/{ParsePkgConfCabal.y => ParsePkgConfCabal.y_in} (100%)
diff --git a/Makefile b/Makefile
index b10b4b0..331ecf3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,6 @@
# cut down reimplementation of $fptools/mk directory
-.PHONY: build all
-
-all: build EvalHaskell.h
-
-EvalHaskell.h: build
- cp System/Eval/Haskell_stub.h $@
-
#
# installing
#
diff --git a/System/Eval/Haskell.hs b/System/Eval/Haskell.hs
index e46b98f..1c364e7 100644
--- a/System/Eval/Haskell.hs
+++ b/System/Eval/Haskell.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS -fglasgow-exts -fffi #-}
--
-- Copyright (C) 2004-5 Don Stewart - http://www.cse.unsw.edu.au/~dons
--
@@ -28,12 +27,14 @@ module System.Eval.Haskell (
unsafeEval,
unsafeEval_,
typeOf,
- mkHsValues,
+ mkHsValues,
+{-
hs_eval_b, -- return a Bool
hs_eval_c, -- return a CChar
hs_eval_i, -- return a CInt
hs_eval_s, -- return a CString
+-}
module System.Eval.Utils,
@@ -207,6 +208,7 @@ wrap expr nm mods =
"resource = let { v = \n" ++
"{-# LINE 1 \"<Plugins.Eval>\" #-}\n" ++ expr ++ ";} in v"
+{-
------------------------------------------------------------------------
--
-- And for our friends in foreign parts
@@ -257,3 +259,4 @@ eval_cstring :: Typeable a => CString -> IO (Maybe a)
eval_cstring cs = do s <- peekCString cs
eval s [] -- TODO use eval()
+-}
diff --git a/System/Plugins/ParsePkgConfCabal.y b/System/Plugins/ParsePkgConfCabal.y_in
similarity index 100%
rename from System/Plugins/ParsePkgConfCabal.y
rename to System/Plugins/ParsePkgConfCabal.y_in
diff --git a/plugins.cabal b/plugins.cabal
index b358e6d..c7b62e1 100644
--- a/plugins.cabal
+++ b/plugins.cabal
@@ -1,12 +1,12 @@
-name: plugins
-version: 0.9.10
-license: LGPL
-License-file: LICENSE
+name: plugins
+version: 0.9.10
+license: LGPL
+License-file: LICENSE
author: Don Stewart
-maintainer: dons@cse.unsw.edu.au
+maintainer: dons@cse.unsw.edu.au
exposed-modules:
- AltData.Dynamic,
- AltData.Typeable,
+ AltData.Dynamic,
+ AltData.Typeable,
Language.Hi.Binary,
Language.Hi.FastMutInt,
Language.Hi.FastString,
@@ -31,8 +31,7 @@ exposed-modules:
System.Plugins.Utils
c-sources:
Language/Hi/hschooks.c
-includes: Linker.h
+includes: Linker.h
extensions: CPP, ForeignFunctionInterface
-Build-Depends: base, haskell98, Cabal, haskell-src
+Build-Depends: base, Cabal, haskell-src
ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures
-
diff --git a/plugins.cabal.hsx b/plugins.cabal.hsx
index 3ededb1..a843a0b 100644
--- a/plugins.cabal.hsx
+++ b/plugins.cabal.hsx
@@ -1,12 +1,12 @@
-name: plugins
-version: 0.9.10
-license: LGPL
-License-file: LICENSE
+name: plugins
+version: 0.9.10
+license: LGPL
+License-file: LICENSE
author: Don Stewart
-maintainer: dons@cse.unsw.edu.au
+maintainer: dons@cse.unsw.edu.au
exposed-modules:
- AltData.Dynamic,
- AltData.Typeable,
+ AltData.Dynamic,
+ AltData.Typeable,
Language.Hi.Binary,
Language.Hi.FastMutInt,
Language.Hi.FastString,
@@ -31,7 +31,8 @@ exposed-modules:
System.Plugins.Utils
c-sources:
Language/Hi/hschooks.c
-includes: Linker.h
-Build-Depends: base, haskell98, Cabal, haskell-src-exts
+includes: Linker.h
+extensions: CPP, ForeignFunctionInterface
+Build-Depends: base, Cabal, haskell-src-exts
ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures