New patches: [unrevert anonymous**20061214160426] < > { hunk ./Haskell/Examples/Makefile 21 HC = ghc HCPACKAGES = -package javavm -HCOPTS = -fglasgow-exts -fallow-undecidable-instances +HCOPTS = HCFLAGS = $(HCOPTS) $(HCPACKAGES) JVMB = /usr/lib/jvm-bridge MCM = $(JVMB)/bin/MakeClassModule hunk ./Haskell/Examples/Makefile 107 # autogenerated by 'make depend': # DO NOT DELETE: Beginning of Haskell dependencies -Header_MyClasses.o : Header_MyClasses.hs -Class_MyClass.o : Class_MyClass.hs -Class_MyClass.o : Header_MyClasses.hi -Class_java_awt_Frame.o : Class_java_awt_Frame.hs -Class_java_awt_Container.o : Class_java_awt_Container.hs -Class_java_awt_Component.o : Class_java_awt_Component.hs -Class_java_awt_Graphics.o : Class_java_awt_Graphics.hs -Class_java_lang_Throwable.o : Class_java_lang_Throwable.hs -Class_java_lang_String.o : Class_java_lang_String.hs -Class_java_lang_System.o : Class_java_lang_System.hs -Class_java_io_PrintStream.o : Class_java_io_PrintStream.hs -InterfaceMyClass_JVM.o : InterfaceMyClass_JVM.hs -InterfaceMyClass_JVM.o : Class_MyClass.hi -ShowFrame_JVM.o : ShowFrame_JVM.hs -ShowFrame_JVM.o : Class_java_awt_Frame.hi -ShowFrame_JVM.o : Class_java_awt_Container.hi -ShowFrame_JVM.o : Class_java_awt_Component.hi -ShowFrame_JVM.o : Class_java_awt_Graphics.hi -ShowFrame_JVM.o : Class_java_lang_System.hi -ShowFrame_JVM.o : Class_java_lang_String.hi -ShowEmptyFrame_JVM.o : ShowEmptyFrame_JVM.hs -ShowEmptyFrame_JVM.o : Class_java_awt_Frame.hi -ShowEmptyFrame_JVM.o : Class_java_awt_Component.hi -ShowEmptyFrame_JVM.o : Class_java_lang_System.hi -ShowEmptyFrame_JVM.o : Class_java_lang_String.hi +TestException.o : TestException.hs +TestException.o : ./TestException_JVM.hi +TestException.o : ./Class_java_lang_Throwable.hi +TestException.o : ./Class_java_lang_String.hi +TestException.o : ./Class_java_lang_System.hi +TestException.o : ./Class_java_io_PrintStream.hi +TestException_JVM.o : TestException_JVM.hs +TestException_JVM.o : ./Class_java_lang_Throwable.hi +TestException_JVM.o : ./Class_java_lang_String.hi +TestException_JVM.o : ./Class_java_lang_System.hi +TestException_JVM.o : ./Class_java_io_PrintStream.hi +TestCallback.o : TestCallback.hs +TestCallback.o : ./ShowFrame_JVM.hi +TestCallback.o : ./Class_java_lang_String.hi +TestCallback.o : ./Class_java_lang_System.hi +HelloWorld.o : HelloWorld.hs +HelloWorld.o : ./HelloWorld_JVM.hi +HelloWorld.o : ./Class_java_lang_System.hi +HelloWorld.o : ./Class_java_io_PrintStream.hi HelloWorld_JVM.o : HelloWorld_JVM.hs hunk ./Haskell/Examples/Makefile 127 -HelloWorld_JVM.o : Class_java_lang_System.hi -HelloWorld_JVM.o : Class_java_io_PrintStream.hi -InterfaceMyClass.o : InterfaceMyClass.hs -InterfaceMyClass.o : InterfaceMyClass_JVM.hi -InterfaceMyClass.o : Class_MyClass.hi -ShowFrame.o : ShowFrame.hs -ShowFrame.o : ShowFrame_JVM.hi -ShowFrame.o : Class_java_awt_Graphics.hi -ShowFrame.o : Class_java_awt_Component.hi -ShowFrame.o : Class_java_awt_Container.hi -ShowFrame.o : Class_java_awt_Frame.hi -ShowFrame.o : Class_java_lang_String.hi -ShowFrame.o : Class_java_lang_System.hi +HelloWorld_JVM.o : ./Class_java_lang_System.hi +HelloWorld_JVM.o : ./Class_java_io_PrintStream.hi ShowEmptyFrame.o : ShowEmptyFrame.hs hunk ./Haskell/Examples/Makefile 130 -ShowEmptyFrame.o : ShowEmptyFrame_JVM.hi -ShowEmptyFrame.o : Class_java_awt_Component.hi -ShowEmptyFrame.o : Class_java_awt_Frame.hi -ShowEmptyFrame.o : Class_java_lang_String.hi -ShowEmptyFrame.o : Class_java_lang_System.hi -HelloWorld.o : HelloWorld.hs -HelloWorld.o : HelloWorld_JVM.hi -HelloWorld.o : Class_java_lang_System.hi -HelloWorld.o : Class_java_io_PrintStream.hi -TestCallback.o : TestCallback.hs -TestCallback.o : ShowFrame_JVM.hi -TestCallback.o : Class_java_lang_String.hi -TestCallback.o : Class_java_lang_System.hi -TestException_JVM.o : TestException_JVM.hs -TestException_JVM.o : Class_java_lang_Throwable.hi -TestException_JVM.o : Class_java_lang_String.hi -TestException_JVM.o : Class_java_lang_System.hi -TestException_JVM.o : Class_java_io_PrintStream.hi -TestException.o : TestException.hs -TestException.o : TestException_JVM.hi -TestException.o : Class_java_lang_Throwable.hi -TestException.o : Class_java_lang_String.hi -TestException.o : Class_java_lang_System.hi -TestException.o : Class_java_io_PrintStream.hi +ShowEmptyFrame.o : ./ShowEmptyFrame_JVM.hi +ShowEmptyFrame.o : ./Class_java_awt_Component.hi +ShowEmptyFrame.o : ./Class_java_awt_Frame.hi +ShowEmptyFrame.o : ./Class_java_lang_String.hi +ShowEmptyFrame.o : ./Class_java_lang_System.hi +ShowEmptyFrame_JVM.o : ShowEmptyFrame_JVM.hs +ShowEmptyFrame_JVM.o : ./Class_java_awt_Frame.hi +ShowEmptyFrame_JVM.o : ./Class_java_awt_Component.hi +ShowEmptyFrame_JVM.o : ./Class_java_lang_System.hi +ShowEmptyFrame_JVM.o : ./Class_java_lang_String.hi +ShowFrame.o : ShowFrame.hs +ShowFrame.o : ./ShowFrame_JVM.hi +ShowFrame.o : ./Class_java_awt_Graphics.hi +ShowFrame.o : ./Class_java_awt_Component.hi +ShowFrame.o : ./Class_java_awt_Container.hi +ShowFrame.o : ./Class_java_awt_Frame.hi +ShowFrame.o : ./Class_java_lang_String.hi +ShowFrame.o : ./Class_java_lang_System.hi +ShowFrame_JVM.o : ShowFrame_JVM.hs +ShowFrame_JVM.o : ./Class_java_awt_Frame.hi +ShowFrame_JVM.o : ./Class_java_awt_Container.hi +ShowFrame_JVM.o : ./Class_java_awt_Component.hi +ShowFrame_JVM.o : ./Class_java_awt_Graphics.hi +ShowFrame_JVM.o : ./Class_java_lang_System.hi +ShowFrame_JVM.o : ./Class_java_lang_String.hi +InterfaceMyClass.o : InterfaceMyClass.hs +InterfaceMyClass.o : ./InterfaceMyClass_JVM.hi +InterfaceMyClass.o : ./Class_MyClass.hi +InterfaceMyClass_JVM.o : InterfaceMyClass_JVM.hs +InterfaceMyClass_JVM.o : ./Class_MyClass.hi +Class_java_io_PrintStream.o : Class_java_io_PrintStream.hs +Class_java_lang_System.o : Class_java_lang_System.hs +Class_java_lang_String.o : Class_java_lang_String.hs +Class_java_lang_Throwable.o : Class_java_lang_Throwable.hs +Class_java_awt_Graphics.o : Class_java_awt_Graphics.hs +Class_java_awt_Component.o : Class_java_awt_Component.hs +Class_java_awt_Container.o : Class_java_awt_Container.hs +Class_java_awt_Frame.o : Class_java_awt_Frame.hs +Class_MyClass.o : Class_MyClass.hs +Class_MyClass.o : ./Header_MyClasses.hi +Header_MyClasses.o : Header_MyClasses.hs # DO NOT DELETE: End of Haskell dependencies hunk ./Haskell/Makefile.in 212 LDH = . $(JVMFILE); $(HC) $(HCPACKAGES) RUN = . $(JVMFILE); env LD_LIBRARY_PATH="$(libdir_FIX)/:$${JVM_LIBDIRS}" HDOCFLAGS = -h --html -BOOTLDFLAGS = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation $${JVM_LDFLAGS} \ +BOOTLDFLAGS = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation `echo \ + "$${JVM_LDFLAGS}" | sed -e 's/ */ -optl/g;s/^/-optl/'` \ -lstdc++ `(test -f $(libdir_FIX)/libjvm_imp.a && echo " \ -L$(libdir_FIX) -ljvm_imp ") || echo ""` BOOT_SRCS = \ hunk ./Haskell/MonadException.hs 23 module MonadException where { - import Control.Exception; + import Exception; -- much like MonadError, but without the fundep class (Monad m) => MonadException ex m where hunk ./Haskell/MonadException.hs 35 instance MonadException Exception IO where { throwException = throw; - catchException = Control.Exception.catch; + catchException = Exception.catch; }; } hunk ./Haskell/TypedCallback.hs 36 import VMLayer; import JavaLayer; import BasicLayer; - import Control.Concurrent; - import Control.Exception; + import Concurrent; + import Exception; {-- data CallbackClass t = MkCallbackClass JClass; hunk ./Haskell/TypedCallback.hs 92 -- Haskell yield, not Java VM yield tlYield :: (IsJVMMonad m) => m (); - tlYield = callIO Control.Concurrent.yield; + tlYield = callIO Concurrent.yield; runProcs :: (IsJVMMonad m) => m Jboolean -> m () -> m Bool -> m (); runProcs procPending doNextProc stopNow = do hunk ./Haskell/TypedLayer.hs 63 import VMLayer; import JavaLayer; import BasicLayer; - import Control.Monad.Error; + import MonadError; runJavaClass :: (IsJVMMonad m) => ClassName -> [JString] -> m (); runJavaClass className args = do hunk ./Haskell/javavm.ghc-pkg.m4 18 dnl License along with this library; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl - -dnl package specification: -dnl http://www.haskell.org/ghc/docs/latest/html/users_guide/packages.html#installed-pkg-info - -name: PACKAGENAME -version: 0.3.1 -exposed: True -exposed-modules: BasicLayer - BridgeCallback - BridgeInvocation - BridgeLayer - BridgeThread - Bytes - Class_java_lang_Class - Class_java_lang_Object - Class_java_lang_Thread - ContextMonad - Equals - HasNothing - Header_Java - Header_JavaX - Header_Misc - Header_OMG - Invocation - JavaLayer - JavaText - JavaTypes - JavaTypeSig - JCFAttribute - JCFCallbackConstructor - JCFCallbackField - JCFCallbackFinalizer - JCFCallback - JCFCallbackMethod - JCFCallbackTypes - JCFCodeInstruction - JCFConstantPool - JCFDefinition - JCFFormat - JCFLayer - JCFWritable - JVMBoot - JVMBridge - JVMLayer - JVMLoadable - JVMStandard - JVMUser - LibLayer - LibUtil - LiftedMonad - MonadException - MonadThread - RawCallback - RawEnv - RawLayer - RawTypes - RawValueList - RawVM - Ref - Subtype - TypedArgumentList - TypedArray - TypedCallback - TypedClass - TypedField - TypedLayer - TypedListArray - TypedMethod - TypedMonad - TypedNewObject - TypedObject - TypedPrimitive - TypedReference - TypedReturnable - TypedString - TypedThread - TypedThrowable - TypedTuple - TypedValue - Type - VMArray - VMCallback - VMCall - VMClass - VMFieldAccess - VMFieldID - VMLayer - VMMethodID - VMNewObject - VMObject - VMRef - VMString - VMStringPtr - VMThread - VMThrowable - VMTypes - VMValueList -import-dirs: importsdir/ -library-dirs: libdir/`'patsubst(patsubst(JVM_LDFLAGS,`-l[^ ]+',`'),`[ ]*-L\([^ ]+\)[ ]*',` - \1') +dnl +Package + { + name = "PACKAGENAME", + import_dirs = ["importsdir/"], + source_dirs = [], + library_dirs = + [ + "libdir/"`'patsubst(patsubst(patsubst(JVM_LDFLAGS,`-framework[ ]+[^ ]+',`'),`-l[^ ]+',`'),`[ ]*-L\([^ ]+\)[ ]*',`, + "\1"') + ], + hs_libraries = [], dnl Library order is important. HaskellJVMBridge must come after JVMBridge. hunk ./Haskell/javavm.ghc-pkg.m4 31 -extra-libraries: stdc++, JVMBridge, JVMInvocation, HaskellJVMBridge`'patsubst(patsubst(patsubst(JVM_LDFLAGS,`-framework[ ]+[^ ]+',`'),`-L[^ ]+',`'),`[ ]*-l\([^ ]+\)[ ]*',`, \1') -depends: lang, concurrent, haskell98 - -dnl "The ability to specify extra GHC options in a package was -dnl a misfeature that we removed." -dnl http://www.mail-archive.com/glasgow-haskell-users@haskell.org/msg07966.html -dnl extra-ghc-opts: -fglasgow-exts -fallow-undecidable-instances - -ld-options: ifelse(regexp(JVM_LDFLAGS,`-framework'),`-1', - `"-Wl,-rpath,libdir/"`'patsubst(patsubst(JVM_LDFLAGS,`-l[^ ]+',`'),`[ ]*-L\([^ ]+\)[ ]*',` - "-Wl,-rpath,\1"')',`') + extra_libraries = ["stdc++","JVMBridge","JVMInvocation","HaskellJVMBridge"`'patsubst(patsubst(patsubst(JVM_LDFLAGS,`-framework[ ]+[^ ]+',`'),`-L[^ ]+',`'),`[ ]*-l\([^ ]+\)[ ]*',`,"\1"')], + include_dirs = [], + c_includes = [], + package_deps = ["lang","concurrent","haskell98"], + extra_ghc_opts = ["-fglasgow-exts","-fallow-undecidable-instances"], + extra_cc_opts = [], + extra_frameworks = [patsubst(patsubst(patsubst(patsubst(JVM_LDFLAGS,`-L[^ ]+[ ]*',`'),`-l[^ ]+[ ]*',`'),`-framework[ ]+\([^ ]+\)',``,"\1"''),`^,',`')], + extra_ld_opts = + [ +dnl runtime paths (but not for Darwin) + ifelse(regexp(JVM_LDFLAGS,`-framework'),`-1', + `"-Wl,-rpath,libdir/"`'patsubst(patsubst(JVM_LDFLAGS,`-l[^ ]+',`'),`[ ]*-L\([^ ]+\)[ ]*',`, + "-Wl,-rpath,\1"')',`') + ] + } } Context: [Patches for ghc-6.4.2 ArtemGr **20061214150239] [Importing the haskell-jvm-bridge-0.3.1.RC5 into darcs. ArtemGr **20061214140800] Patch bundle hash: e7e87ca2498b4fec0d2811a7fee0e46d2bbab79a