[hoc-cvs] hoc/Foundation Foundation-macos.conf-inplace.in,NONE,1.1 Foundation-macos.conf.in,NONE,1.1 Makefile.in,1.5,1.6 Foundation.conf,1.1.1.1,NONE Foundation.conf-inplace,1.1.1.1,NONE

[Wolfgang T. <wth...@us...>]

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

Modified Files:
	Makefile.in 
Added Files:
	Foundation-macos.conf-inplace.in Foundation-macos.conf.in 
Removed Files:
	Foundation.conf Foundation.conf-inplace 
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/Foundation/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.in	17 May 2004 18:07:42 -0000	1.5
+++ Makefile.in	6 Dec 2004 03:46:50 -0000	1.6
@@ -7,7 +7,23 @@
 	Makefile.in \
 	$(NULL)
 
-all: libHSFoundation.a HSFoundation.o
+all: libHSFoundation.a HSFoundation.o ../inplace.conf
+
+../inplace.conf: Foundation.conf-inplace
+	$(GHC_PKG) unregister --force --package-conf=../inplace.conf Foundation || true
+	$(GHC_PKG) register Foundation.conf-inplace \
+		--package-conf=../inplace.conf
+
+exposed-modules.txt:
+	find build/imports | grep '\.hi' \
+            | sed 's@build/imports/@ ,@g' | sed 's/\.hi//g' | sed 's@/@.@g' \
+            > exposed-modules.txt
+
+Foundation.conf-inplace: Foundation-$(PLATFORM).conf-inplace.in exposed-modules.txt
+	cat Foundation-$(PLATFORM).conf-inplace.in exposed-modules.txt > Foundation.conf-inplace
+
+Foundation.conf: Foundation-$(PLATFORM).conf.in exposed-modules.txt
+	cat Foundation-$(PLATFORM).conf.in exposed-modules.txt > Foundation.conf
 
 ghcmake: ghcmake.build-stamp
 
@@ -21,40 +37,40 @@
 	mkdir -p build/objects
 	mkdir -p build/imports
 	$(GHC) --make Foundation.hs	\
-		-package-name Foundation	\
 		-odir build/objects \
+		-ignore-package Foundation \
 		-hidir build/imports	\
-		-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
+		-package-conf ../inplace.conf \
 		-fglasgow-exts
+                
 	test ! -r GNUstepBase.hs || \
 		$(GHC) --make GNUstepBase.hs	\
-			-package-name Foundation	\
+			-ignore-package Foundation	\
 			-odir build/objects \
 			-hidir build/imports	\
-			-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
+			-package-conf ../inplace.conf \
 			-fglasgow-exts
 	touch $@
 
 HSFoundation.o: ghcmake.build-stamp
 	find build/objects/ -name \*.o | xargs ld -r -x -o HSFoundation.o
 
-#libHSFoundation.a: ghcmake
-#	find build/objects/ -name \*.o | xargs libtool -static -o libHSFoundation.a	
+libHSFoundation.a: ghcmake
+	find build/objects/ -name \*.o | xargs libtool -static -o libHSFoundation.a	
 
-libHSFoundation.a: HSFoundation.o
-	rm -f libHSFoundation.a
-	ar cq libHSFoundation.a HSFoundation.o
-	ranlib libHSFoundation.a
+#libHSFoundation.a: HSFoundation.o
+#	rm -f libHSFoundation.a
+#	ar cq libHSFoundation.a HSFoundation.o
+#	ranlib libHSFoundation.a
 
 clean:
 	rm -rf build libHSFoundation.a HSFoundation.o Foundation.hs \
 	    Foundation ghcmake.build-stamp
 	
-install: all
+install: all Foundation.conf
 	mkdir -p $(GHC_LIB_PATH)/Foundation
 	cp -R libHSFoundation.a HSFoundation.o build/imports \
 		$(GHC_LIB_PATH)/Foundation/
 	ranlib $(GHC_LIB_PATH)/Foundation/libHSFoundation.a
-	$(GHC_PKG) --update-package	\
-			--input-file=Foundation.conf
+	$(GHC_PKG) register Foundation.conf
 

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

import-dirs:	    "$libdir/Foundation/imports"
library-dirs:	    "$libdir/Foundation/"
hs-libraries:	    "HSFoundation"
extra-frameworks:   "Foundation"
depends:            HOC

exposed-modules:
    Foundation

--- Foundation.conf DELETED ---

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

import-dirs:	    "../Foundation/build/imports"
library-dirs:	    "../Foundation"
hs-libraries:	    "HSFoundation"
extra-frameworks:   "Foundation"
depends:            HOC

exposed-modules:
    Foundation

--- Foundation.conf-inplace DELETED ---