cabal: removed mate-common

it feels still a bit hackish...

diff --git a/Makefile b/Makefile
index b9033167dd764159eda5d0945982947257983124..544c07c9ee0e5e5967982db392ec0d9a4614d2af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,8 @@ mate.dbg: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
        ghc --make $(DEBUGFLAGS) $(GHC_OPT) Mate.hs $(B_DEBUG)/ffi/trap.o -o $@ $(GHC_LD) -outputdir $(B_DEBUG)
 
 clean:
-       rm -rf $(BUILD) mate mate.dbg tags ffi/native.o tests/*.class Mate/*_stub.* \
+       rm -rf $(BUILD) mate mate.static mate.dbg tags ffi/native.o \
+               tests/*.class Mate/*_stub.* \
                jmate/lang/*.class jmate/io/*.class java/io/*.class \
                java/lang/{Integer,Character,String,System}.class
 

diff --git a/ffi/Setup.lhs b/ffi/Setup.lhs
deleted file mode 100644 (file)
index a630405..0000000
--- a/ffi/Setup.lhs
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/runhaskell 
-> module Main where
-> import Distribution.Simple
-> main :: IO ()
-> main = defaultMain
-

diff --git a/ffi/mate-common.cabal b/ffi/mate-common.cabal
deleted file mode 100644 (file)
index 941a74f..0000000
--- a/ffi/mate-common.cabal
+++ /dev/null
@@ -1,51 +0,0 @@
-name: mate-common
-version: 0.0.1
-cabal-version: -any
-build-type: Simple
-license: GPL-2
-license-file: ""
-copyright:
-maintainer: lewurm@gmail.com, haraldsteinlechner@gmail.com
-build-depends: base -any, bytestring -any
-stability: none
-homepage:
-package-url:
-bug-reports:
-synopsis:
-description: Provides mostly FFI based utility functions for Mate, the glorious JVM written in Haskell
-category:
-author: Bernhard Urban, Harald Steinlechner
-tested-with:
-data-files:
-data-dir: ""
-extra-source-files:
-extra-tmp-files:
-exposed-modules: Signals
-exposed: True
-buildable: True
-build-tools:
-cpp-options:
-cc-options:
-ld-options:
-pkgconfig-depends:
-frameworks:
-c-sources: trap.c native.c
-default-language:
-other-languages:
-default-extensions:
-other-extensions:
-extensions:
-extra-libraries:
-extra-lib-dirs:
-includes:
-install-includes:
-include-dirs:
-hs-source-dirs: src
-other-modules:
-ghc-prof-options:
-ghc-shared-options:
-ghc-options:
-hugs-options:
-nhc98-options:
-jhc-options:
-

diff --git a/ffi/src/Signals.hs b/ffi/src/Signals.hs
deleted file mode 100644 (file)
index a5f72bc..0000000
--- a/ffi/src/Signals.hs
+++ /dev/null
@@ -1,20 +0,0 @@
------------------------------------------------------------------------------
---
--- Module      :  Signals
--- Copyright   :
--- License     :  BSD
---
--- Maintainer  :  lewurm@gmail.com, haraldsteinlechner@gmail.com
--- Stability   :  none
--- Portability :
---
--- |
---
------------------------------------------------------------------------------
-
-module Signals (
-
-) where
-
-
-

diff --git a/mate.cabal b/mate.cabal
index ea142ed3a85a879d72b472e62189cbf79bb78028..98796dc27d21ece7ada35b86d4f1479c1d7aeb35 100644 (file)
--- a/mate.cabal
+++ b/mate.cabal
@@ -1,5 +1,5 @@
 name: mate
-version: 0.0.1
+version: 0.0.2
 cabal-version: -any
 build-type: Simple
 license: GPL-3
@@ -7,12 +7,12 @@ license-file: ""
 copyright:
 maintainer: lewurm@gmail.com, haraldsteinlechner@gmail.com
 build-depends: base -any, 
-               mate-common -any, 
-               hs-java ==0.3.1,
+               hs-java ==0.3.3,
                bytestring -any,
                harpy == 0.5.0.0,
                heap -any,
                containers -any,
+               directory -any,
                binary -any,
                plugins ==1.5.*,
                MissingH ==1.1.*,
@@ -88,7 +88,7 @@ cc-options:
 ld-options:
 pkgconfig-depends:
 frameworks:
-c-sources:
+c-sources: ffi/trap.c ffi/native.c
 default-language:
 other-languages:
 default-extensions:
@@ -98,7 +98,7 @@ extra-libraries:
 extra-lib-dirs:
 includes:
 install-includes:
-include-dirs: .
+include-dirs: "."
 hs-source-dirs: 
 other-modules:
 ghc-prof-options:
@@ -107,3 +107,8 @@ ghc-options:  -dynamic -Wall -O0 -fno-warn-unused-do-bind
 hugs-options:
 nhc98-options:
 jhc-options:
+
+-- some todos
+-- o atm it's building twice.  why?
+-- o although `cabal install' copies the binary, the java boot class files arn't copied.
+-- o fill it with more information (e.g. stability)