X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2Fprep-bin-dist-mingw;h=b2be5c9a2520b21cd3396075e900a7f94ea88727;hp=d63e1459140b811e720d1404317f97e8f74151bc;hb=1525a5819aa3a6eae8d8b05cfe348a2384da0c84;hpb=7c6bd4d7ed69424316bff13faa19a967f5eb788a diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw index d63e145..b2be5c9 100644 --- a/distrib/prep-bin-dist-mingw +++ b/distrib/prep-bin-dist-mingw @@ -1,39 +1,86 @@ #!/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 -# foo$ make binary-dist Project=Ghc +# foo$ make binary-dist Project=Ghc (*) # foo$ cd ghc- # foo$ ../distrib/prep-bin-dist-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 +# * - making sure you've initially set BIN_DIST=1 in +# your build.mk ... +# +# User tweakables +# (settable via environment variables, e.g., +# mingw_top= ../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 # 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 +if [ "x${gcc_lib}" == "x" ]; then + 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 +fi +if [ "x${gcc_libexec}" == "x" ]; then + if [ "x${gcc_version}" == "x" ]; then + # The default (with mingw3) + export gcc_libexec=$mingw_top/lib/gcc-lib/mingw32/3.2.3 + else + if [ -d $mingw_top/lib/gcc-lib/mingw32/${gcc_version} ]; then + export gcc_libexec=$mingw_top/lib/gcc-lib/mingw32/${gcc_version} + elif [ -d $mingw_top/libexec/gcc/mingw32/${gcc_version} ]; then + export gcc_libexec=$mingw_top/libexec/gcc/mingw32/${gcc_version} + else + echo "WARNING: Unable to determine location of your gcc 'libexec' directory" + export gcc_libexec=$mingw_top/lib/gcc-lib/mingw32/${gcc_version} + fi + fi +fi + +#Directory where a (cygwin-free) perl binary resides. +if [ "x${perl_dir}" == "x" ]; then + export perl_dir=$old_ghc_top +fi # -# 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 +if [ "x${mingw_include}" == "x" ]; then + export mingw_include=$mingw_top/include +fi +if [ "x${mingw_lib}" == "x" ]; then + export mingw_lib=$mingw_top/lib +fi +if [ "x${mingw_bin}" == "x" ]; then + export mingw_bin=$mingw_top/bin +fi + +# 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- ; ../distrib/prep-bin-dist-mingw" @@ -41,7 +88,7 @@ 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 @@ -66,17 +113,27 @@ echo "create gcc-lib/" # lib/gcc-lib/mingw// 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_libexec/* 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/ - +# Remove worthy, but unused tools +rm gcc-lib/f771.exe || echo "good - f771.exe not found" +rm gcc-lib/gnat1.exe || echo "good - gnat1.exe not found" +rm gcc-lib/jc1.exe || echo "good - jc1.exe not found" +rm gcc-lib/libgcj* || echo "good - libgcj libs not found" +rm gcc-lib/jvgenmain.exe || echo "good - jvgenmain.exe not found" echo "extra header files inside of include/" # @@ -87,11 +144,16 @@ 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" +rm -rf include/mingw/java/ || echo "java/ not there" +rm -rf include/mingw/gcj/ || echo "gcj/ 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 +165,12 @@ 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" +# 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. +#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"