Hi Gábor, instead of changing `ghc.mk`, please change the builder script to also run `git clone git://git.haskell.org/ghc-tarballs.git`.
(Edit: while typing this, I saw you just did so) The benefits are: * the windows specific part of creating a source distribution also gets tested * the release manager can run `make sdist` on any platform, and they'll get a complete source distribution they can upload Thomas On Sun, Jul 26, 2015 at 8:36 PM, Páli Gábor János <pali.ga...@gmail.com> wrote: > Hi Thomas, > > 2015-07-21 12:45 GMT+02:00 Thomas Miedema <thomasmied...@gmail.com>: > > To get the sources: > > > > git clone --recursive git://git.haskell.org/ghc.git > > cd ghc > > git clone git://git.haskell.org/ghc-tarballs.git # Windows only > > Apparently, that last line is also needed even on non-Windows systems > when one wants to make the "sdist" target, at least as I have observed > on my builders, e.g. [1]. > > So I have put together a small patch that aims to fix this -- mind > you, I have not tested it on Windows, but theoretically it shall just > work: > > --- a/ghc.mk > +++ b/ghc.mk > @@ -1183,9 +1183,14 @@ sdist-windows-tarballs: sdist-windows-tarballs-prep > sdist-testsuite: sdist-testsuite-prep > cd $(SRC_DIST_TESTSUITE_ROOT) && "$(TAR_CMD)" chf - > $(SRC_DIST_BASE_NAME) 2> testsuite_log | $(TAR_COMP_CMD) > -c > $(TOP)/$(SRC_DIST_TESTSUITE_TARBALL) > > +SDIST_TARGETS= sdist-ghc sdist-testsuite > + > +ifeq "$(Windows_Host)" "YES" > +SDIST_TARGETS+= sdist-windows-tarballs > +endif > > .PHONY: sdist > -sdist : sdist-ghc sdist-windows-tarballs sdist-testsuite > +sdist : $(SDIST_TARGETS) > > sdist-manifest : $(SRC_DIST_GHC_TARBALL) > tar tjf $(SRC_DIST_GHC_TARBALL) | sed > "s|^ghc-$(ProjectVersion)/||" | sort >sdist-manifest > diff --git a/utils/haddock b/utils/haddock > > Are there any objections to commit this? > > Thanks, > Gábor > > [1] http://haskell.inf.elte.hu/builders/freebsd-amd64-head/700/15.html >
_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs