X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2Fprep-bin-dist-mingw;h=55411e520af30f2956dd10fa400ee65f56601a31;hp=2ba44c6805b55c8ff6316612ead84a79ec15e6e5;hb=19b0b165a24606dbdb1f4dd7728da7346845a5a0;hpb=a5f84ce88a1dbd6959e3f5bf7d52471789784e78

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 2ba44c6..55411e5 100644
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -1,26 +1,24 @@
 #!/bin/sh
 #
-# Running 'binary-dist' gives us a tree which isn't quite right
-# for the purposes of creating a mingw/win32 install tree.  
-# This script rejigs that tree. The resulting tree is ready for
-# packaging up in whatever form convenient (MSI installer / tar bundle/ ..)
+# Modify a GHC binary distribution for the purposes of creating a
+# mingw/win32 install tree.  The resulting tree is ready for packaging
+# up in whatever form is convenient (MSI installer / tar bundle/ ..)
 #
 # To use:
 #
-#   foo$ cd <top of fptools build tree>
-#   foo$ make binary-dist Project=Ghc  (*)
-#   foo$ cd ghc-<version>
-#   foo$ ../distrib/prep-bin-dist-mingw
+#   $ cd <top of GHC build tree>
+#   $ make binary-dist
 #
-#  * - making sure you've initially set BIN_DIST=1 in 
-#      your build.mk ...
+# This script is called at the appropriate point during 'make binary-dist'.
+# The result is a tarball at the top of your GHC build tree, named something
+# like ghc-6.6.1-i386-unknown-mingw32.tar.bz2.
 # 
 # User tweakables 
 #    Note: you normally don't need to set any of these, the script
 #    will try to figure them out for itself.  If the heuristics don't
 #    work for whatever reason, you can override them using environment
 #    variables, e.g.
-#      mingw_top=<whatever> ../distrib/prep-bin-dist-mingw
+#      mingw_top=<whatever> make binary-dist
 #
 #    - mingw_top   -- location of mingw distribution tree (usually c:/mingw)
 #    - perl_dir    -- location of non-cygwin perl.exe
@@ -111,7 +109,7 @@ fi
 
 # 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;
@@ -122,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
 
-echo "rejig bin/"
-mv bin/i386-unknown-mingw32/* bin/
-rmdir bin/i386-unknown-mingw32
+echo "strip ghc"
 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:
@@ -157,6 +144,7 @@ cp $mingw_lib/* gcc-lib/
 cp $mingw_bin/as.exe gcc-lib/
 cp $mingw_bin/ld.exe gcc-lib/
 cp $mingw_bin/ar.exe bin/
+cp $mingw_bin/windres.exe bin/
 # Note: later versions of dlltool.exe depend on a bfd helper DLL.
 cp $mingw_bin/dllwrap.exe gcc-lib/
 cp $mingw_bin/dlltool.exe gcc-lib/
@@ -176,7 +164,7 @@ cp -Rf $mingw_include/* include/mingw
 # g++-3/ subdir causes problems with installer tool (+ being a 
 # troublesome character); leave out for now.
 #rm -rf include/mingw/g++-3/ || echo "g++-3/ not there"
-rm -rf include/mingw/c++/ || echo "c++/ not there"
+#rm -rf include/mingw/c++/ || echo "c++/ not there"
 rm -rf include/mingw/ddk/ || echo "ddk/ not there"
 rm -rf include/mingw/gnu/ || echo "gnu/ not there"
 rm -rf include/mingw/javax/ || echo "javax/ not there"
@@ -195,8 +183,8 @@ cp ${perl_dir}/perl56.dll .
 # (leave them be for now.)
 
 echo "formatting documentation"
-cp README README.txt
-mv share doc
+unix2dos < README > README.txt
+rm README
 
 # 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.