X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fprep-bin-dist-mingw;h=78f7b39f6b7db47edd977826c1bfc31b80423b08;hb=81cb7610337b33508066dd400cd371ff6033c987;hp=924b1c404aa227910725ddf31cc4b1adb970b1b7;hpb=d89f0e2d2adf5ebce15984d08b1d00de60db6d78;p=ghc-hetmet.git

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 924b1c4..78f7b39 100644
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -12,9 +12,26 @@
 #   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
+
+export old_ghc_top=c:/lang/ghc-5.04.1
+export mingw_top=c:/lang/MinGW32
+
+#Directory where a (cygwin-free) perl binary resides.
+# export perl_dir=c:/ghc/ghc-5.04
+export perl_dir=$old_ghc_top
+
+# 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/
+export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/2.95.3-8
+
+#
+# The mingw include, lib, and bin directories.
+#
+export mingw_include=$mingw_top/include
+export mingw_lib=$mingw_top/lib
+export mingw_bin=$mingw_top/bin
 
 # Play safe
 if ! [ -d bin/i386-unknown-mingw32 ] ; then
@@ -24,8 +41,9 @@ if ! [ -d bin/i386-unknown-mingw32 ] ; then
 fi;
 
 echo "Removing configure script files...not needed"
-rm -f config.guess config.sub configure configure.in mkdirhier
+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/
@@ -39,18 +57,45 @@ 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"
+rm -rf include/mingw/c++ || echo "c++/ not there"
 
+echo "add gcc"
+# cp ${mingw_bin}/gcc.exe .
+cp ${mingw_bin}/gcc-2.exe 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.)
@@ -58,12 +103,6 @@ cp ${perl_dir}/gcc.exe .
 echo "formatting documentation"
 cp README README.txt
 mv share doc
-cp ../ghc/docs/users_guide/users_guide.pdf doc/
-cp ../hslibs/doc/hslibs.pdf doc/
-#mkdir doc
-#mkdir doc/user-guide
-#cp -Rf html/* doc/user-guide/
-#cp pdf/set.pdf doc/
-#rm -rf html/
-#rm -rf pdf/
+cp ../ghc/docs/users_guide/users_guide.pdf doc/ || echo "No User Guide PDF doc found"
+cp ../hslibs/doc/hslibs.pdf doc/ || echo "No HSLIBS PDF doc found"