[MLton-commit] r7399
Matthew Fluet
fluet at mlton.org
Tue Jan 19 11:23:13 PST 2010
Fix Makefile and .ignore files.
----------------------------------------------------------------------
_U mlton/trunk/basis-library/
U mlton/trunk/basis-library/.ignore
U mlton/trunk/basis-library/Makefile
_U mlton/trunk/basis-library/config/c/
D mlton/trunk/basis-library/config/c/.ignore
D mlton/trunk/basis-library/maps/c-types.amd64-linux.map
D mlton/trunk/basis-library/maps/c-types.test-amd64-m32-linux.map
D mlton/trunk/basis-library/maps/c-types.test-amd64-m64-linux.map
D mlton/trunk/basis-library/maps/c-types.test-weird-weird.map
D mlton/trunk/basis-library/maps/c-types.x86-linux.map
U mlton/trunk/basis-library/maps/header-word32.map
U mlton/trunk/basis-library/maps/header-word64.map
U mlton/trunk/basis-library/maps/objptr-rep32.map
U mlton/trunk/basis-library/maps/objptr-rep64.map
U mlton/trunk/basis-library/maps/seqindex-int32.map
U mlton/trunk/basis-library/maps/seqindex-int64.map
----------------------------------------------------------------------
Property changes on: mlton/trunk/basis-library
___________________________________________________________________
Name: svn:ignore
- basis.sml
+ basis-library.def-use
Modified: mlton/trunk/basis-library/.ignore
===================================================================
--- mlton/trunk/basis-library/.ignore 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/.ignore 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1 +1 @@
-basis.sml
+basis-library.def-use
Modified: mlton/trunk/basis-library/Makefile
===================================================================
--- mlton/trunk/basis-library/Makefile 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/Makefile 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1,4 +1,5 @@
-## Copyright (C) 1999-2006, 2008 Henry Cejtin, Matthew Fluet, Suresh
+## Copyright (C) 2010 Matthew Fluet.
+ # Copyright (C) 1999-2006, 2008 Henry Cejtin, Matthew Fluet, Suresh
# Jagannathan, and Stephen Weeks.
# Copyright (C) 1997-2000 NEC Research Institute.
#
@@ -16,15 +17,12 @@
.PHONY: clean
clean:
- find . -type f | egrep '.(old|ast|core-ml)$$' | xargs rm -f
../bin/clean
OBJPTR_MAPS = objptr-rep32.map objptr-rep64.map
HEADER_MAPS = header-word32.map header-word64.map
SEQINDEX_MAPS = seqindex-int32.map seqindex-int64.map
-TARGET_ARCH = amd64 hppa powerpc sparc x86
-TARGET_OS = cygwin darwin freebsd hurd hpux linux mingw netbsd openbsd solaris
DEFAULT_CHAR = char8
DEFAULT_INT = int32 int64 intinf
DEFAULT_REAL = real32 real64
@@ -50,24 +48,24 @@
for defint in $(DEFAULT_INT); do \
for defreal in $(DEFAULT_REAL); do \
for defword in $(DEFAULT_WORD); do \
- for targetarch in $(TARGET_ARCH); do \
- for targetos in $(TARGET_OS); do \
- if [ ! -r config/c/$$targetarch-$$targetos/c-types.sml ]; then \
- continue; \
- fi; \
- echo "Type checking: $$objptrrep $$header $$seqindex $$targetarch $$targetos $$defchar $$defint $$defreal $$defword"; \
- rm -f target.map; \
- ( echo "TARGET_ARCH $$targetarch"; \
- echo "TARGET_OS $$targetos"; ) > target.map; \
+ echo "Type checking: $$objptrrep $$header $$seqindex $$defchar $$defint $$defreal $$defword"; \
+ echo "$(MLTON)" -disable-ann deadCode -stop tc -show-types true \
+ -mlb-path-map "maps/$$objptrrep" \
+ -mlb-path-map "maps/$$header" \
+ -mlb-path-map "maps/$$seqindex" \
+ -default-type "$$defchar" \
+ -default-type "$$defint" \
+ -default-type "$$defreal" \
+ -default-type "$$defword" \
+ libs/all.mlb; \
"$(MLTON)" -disable-ann deadCode -stop tc -show-types true \
-mlb-path-map "maps/$$objptrrep" \
-mlb-path-map "maps/$$header" \
-mlb-path-map "maps/$$seqindex" \
- -mlb-path-map "target.map" \
-default-type "$$defchar" \
-default-type "$$defint" \
-default-type "$$defreal" \
-default-type "$$defword" \
libs/all.mlb; \
- rm -f target.map; \
- done; done; done; done; done; done; done; done; done
+ done; done; done; done; done; done; done;
+
Property changes on: mlton/trunk/basis-library/config/c
___________________________________________________________________
Name: svn:ignore
- amd64-linux
hppa-hpux
hppa-linux
powerpc-aix
powerpc-darwin
powerpc-linux
sparc-linux
sparc-solaris
x86-cygwin
x86-darwin
x86-freebsd
x86-linux
x86-mingw
x86-netbsd
x86-openbsd
Deleted: mlton/trunk/basis-library/config/c/.ignore
===================================================================
--- mlton/trunk/basis-library/config/c/.ignore 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/config/c/.ignore 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1,15 +0,0 @@
-amd64-linux
-hppa-hpux
-hppa-linux
-powerpc-aix
-powerpc-darwin
-powerpc-linux
-sparc-linux
-sparc-solaris
-x86-cygwin
-x86-darwin
-x86-freebsd
-x86-linux
-x86-mingw
-x86-netbsd
-x86-openbsd
Deleted: mlton/trunk/basis-library/maps/c-types.amd64-linux.map
===================================================================
--- mlton/trunk/basis-library/maps/c-types.amd64-linux.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/c-types.amd64-linux.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1,2 +0,0 @@
-TARGET_ARCH amd64
-TARGET_OS linux
Deleted: mlton/trunk/basis-library/maps/c-types.test-amd64-m32-linux.map
===================================================================
--- mlton/trunk/basis-library/maps/c-types.test-amd64-m32-linux.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/c-types.test-amd64-m32-linux.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1,2 +0,0 @@
-TARGET_ARCH test/amd64-m32
-TARGET_OS linux
Deleted: mlton/trunk/basis-library/maps/c-types.test-amd64-m64-linux.map
===================================================================
--- mlton/trunk/basis-library/maps/c-types.test-amd64-m64-linux.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/c-types.test-amd64-m64-linux.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1,2 +0,0 @@
-TARGET_ARCH test/amd64-m64
-TARGET_OS linux
Deleted: mlton/trunk/basis-library/maps/c-types.test-weird-weird.map
===================================================================
--- mlton/trunk/basis-library/maps/c-types.test-weird-weird.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/c-types.test-weird-weird.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1,2 +0,0 @@
-TARGET_ARCH test/weird
-TARGET_OS weird
Deleted: mlton/trunk/basis-library/maps/c-types.x86-linux.map
===================================================================
--- mlton/trunk/basis-library/maps/c-types.x86-linux.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/c-types.x86-linux.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1,2 +0,0 @@
-TARGET_ARCH x86
-TARGET_OS linux
Modified: mlton/trunk/basis-library/maps/header-word32.map
===================================================================
--- mlton/trunk/basis-library/maps/header-word32.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/header-word32.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1 +1 @@
-HEADER_WORD header-word32.sml
+HEADER_WORD word32
Modified: mlton/trunk/basis-library/maps/header-word64.map
===================================================================
--- mlton/trunk/basis-library/maps/header-word64.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/header-word64.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1 +1 @@
-HEADER_WORD header-word64.sml
+HEADER_WORD word64
Modified: mlton/trunk/basis-library/maps/objptr-rep32.map
===================================================================
--- mlton/trunk/basis-library/maps/objptr-rep32.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/objptr-rep32.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1 +1 @@
-OBJPTR_REP objptr-rep32.sml
+OBJPTR_REP rep32
Modified: mlton/trunk/basis-library/maps/objptr-rep64.map
===================================================================
--- mlton/trunk/basis-library/maps/objptr-rep64.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/objptr-rep64.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1 +1 @@
-OBJPTR_REP objptr-rep64.sml
+OBJPTR_REP rep64
Modified: mlton/trunk/basis-library/maps/seqindex-int32.map
===================================================================
--- mlton/trunk/basis-library/maps/seqindex-int32.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/seqindex-int32.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1 +1 @@
-SEQINDEX_INT seqindex-int32.sml
+SEQINDEX_INT int32
Modified: mlton/trunk/basis-library/maps/seqindex-int64.map
===================================================================
--- mlton/trunk/basis-library/maps/seqindex-int64.map 2010-01-19 18:58:50 UTC (rev 7398)
+++ mlton/trunk/basis-library/maps/seqindex-int64.map 2010-01-19 19:23:13 UTC (rev 7399)
@@ -1 +1 @@
-SEQINDEX_INT seqindex-int64.sml
+SEQINDEX_INT int64
More information about the MLton-commit
mailing list