projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
094f9fe
)
Fix bindists on Windows
author
Ian Lynagh
<igloo@earth.li>
Sat, 9 Jun 2007 11:19:20 +0000
(11:19 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sat, 9 Jun 2007 11:19:20 +0000
(11:19 +0000)
Makefile
patch
|
blob
|
history
distrib/prep-bin-dist-mingw
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
dbb4dfe
..
2ab4d5e
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-211,6
+211,16
@@
install-docs ::
# binary-dist is a GHC addition for binary distributions
#
# binary-dist is a GHC addition for binary distributions
#
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+
+binary-dist::
+ $(MAKE) prefix=$(BIN_DIST_DIR) install
+
+binary-dist::
+ cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
+
+else
+
BinDistDirs = includes compiler docs rts
BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
BinDistDirs = includes compiler docs rts
BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
@@
-341,16
+351,10
@@
endif
binary-dist::
$(MAKE) -C libraries binary-dist
binary-dist::
$(MAKE) -C libraries binary-dist
-# Jiggle the files around to make a valid Windows distribution if necessary
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-binary-dist :: fiddle-binary-dist
endif
endif
-.PHONY: fiddle-binary-dist
-fiddle-binary-dist:
- cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
# Tar up the distribution and build a manifest
# Tar up the distribution and build a manifest
-# XXX binary-dist :: tar-binary-dist
+binary-dist :: tar-binary-dist
.PHONY: tar-binary-dist
tar-binary-dist:
.PHONY: tar-binary-dist
tar-binary-dist:
diff --git
a/distrib/prep-bin-dist-mingw
b/distrib/prep-bin-dist-mingw
index
763f4eb
..
6ee4d7e
100644
(file)
--- a/
distrib/prep-bin-dist-mingw
+++ b/
distrib/prep-bin-dist-mingw
@@
-109,7
+109,7
@@
fi
# Check that we're in an OK place before starting to re-org
# the directory tree..
# Check that we're in an OK place before starting to re-org
# the directory tree..
-if ! [ -d bin/i386-unknown-mingw32 ] ; then
+if ! [ -d bin ] ; then
echo "Doesn't look as if I'm in the toplevel directory of a mingw tree"
echo "Usage: cd ghc-<version> ; ../distrib/prep-bin-dist-mingw"
exit 1;
echo "Doesn't look as if I'm in the toplevel directory of a mingw tree"
echo "Usage: cd ghc-<version> ; ../distrib/prep-bin-dist-mingw"
exit 1;
@@
-120,20
+120,9
@@
rm -f config.guess config.sub configure configure.ac mkdirhier
rm -f Makefile-bin.in Makefile.in aclocal.m4 install-sh
rm -rf autom4te.cache
rm -f Makefile-bin.in Makefile.in aclocal.m4 install-sh
rm -rf autom4te.cache
-echo "rejig bin/"
-mv bin/i386-unknown-mingw32/* bin/
-rmdir bin/i386-unknown-mingw32
+echo "strip ghc"
strip bin/ghc.exe
strip bin/ghc.exe
-echo "rejig lib/"
-mv lib/i386-unknown-mingw32/include/* include/
-rmdir lib/i386-unknown-mingw32/include
-mv lib/i386-unknown-mingw32/* .
-rmdir lib/i386-unknown-mingw32
-rmdir lib
-mv ghc-asm.prl ghc-asm
-mv ghc-split.prl ghc-split
-
echo "create gcc-lib/"
#
# A bunch of stuff gets lumped into gcc-lib:
echo "create gcc-lib/"
#
# A bunch of stuff gets lumped into gcc-lib:
@@
-193,8
+182,11
@@
cp ${perl_dir}/perl56.dll .
# (leave them be for now.)
echo "formatting documentation"
# (leave them be for now.)
echo "formatting documentation"
-cp README README.txt
-mv share doc
+unix2dos < README > README.txt
+rm README
+mv share/ghc/doc .
+rmdir share/ghc
+rmdir share
# Leave out pdf users_guide documentation for now; problematic to build with the versions
# of 'xsltproc' and 'fop' I've been able to lay my hands on.
# Leave out pdf users_guide documentation for now; problematic to build with the versions
# of 'xsltproc' and 'fop' I've been able to lay my hands on.