Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28748/HOC
Modified Files:
HOC-macos.conf HOC-macos.conf-inplace Makefile.in
Log Message:
Upgrade to GHC 6.3, recent snapshot.
I'm sure there are more places in HOC.* where we can take advantage of
TH 2.0's new features,
and the Cabal-aware build system is still quite fragile.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.in 18 May 2004 03:05:01 -0000 1.6
+++ Makefile.in 6 Dec 2004 03:46:51 -0000 1.7
@@ -11,7 +11,12 @@
Makefile.in \
$(NULL)
-all: libHOC.a HOC.o
+all: libHOC.a HOC.o ../inplace.conf
+
+../inplace.conf: HOC-$(PLATFORM).conf-inplace
+ $(GHC_PKG) unregister --force --package-conf=../inplace.conf HOC || true
+ $(GHC_PKG) register HOC-$(PLATFORM).conf-inplace \
+ --package-conf=../inplace.conf
libHOC.a: ghcmake.build-stamp
find build/objects/ -name \*.o | xargs $(MAKE_STATIC_LIB) libHOC.a
@@ -30,10 +35,11 @@
mkdir -p build/imports
$(GHC) --make HOC.hs \
-odir build/objects -hidir build/imports \
- -fglasgow-exts -package-name HOC \
+ -fglasgow-exts \
../HOC_cbits/HOC_cbits.o \
-I../HOC_cbits \
-I../libffi-src/build/include \
+ -ignore-package HOC \
$(FOUNDATION_INCLUDES) \
$(FOUNDATION_LIBS) \
$(DEFINES)
@@ -49,5 +55,4 @@
cp -R libHOC.a HOC.o build/imports \
$(GHC_LIB_PATH)/HOC/
ranlib $(GHC_LIB_PATH)/HOC/libHOC.a
- $(GHC_PKG) --update-package \
- --input-file=HOC-$(PLATFORM).conf
+ $(GHC_PKG) register HOC-$(PLATFORM).conf
Index: HOC-macos.conf
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HOC-macos.conf 13 May 2004 11:08:33 -0000 1.3
+++ HOC-macos.conf 6 Dec 2004 03:46:51 -0000 1.4
@@ -1,18 +1,31 @@
-Package
-{
- name = "HOC",
- auto = True,
- import_dirs = ["$libdir/HOC/imports"],
- source_dirs = [],
- library_dirs = ["$libdir/HOC"],
- hs_libraries = ["HOC"],
- extra_libraries = ["HOC_cbits"],
- include_dirs = ["$libdir/HOC"],
- c_includes = [],
- package_deps = ["base","haskell-src"],
- extra_ghc_opts = [],
- extra_cc_opts = [],
- extra_ld_opts = [],
- framework_dirs = [],
- extra_frameworks = ["Foundation"]
-}
+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: "$libdir/HOC/imports"
+library-dirs: "$libdir/HOC"
+
+hs-libraries: "HOC", "HOC_cbits"
+extra-libs: "objc"
+extra-frameworks: "Foundation"
+depends: base, template-haskell
Index: HOC-macos.conf-inplace
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf-inplace,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HOC-macos.conf-inplace 13 May 2004 18:04:41 -0000 1.3
+++ HOC-macos.conf-inplace 6 Dec 2004 03:46:51 -0000 1.4
@@ -1,20 +1,33 @@
-[
-Package
-{
- name = "HOC",
- auto = True,
- import_dirs = ["../HOC/build/imports"],
- source_dirs = [],
- library_dirs = ["../HOC", "../HOC_cbits"],
- hs_libraries = ["HOC"],
- extra_libraries = ["HOC_cbits"],
- include_dirs = ["../HOC_cbits"],
- c_includes = [],
- package_deps = ["base","haskell-src"],
- extra_ghc_opts = [],
- extra_cc_opts = [],
- extra_ld_opts = [],
- framework_dirs = [],
- extra_frameworks = ["Foundation"]
-}
-]
+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: "../HOC/build/imports"
+library-dirs: "../HOC",
+ "../HOC_cbits"
+
+hs-libraries: "HOC", "HOC_cbits"
+extra-libs: "objc"
+extra-frameworks: "Foundation"
+depends: base, template-haskell
+
|
