mirror of
https://github.com/rust-lang/rust
synced 2024-10-14 04:23:37 +00:00
Rename some readmes and fix some dist logic.
This commit is contained in:
parent
cf31eca597
commit
80c7bfb069
|
@ -114,7 +114,9 @@ LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
|
|||
|
||||
# version-string calculation
|
||||
CFG_GIT_DIR := $(CFG_SRC_DIR).git
|
||||
CFG_VERSION = prerelease
|
||||
CFG_RELEASE = prerelease
|
||||
CFG_VERSION = $(CFG_RELEASE)
|
||||
|
||||
ifneq ($(wildcard $(CFG_GIT)),)
|
||||
ifneq ($(wildcard $(CFG_GIT_DIR)),)
|
||||
CFG_VERSION += $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
|
||||
|
|
17
mk/dist.mk
17
mk/dist.mk
|
@ -2,10 +2,8 @@
|
|||
# Distribution
|
||||
######################################################################
|
||||
|
||||
|
||||
PKG_NAME := rust
|
||||
PKG_VER = $(shell date +"%Y-%m-%d")-snap
|
||||
PKG_DIR = $(PKG_NAME)-$(PKG_VER)
|
||||
PKG_DIR = $(PKG_NAME)-$(CFG_RELEASE)
|
||||
PKG_TAR = $(PKG_DIR).tar.gz
|
||||
|
||||
ifdef CFG_MAKENSIS
|
||||
|
@ -26,11 +24,11 @@ PKG_GITMODULES := \
|
|||
$(PKG_LLVM_SKEL)
|
||||
|
||||
PKG_FILES = \
|
||||
$(S)LICENSE.txt $(S)README \
|
||||
$(S)LICENSE.txt $(S)README.txt \
|
||||
$(S)configure $(S)Makefile.in \
|
||||
$(S)/doc \
|
||||
$(addprefix $(S)src/, \
|
||||
README \
|
||||
README.txt \
|
||||
cargo \
|
||||
comp \
|
||||
compiletest \
|
||||
|
@ -46,9 +44,6 @@ PKG_FILES = \
|
|||
$(PKG_GITMODULES) \
|
||||
$(MKFILE_DEPS)
|
||||
|
||||
dist: $(PKG_TAR) $(PKG_EXE)
|
||||
|
||||
nsis-dist: $(PKG_EXE)
|
||||
|
||||
lic.txt: $(S)LICENSE.txt
|
||||
@$(call E, crlf: $@)
|
||||
|
@ -67,6 +62,12 @@ $(PKG_TAR): $(PKG_FILES)
|
|||
$(Q)tar -czf $(PKG_TAR) -C dist $(PKG_DIR)
|
||||
$(Q)rm -Rf dist
|
||||
|
||||
.PHONY: dist nsis-dist distcheck
|
||||
|
||||
dist: $(PKG_TAR) $(PKG_EXE)
|
||||
|
||||
nsis-dist: $(PKG_EXE)
|
||||
|
||||
distcheck: $(PKG_TAR)
|
||||
$(Q)rm -Rf dist
|
||||
$(Q)mkdir -p dist
|
||||
|
|
Loading…
Reference in a new issue