diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-12-29 16:24:44 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-12-29 17:26:05 -0800 |
| commit | 022d48566be471cc0e29aa0b0c552b3684529866 (patch) | |
| tree | 248741fe4351f6ee5cbf480b94c8a9b98c6be907 | |
| parent | 8b3c67690c4747b9fadfef407e6261524fb03f8a (diff) | |
mk: Make distcheck build binary tarballs on windows
These work, but aren't being built and uploaded because the bots run 'distcheck' not 'dist'.
| -rw-r--r-- | mk/dist.mk | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index fbad09d280f..67015820133 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -321,27 +321,20 @@ distcheck-docs: dist-docs # Primary targets (dist, distcheck) ###################################################################### -ifdef CFG_WINDOWSY_$(CFG_BUILD) - -dist: dist-win dist-tar-bins - -distcheck: distcheck-win - $(Q)rm -Rf tmp/distcheck - @echo - @echo ----------------------------------------------- - @echo "Rust ready for distribution (see ./dist)" - @echo ----------------------------------------------- - -else +MAYBE_DIST_TAR_SRC=dist-tar-src +MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src # FIXME #13224: On OS X don't produce tarballs simply because --exclude-vcs don't work. # This is a huge hack because I just don't have time to figure out another solution. ifeq ($(CFG_OSTYPE), apple-darwin) MAYBE_DIST_TAR_SRC= MAYBE_DISTCHECK_TAR_SRC= -else -MAYBE_DIST_TAR_SRC=dist-tar-src -MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src +endif + +# Don't bother with source tarballs on windows just because we historically haven't. +ifeq ($(CFG_OSTYPE), pc-windows-gnu) +MAYBE_DIST_TAR_SRC= +MAYBE_DISTCHECK_TAR_SRC= endif ifneq ($(CFG_DISABLE_DOCS),) @@ -352,15 +345,13 @@ MAYBE_DIST_DOCS=dist-docs MAYBE_DISTCHECK_DOCS=distcheck-docs endif -dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins $(MAYBE_DIST_DOCS) +dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-win dist-tar-bins $(MAYBE_DIST_DOCS) -distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins $(MAYBE_DISTCHECK_DOCS) +distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-win distcheck-tar-bins $(MAYBE_DISTCHECK_DOCS) $(Q)rm -Rf tmp/distcheck @echo @echo ----------------------------------------------- @echo "Rust ready for distribution (see ./dist)" @echo ----------------------------------------------- -endif - .PHONY: dist distcheck |