From 6b2adb8d5052aa2a5dd4000beacc1f3b402257a6 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 18 Sep 2007 16:33:31 +0000 Subject: [PATCH] MERGED: Another attempt at getting bindists working everywhere Ian Lynagh **20070916005328] { --- Makefile | 2 +- libraries/Makefile | 54 +++++++++++++++++++++++++------------------ libraries/installPackage.hs | 46 +++++++++++++++++++----------------- 3 files changed, 58 insertions(+), 44 deletions(-) diff --git a/Makefile b/Makefile index fcd1ad5..c058743 100644 --- a/Makefile +++ b/Makefile @@ -250,7 +250,7 @@ binary-dist:: ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" binary-dist:: - $(MAKE) DESTDIR=$(BIN_DIST_DIR) prefix=/. install + $(MAKE) prefix=$(BIN_DIST_DIR) install binary-dist:: cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw diff --git a/libraries/Makefile b/libraries/Makefile index 2bd80fa..0fbd473 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -91,20 +91,31 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- -docdir := $(docdir)/libraries/$$pkgid ifeq "$(RelocatableBuild)" "YES" # On Windows we want to make moveable bindists, but we need to tell # ghc-pkg where the haddock docs are. Therefore we completely ignore # where the user tells us to put the haddock documentation and put it # somewhere whose relative location we know. When installing we need # to give Cabal a real path, though. -htmldir_configure = $$topdir/doc/libraries/$$pkgid -htmldir_install = $(prefix)/doc/libraries/$$pkgid +iprefix = $$topdir +ibindir = $$topdir +ilibdir = $$topdir +ilibexecdir = $$topdir +idatadir = $$topdir +idocdir = $$topdir/doc/libraries/$$pkgid +ihtmldir = $$topdir/doc/libraries/$$pkgid +html_installed_root = $(prefix)/doc/libraries else # On non-Windows we can just give absolute paths all the time, and # thus obey the htmldir that we are given. -htmldir_configure = $(htmldir)/libraries/$$pkgid -htmldir_install = $(htmldir_configure) +iprefix = $(prefix) +ibindir = $(bindir) +ilibdir = $(libdir) +ilibexecdir = $(libexecdir) +idatadir = $(datadir) +idocdir = $(docdir)/libraries/$$pkgid +ihtmldir = $(htmldir)/libraries/$$pkgid +html_installed_root = $(ihtmldir) endif ifneq "$(DOING_BIN_DIST)" "YES" @@ -205,9 +216,8 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -# We explicitly set datadir to a sensible value, as Cabal (used to?) use -# "C:\\Program Files\\Common Files" -# on Windows +# We put non-existant paths in when configuring, as we require that +# builds don't depend on these paths when making bindists. # We rely on all the CONFIGURE_ARGS being quoted with '...', and there # being no 's inside the values. @@ -221,14 +231,14 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup -$(RM) -f stamp/configure.library.*.$* $*/unbuildable ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ - --prefix='$$topdir' \ - --bindir='$(bindir)' \ - --libdir='$(libdir)/lib' \ + --prefix=/NONEXISTANT \ + --bindir=/NONEXISTANT \ + --libdir=/NONEXISTANT \ --libsubdir='$$pkgid' \ - --libexecdir='$(libexecdir)' \ - --datadir='$(datadir)' \ - --docdir='$(docdir)' \ - --htmldir='$(htmldir_configure)' \ + --libexecdir=/NONEXISTANT \ + --datadir=/NONEXISTANT \ + --docdir=/NONEXISTANT \ + --htmldir=/NONEXISTANT \ --with-compiler=../../compiler/stage1/ghc-inplace \ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ @@ -312,13 +322,13 @@ endif install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(DESTDIR)$(htmldir_install) - $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(htmldir_install) - $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(htmldir_install) + $(INSTALL_DIR) $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(html_installed_root) + $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(html_installed_root) # Hacks: - $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.css $(DESTDIR)$(htmldir_install) - $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.js $(DESTDIR)$(htmldir_install) - $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.gif $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base-*/*.css $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base-*/*.js $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base-*/*.gif $(DESTDIR)$(html_installed_root) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -339,7 +349,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ cd $* && \ - ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(bindir)' '$(libdir)/lib' '$(libexecdir)' '$(datadir)' '$(docdir)' '$(htmldir_install)' '$(htmldir_configure)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \ + ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' ; \ fi .PHONY: binary-dist binary-dist.library.% diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs index 5946a6b..6e5914d 100644 --- a/libraries/installPackage.hs +++ b/libraries/installPackage.hs @@ -13,9 +13,10 @@ main :: IO () main = do args <- getArgs case args of - destdir : ipref : ibindir : ilibdir : ilibexecdir - : idatadir : idocdir : ihtmldir_copy : ihtmldir_reg - : ghcpkg : ghcpkgconf : args' -> + ghcpkg : ghcpkgconf : destdir : topdir : + iprefix : ibindir : ilibdir : ilibexecdir : + idatadir : idocdir : ihtmldir : + args' -> let verbosity = case args' of [] -> normal ['-':'v':v] -> @@ -24,20 +25,18 @@ main _ -> Just v in flagToVerbosity m _ -> error ("Bad arguments: " ++ show args) - in doit destdir ipref ibindir ilibdir - ilibexecdir idatadir idocdir - ihtmldir_copy ihtmldir_reg - ghcpkg ghcpkgconf verbosity + in doit verbosity ghcpkg ghcpkgconf destdir topdir + iprefix ibindir ilibdir ilibexecdir idatadir + idocdir ihtmldir _ -> error "Missing arguments" -doit :: FilePath -> FilePath -> FilePath -> FilePath -> FilePath +doit :: Verbosity -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath - -> FilePath - -> Verbosity + -> FilePath -> FilePath -> IO () -doit destdir ipref ibindir ilibdir ilibexecdir idatadir idocdir - ihtmldir_copy ihtmldir_reg ghcpkg ghcpkgconf verbosity = +doit verbosity ghcpkg ghcpkgconf destdir topdir + iprefix ibindir ilibdir ilibexecdir idatadir idocdir ihtmldir = do let userHooks = simpleUserHooks copyto = if null destdir then NoCopyDest else CopyTo destdir copyFlags = (emptyCopyFlags copyto) { @@ -68,13 +67,14 @@ doit destdir ipref ibindir ilibdir ilibexecdir idatadir idocdir pd_reg = pd { library = Just (mkLib (const True)) } -- When coying, we need to actually give a concrete -- directory to copy to rather than "$topdir" - i_copy = i { prefixDirTemplate = toPathTemplate ipref, - binDirTemplate = toPathTemplate ibindir, - libDirTemplate = toPathTemplate ilibdir, - libexecDirTemplate = toPathTemplate ilibexecdir, - dataDirTemplate = toPathTemplate idatadir, - docDirTemplate = toPathTemplate idocdir, - htmlDirTemplate = toPathTemplate ihtmldir_copy + toPathTemplate' = toPathTemplate . replaceTopdir topdir + i_copy = i { prefixDirTemplate = toPathTemplate' iprefix, + binDirTemplate = toPathTemplate' ibindir, + libDirTemplate = toPathTemplate' ilibdir, + libexecDirTemplate = toPathTemplate' ilibexecdir, + dataDirTemplate = toPathTemplate' idatadir, + docDirTemplate = toPathTemplate' idocdir, + htmlDirTemplate = toPathTemplate' ihtmldir } lbi_copy = lbi { installDirTemplates = i_copy } -- When we run GHC we give it a $topdir that includes the @@ -89,13 +89,13 @@ doit destdir ipref ibindir ilibdir ilibexecdir idatadir idocdir programLocation = UserSpecified ghcpkg } progs' = updateProgram prog progs - i_reg = i { prefixDirTemplate = toPathTemplate ipref, + i_reg = i { prefixDirTemplate = toPathTemplate iprefix, binDirTemplate = toPathTemplate ibindir, libDirTemplate = toPathTemplate ilibdir, libexecDirTemplate = toPathTemplate ilibexecdir, dataDirTemplate = toPathTemplate idatadir, docDirTemplate = toPathTemplate idocdir, - htmlDirTemplate = toPathTemplate ihtmldir_reg + htmlDirTemplate = toPathTemplate ihtmldir } lbi_reg = lbi { installDirTemplates = i_reg, withPrograms = progs' } @@ -103,6 +103,10 @@ doit destdir ipref ibindir ilibdir ilibexecdir idatadir idocdir (regHook simpleUserHooks) pd_reg lbi_reg userHooks registerFlags return () +replaceTopdir :: FilePath -> FilePath -> FilePath +replaceTopdir topdir ('$':'t':'o':'p':'d':'i':'r':p) = topdir ++ p +replaceTopdir _ p = p + -- Get the build info, merging the setup-config and buildinfo files. getConfig :: Verbosity -> IO LocalBuildInfo getConfig verbosity = do -- 1.7.10.4