[project @ 2004-08-18 19:12:42 by sof]

- set mingw_top, old_ghc_top, gcc_version defaults if not
  defined in the environment block.
- bundle ar.exe (as bin/ar.exe)
- more comments

1 files changed, 53 insertions, 24 deletions

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 78f7b39f6b..957030a3f4 100644
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -1,39 +1,61 @@
 #!/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
-# the tree.
+# 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/ ..)
 #
 # To use:
 #
 #   foo$ cd <top of fptools build tree>
-#   foo$ make binary-dist Project=Ghc 
+#   foo$ make binary-dist Project=Ghc  (*)
 #   foo$ cd ghc-<version>
 #   foo$ ../distrib/prep-bin-dist-mingw
 #
-#export gcc_lib=c:/ghc/ghc-5.02.2/gcc-lib
+#  * - making sure you've initially set BIN_DIST=1 in 
+#      your build.mk ...
+# 
+# User tweakables 
+#   (settable via environment variables, e.g.,
+#      mingw_top=<whatever> ../distrib/prep-bin-dist-mingw
+#   )
+#
+#    - mingw_top   -- location of mingw distribution tree
+#    - old_ghc_top -- top of existing GHC binary diste tree
+#                     (needed just to copy along perl binary.)
+#
+#    - gcc_version -- what gcc version your mingw tree uses.
+#
+#
+if [ "x${old_ghc_top}" == "x" ]; then
+    export old_ghc_top=c:/ghc/ghc-6.2.1
+fi
+if [ "x${mingw_top}" == "x" ]; then
+ export mingw_top=c:/mingw3
+fi
 
-export old_ghc_top=c:/lang/ghc-5.04.1
-export mingw_top=c:/lang/MinGW32
+# The gcc-lib directory of the mingw tree you want to
+# include with the binary dist.
+if [ "x${gcc_version}" == "x" ]; then
+  # The default (with mingw3)
+  export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/3.2.3
+else
+  export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/${gcc_version}
+fi
 
 #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.
+# The mingw include, lib, and bin directories; all derived
+# from ${mingw_top}.
 #
 export mingw_include=$mingw_top/include
 export mingw_lib=$mingw_top/lib
 export mingw_bin=$mingw_top/bin
 
-# Play safe
+# Check that we're in an OK place before starting to re-org
+# the directory tree..
 if ! [ -d bin/i386-unknown-mingw32 ] ; 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"
@@ -66,17 +88,21 @@ echo "create gcc-lib/"
 #     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
+#    to gcc-lib/
+#  - ar.exe from mingw/bin to bin/
 #
 mkdir gcc-lib
+mkdir gcc-lib/include
 cp $gcc_lib/* gcc-lib/
-cp $gcc_lib/include/* gcc-lib/
+cp $gcc_lib/include/* gcc-lib/include/
 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/
 # 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/
-
+rm gcc-lib/f771.exe || echo "good - f771.exe not found"
 
 echo "extra header files inside of include/"
 #
@@ -87,11 +113,11 @@ 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"
 
 echo "add gcc"
-# cp ${mingw_bin}/gcc.exe .
-cp ${mingw_bin}/gcc-2.exe gcc.exe
+cp ${mingw_bin}/gcc.exe .
+#cp ${mingw_bin}/gcc-2.exe gcc.exe
 
 echo "copy in perl too"
 cp ${perl_dir}/perl.exe .
@@ -103,6 +129,9 @@ cp ${perl_dir}/perl56.dll .
 echo "formatting documentation"
 cp README README.txt
 mv share doc
-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"
-
+cp ../ghc/docs/users_guide/users_guide.pdf doc/ || 
+  (make -C ../ghc/docs/users_guide/ pdf ; cp ../ghc/docs/users_guide/users_guide.pdf doc/) || 
+  echo "No User Guide PDF doc found"
+cp ../hslibs/doc/hslibs.pdf doc/ || 
+  (make -C ../hslibs/doc/ pdf ; cp ../hslibs/doc/hslibs.pdf doc/) ||
+  echo "No HSLIBS PDF doc found"