#!/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
-# (settable via environment variables, e.g.,
-# mingw_top=<whatever> ../distrib/prep-bin-dist-mingw
-# )
+# 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> make binary-dist
#
-# - mingw_top -- location of mingw distribution tree
-# - old_ghc_top -- top of existing GHC binary diste tree
-# (needed just to copy along perl binary.)
+# - mingw_top -- location of mingw distribution tree (usually c:/mingw)
+# - perl_dir -- location of non-cygwin perl.exe
+# - gcc_lib -- c:/mingw/lib/gcc/mingw32/3.4.2, or equivalent
+# - gcc_libexec -- c:/mingw/libexec/gcc/mingw32/3.4.2, or equivalent
#
-# - 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
+
+#Directory where a (cygwin-free) perl binary resides.
+if [ "${perl_dir}" == "" ]; then
+ for i in c:/ghc/*; do
+ if [ -e $i/perl.exe ]; then
+ perl_dir=$i
+ echo "Found perl.exe in $i"
+ break
+ fi
+ done
+ if [ "${perl_dir}" == "" ]; then
+ echo "Can't find perl.exe; please set \$perl_dir"
+ exit 1
+ fi
fi
-if [ "x${mingw_top}" == "x" ]; then
- export mingw_top=c:/mingw3
+
+if [ "${mingw_top}" == "" ]; then
+ if [ -d c:/mingw ]; then
+ mingw_top=c:/mingw
+ echo "Found mingw in $mingw_top"
+ else
+ echo "Can't find mingw; please set \$mingw_top"
+ exit 1
+ fi
fi
# 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}
+if [ "x${gcc_lib}" == "x" ]; then
+ if [ -d "${mingw_top}/lib/gcc-lib/mingw32" ]; then
+ mingw_gcc_lib=${mingw_top}/lib/gcc-lib/mingw32
+ else
+ mingw_gcc_lib=${mingw_top}/lib/gcc/mingw32
+ fi
+ for i in `ls -r ${mingw_gcc_lib}`; do
+ if [ -d "${mingw_gcc_lib}/$i" ]; then
+ gcc_lib=${mingw_gcc_lib}/$i
+ echo "Found gcc lib in $gcc_lib"
+ break
+ fi
+ done
+ if [ "${gcc_lib}" == "" ]; then
+ echo "Can't find gcc lib files; please set \$gcc_lib"
+ exit 1
+ fi
fi
-
-#Directory where a (cygwin-free) perl binary resides.
-export perl_dir=$old_ghc_top
-
+
+# The gcc-lib directory of the mingw tree you want to
+# include with the binary dist.
+if [ "x${gcc_libexec}" == "x" ]; then
+ if [ -d "${mingw_top}/libexec/gcc-lib/mingw32" ]; then
+ mingw_gcc_libexec=${mingw_top}/libexec/gcc-lib/mingw32
+ else
+ mingw_gcc_libexec=${mingw_top}/libexec/gcc/mingw32
+ fi
+ for i in `ls -r ${mingw_gcc_libexec}`; do
+ if [ -d "${mingw_gcc_libexec}/$i" ]; then
+ gcc_libexec=${mingw_gcc_libexec}/$i
+ echo "Found gcc libexec in $gcc_libexec"
+ break
+ fi
+ done
+ if [ "${gcc_libexec}" == "" ]; then
+ echo "Can't find gcc libexec files; please set \$gcc_libexec"
+ exit 1
+ fi
+fi
+
#
# 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
+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
+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;
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/* .
-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:
mkdir gcc-lib
mkdir gcc-lib/include
cp $gcc_lib/* 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/
+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/
+# 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/"
#
# 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 .
# (leave them be for now.)
echo "formatting documentation"
-cp README README.txt
-mv share doc
-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"
+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.
+#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"
projects / ghc-hetmet.git / blobdiff