diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-01-17 16:49:44 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-01-17 16:50:13 -0800 |
| commit | 80c7bfb069f69e1df5bd3e4bc234ed052f8d8e62 (patch) | |
| tree | bec6714f285baa9afb393649c9e713ff8c1230f2 | |
| parent | cf31eca5977ea309381091e956c642551295ee4b (diff) | |
Rename some readmes and fix some dist logic.
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | README.txt (renamed from README) | 0 | ||||
| -rw-r--r-- | mk/dist.mk | 17 | ||||
| -rw-r--r-- | src/README.txt (renamed from src/README) | 0 | ||||
| -rw-r--r-- | src/comp/README.txt (renamed from src/comp/README) | 0 |
5 files changed, 12 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index abe2359b315..55c5c43ceb6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 \ diff --git a/README b/README.txt index 25a492673aa..25a492673aa 100644 --- a/README +++ b/README.txt diff --git a/mk/dist.mk b/mk/dist.mk index fecdede796b..4783cd6050d 100644 --- a/mk/dist.mk +++ b/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 diff --git a/src/README b/src/README.txt index 21f38c9001a..21f38c9001a 100644 --- a/src/README +++ b/src/README.txt diff --git a/src/comp/README b/src/comp/README.txt index 9ee501c4c3b..9ee501c4c3b 100644 --- a/src/comp/README +++ b/src/comp/README.txt |