From: adam <adam@megacz.com>
Date: Sun, 27 May 2007 20:42:34 +0000 (-0400)
Subject: remove the last of the non-LambdaVM Haskell stuff
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=9116b182f20944b9cca70b1dc9d64d49e5f0ffce

remove the last of the non-LambdaVM Haskell stuff

darcs-hash:20070527204234-5007d-93063b3ed7737d9938ecd9293143f113e786e662.gz
---

diff --git a/Makefile.haskell b/Makefile.haskell
deleted file mode 100644
index fb26049..0000000
--- a/Makefile.haskell
+++ /dev/null
@@ -1,35 +0,0 @@
-ghc_version = $(shell ghc --version | sed 's_.*version \([0-9]*\.[0-9]*\).*_\1_')
-
-ifeq ($(ghc_version),6.5)
-patchghc    = patch -p0 < $(shell pwd)/misc/ghc-6.5-patch &&
-else
-ifeq ($(ghc_version),6.6)
-patchghc    = patch -p0 < $(shell pwd)/misc/ghc-6.5-patch &&
-else
-patchghc    =
-endif
-endif
-
-ifeq ($(shell uname),Darwin)
-with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/
-jvmlink     = -framework JavaVM -optl -fexceptions
-patchmac    = patch -p0 < $(shell pwd)/misc/intel-mac-patch &&
-linkopts    =
-platlink    = -L$(prefix)/lib/ -L$(JAVA_HOME)/jre/lib/i386/ -L$(JAVA_HOME)/jre/lib/i386/client/
-else
-with_jvmdir = --with-jvmdir=$(JAVA_HOME)
-jvmlink     = -ljava -ljvm -lverify
-patchmac    =
-linkopts    = -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/" -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/client/"
-platlink    =
-endif
-
-prefix          = $(shell pwd)/prefix
-jvm-bridge-site = umn.dl.sourceforge.net
-jvm-bridge-url  = http://$(jvm-bridge-site)/sourceforge/jvm-bridge/haskell-jvm-bridge-0.3.tar.gz
-
-#		The double -lHaskellJVMBridge is due to a circular link dep; the linux linker gets upset
-link            = $(platlink) -lstdc++ -lHaskellJVMBridge -lJVMBridge -lJVMInvocation -lHaskellJVMBridge $(jvmlink)
-packages        = -package haskell98 -package base -package rts
-ghc             = ghc -fglasgow-exts $(packages) -i$(prefix)/imports/
-bin             = $(prefix)/bin/
diff --git a/misc/broken-cygwin-detection-patch b/misc/broken-cygwin-detection-patch
deleted file mode 100644
index b45c074..0000000
--- a/misc/broken-cygwin-detection-patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Native/configure.in	2006-09-02 15:34:01.000000000 -0700
-+++ Native/configure.in	2006-09-02 15:33:11.000000000 -0700
-@@ -105,7 +105,7 @@
- ],[DEBUG_CPPFLAGS=""])
-
- # hack for Cygwin
--CYGPATH=`which cygpath`
-+type cygpath && CYGPATH=`which cygpath`
-
- JVM=""
- for TESTJVM in $(sed -e '/^#.*/ d' jvm.list | grep "${JVMFILTER}") ; do
-
diff --git a/misc/ghc-6.5-patch b/misc/ghc-6.5-patch
deleted file mode 100644
index c1b7007..0000000
--- a/misc/ghc-6.5-patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- Haskell/Makefile.am	2006-09-02 23:50:38.000000000 -0700
-+++ Haskell/Makefile.am	2003-11-03 12:49:54.000000000 -0800
-@@ -3,7 +3,8 @@
- 
- JVMFILE			= $(datadir)/current.jvm
- 
-+#HCPACKAGES		= -package lang -package concurrent
-+HCPACKAGES		= -package rts
--HCPACKAGES		= -package lang -package concurrent
- HCIMPORTDIRS	= -i.
- HCCOPTS			= -I$(includedir_FIX) $${JVM_INCLUDES}
- HCHOPTS			= -fglasgow-exts -fallow-undecidable-instances -package-name $(GHCPACKAGENAME)
-diff -u ./MonadException.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/MonadException.hs
---- Haskell/MonadException.hs	2006-09-02 23:42:19.000000000 -0700
-+++ Haskell/MonadException.hs	2002-01-28 18:21:35.000000000 -0800
-@@ -20,7 +20,7 @@
- 
- module MonadException where
- 	{
-+	import Control.Exception as Exception;
--	import Exception;
- 	
- 	-- much like MonadError, but without the fundep
- 	class (Monad m) => MonadException ex m where
-diff -u ./TypedCallback.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/TypedCallback.hs
---- Haskell/TypedCallback.hs	2006-09-02 23:43:13.000000000 -0700
-+++ Haskell/TypedCallback.hs	2002-08-05 17:27:04.000000000 -0700
-@@ -33,8 +33,8 @@
- 	import VMLayer;
- 	import JavaLayer;
- 	import BasicLayer;
-+	import Control.Concurrent as Concurrent;
-+	import Control.Exception as Exception;
--	import Concurrent;
--	import Exception;
- 
- {--
- 	data CallbackClass t = MkCallbackClass JClass;
-diff -u ./TypedLayer.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/TypedLayer.hs
---- Haskell/TypedLayer.hs	2006-09-02 23:44:06.000000000 -0700
-+++ Haskell/TypedLayer.hs	2002-01-28 18:21:35.000000000 -0800
-@@ -60,7 +60,7 @@
- 	import VMLayer;
- 	import JavaLayer;
- 	import BasicLayer;
-+	import Control.Monad.Error;
--	import MonadError;
- 
- 	runJavaClass :: (IsJVMMonad m) => ClassName -> [JString] -> m ();
- 	runJavaClass className args = do
-
diff --git a/misc/intel-mac-patch b/misc/intel-mac-patch
deleted file mode 100644
index 8288588..0000000
--- a/misc/intel-mac-patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Haskell/Makefile.am	2006-09-02 23:50:38.000000000 -0700
-+++ Haskell/Makefile.am	2003-11-03 12:49:54.000000000 -0800
-@@ -15,7 +14,7 @@
- 
- CFLAGS			= -I$(includedir_FIX) -I$(HC_INCDIR)
- 
-+BOOTLDFLAGS		= -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation -framework JavaVM -optl -fexceptions  -lstdc++ -optl '-fexceptions' 
--BOOTLDFLAGS		= -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation `echo "$${JVM_LDFLAGS}" | sed -e 's/  */ -optl/g;s/^/-optl/'` -lstdc++
- BOOTLDFLAGS		+= `(test -f $(libdir_FIX)/libjvm_imp.a && echo " -L$(libdir_FIX) -ljvm_imp ") || echo ""`
- 
- BOOT_SRCS = \