mk: Wire up everything to dist and distcheck
Fix some misc bugs
This commit is contained in:
parent
dd7a60e0c3
commit
b8138e0cf2
16
mk/dist.mk
16
mk/dist.mk
|
@ -165,8 +165,15 @@ $(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))
|
||||||
|
|
||||||
dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg)
|
dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg)
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
dist-osx:
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# FIXME should do something
|
||||||
|
distcheck-osx:
|
||||||
|
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# Unix binary installer tarballs
|
# Unix binary installer tarballs
|
||||||
|
@ -223,6 +230,7 @@ distcheck-tar-bins: dist-tar-bins
|
||||||
# Just copy the docs to a folder under dist with the appropriate name
|
# Just copy the docs to a folder under dist with the appropriate name
|
||||||
# for uploading to S3
|
# for uploading to S3
|
||||||
dist-docs: docs compiler-docs
|
dist-docs: docs compiler-docs
|
||||||
|
$(Q) rm -Rf dist/doc
|
||||||
$(Q) mkdir -p dist/doc/
|
$(Q) mkdir -p dist/doc/
|
||||||
$(Q) cp -r doc dist/doc/$(CFG_PACKAGE_VERS)
|
$(Q) cp -r doc dist/doc/$(CFG_PACKAGE_VERS)
|
||||||
|
|
||||||
|
@ -239,18 +247,18 @@ distcheck: dist
|
||||||
$(Q)rm -Rf tmp/distcheck
|
$(Q)rm -Rf tmp/distcheck
|
||||||
@echo
|
@echo
|
||||||
@echo -----------------------------------------------
|
@echo -----------------------------------------------
|
||||||
@echo Rust ready for distribution (see ./dist)
|
@echo "Rust ready for distribution (see ./dist)"
|
||||||
@echo -----------------------------------------------
|
@echo -----------------------------------------------
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
dist: dist-tar-src
|
dist: dist-tar-src dist-osx dist-tar-bins dist-docs
|
||||||
|
|
||||||
distcheck: dist distcheck-tar-src
|
distcheck: dist distcheck-tar-src distcheck-osx distcheck-tar-bins
|
||||||
$(Q)rm -Rf tmp/distcheck
|
$(Q)rm -Rf tmp/distcheck
|
||||||
@echo
|
@echo
|
||||||
@echo -----------------------------------------------
|
@echo -----------------------------------------------
|
||||||
@echo Rust ready for distribution (see ./dist)
|
@echo "Rust ready for distribution (see ./dist)"
|
||||||
@echo -----------------------------------------------
|
@echo -----------------------------------------------
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue