[hoc-cvs] hoc/HOC HOC-macos.conf.in,NONE,1.1 .cvsignore,1.1,1.2 HOC.hs,1.7,1.8 Makefile.in,1.9,1.10 HOC-macos.conf,1.5,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694/HOC

Modified Files:
	.cvsignore HOC.hs Makefile.in 
Added Files:
	HOC-macos.conf.in 
Removed Files:
	HOC-macos.conf 
Log Message:
More GHC 6.4 compilation fixes



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.in	31 Mar 2005 15:58:12 -0000	1.9
+++ Makefile.in	31 Mar 2005 16:37:58 -0000	1.10
@@ -71,4 +71,4 @@
 	cp -R libHOC.a HOC.o build/imports \
 		$(GHC_LIB_PATH)/HOC/
 	ranlib $(GHC_LIB_PATH)/HOC/libHOC.a
-	$(GHC_PKG) register HOC-$(PLATFORM).conf
+	$(GHC_PKG) update HOC-$(PLATFORM).conf

Index: HOC.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC.hs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- HOC.hs	31 Mar 2005 15:30:18 -0000	1.7
+++ HOC.hs	31 Mar 2005 16:37:58 -0000	1.8
@@ -38,7 +38,8 @@
         objectMapStatistics,
         
         -- things that shouldn't really be exported
-        InstanceVariables,
+        InstanceVariables(..),
+	initializeInstanceVariables,
         Typeable(..)
     ) where
 
@@ -48,6 +49,7 @@
 import HOC.ID
 import HOC.Class
 import HOC.DeclareClass
+import HOC.ExportClass
 import HOC.SelectorMarshaller
 import HOC.DeclareSelector
 import HOC.StdArgumentTypes

--- NEW FILE: HOC-macos.conf.in ---
name:               HOC
maintainer:         wol...@gm...
exposed:            True

exposed-modules:
    HOC,
    HOC.SelectorNameMangling,
    HOC.Arguments,
    HOC.FFICallInterface,
    HOC.StdArgumentTypes,
    HOC.TH,
    HOC.DeclareClass,
    HOC.ID,
    HOC.Class,
    HOC.DeclareSelector,
    HOC.SelectorMarshaller,
    HOC.Base,
    HOC.NewlyAllocated,
    HOC.Invocation,
    HOC.MsgSend,
    HOC.Utilities,
    HOC.ExportClass,
    HOC.NewClass

import-dirs:        "@GHC_LIB_PATH@/HOC/imports"
library-dirs:       "@GHC_LIB_PATH@/HOC"

hs-libraries:       "HOC", "HOC_cbits"
extra-libraries:    "objc"
frameworks:         "Foundation"
depends:            base, template-haskell

Index: .cvsignore
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	31 Mar 2005 15:41:25 -0000	1.1
+++ .cvsignore	31 Mar 2005 16:37:58 -0000	1.2
@@ -1,3 +1,5 @@
 build
 ghcmake.build-stamp
 Makefile
+HOC-macos.conf
+

--- HOC-macos.conf DELETED ---