[project @ 2002-09-16 07:09:24 by sof]

copy in tools from a mingw dist tree

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 924b1c4..58b78ff 100644 (file)
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -12,9 +12,24 @@
 #   foo$ cd ghc-<version>
 #   foo$ ../distrib/prep-bin-dist-mingw
 #
-export gcc_lib=c:/ghc/ghc-5.02.2/gcc-lib
-export perl_dir=c:/ghc/ghc-5.02.2
-export mingw_include=c:/ghc/ghc-5.02.2/include/mingw
+#export gcc_lib=c:/ghc/ghc-5.02.2/gcc-lib
+
+#Directory where a (cygwin-free) perl binary resides.
+export perl_dir=c:/ghc/ghc-5.04
+
+# The gcc-lib directory of the mingw tree you want to
+# include with the binary dist.
+export gcc_lib=f:/mingw/lib/gcc-lib/mingw32/2.95.3-6/
+
+#
+# The mingw include, lib, and bin directories.
+#
+export mingw_include=f:/mingw/include
+export mingw_lib=f:/mingw/lib/
+export mingw_bin=f:/mingw/bin/
+
+export perl_dir=c:/ghc/ghc-5.04
+#export mingw_include=c:/ghc/ghc-5.02.2/include/mingw
 
 # Play safe
 if ! [ -d bin/i386-unknown-mingw32 ] ; then
@@ -39,18 +54,43 @@ rmdir lib
 mv ghc-asm.prl ghc-asm
 mv ghc-split.prl ghc-split
 
-echo "copy in gcc-lib/"
-cp -Rf $gcc_lib .
+echo "create gcc-lib/"
+#
+# A bunch of stuff gets lumped into gcc-lib:
+#
+#  - the gcc-lib/ + gcc-lib/include of the gcc you
+#    intend to ship (normally located as 
+#     lib/gcc-lib/mingw/<gcc version>/ in your mingw tree.)
+#  - the contents of mingw/lib/ 
+#  - ld.exe, as.exe, dlltool.exe, dllwrap.exe from mingw/bin
+#
+mkdir gcc-lib
+cp $gcc_lib/* gcc-lib/
+cp $gcc_lib/include/* gcc-lib/
+cp $mingw_lib/* gcc-lib/
+cp $mingw_bin/as.exe gcc-lib/
+cp $mingw_bin/ld.exe gcc-lib/
+# 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/
+
 
 echo "extra header files inside of include/"
+#
+# contains mingw/include
 mkdir include/mingw
-cp -Rf $mingw_include include/
+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"
 
+echo "add gcc"
+cp ${mingw_bin}/gcc.exe .
 
 echo "copy in perl too"
 cp ${perl_dir}/perl.exe .
 cp ${perl_dir}/perl56.dll .
-cp ${perl_dir}/gcc.exe .
 
 # For reasons unknown, duplicate copies of misc package files in share/
 # (leave them be for now.)