Skip to content

Commit bb11a85

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 106719 b: refs/heads/try c: 699b33d h: refs/heads/master i: 106717: 1995397 106715: 6ea9711 106711: 3ad90d4 106703: bccbbbf 106687: 62afca6 v: v3
1 parent 90c89ef commit bb11a85

File tree

107 files changed

+1485
-2165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1485
-2165
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
5-
refs/heads/try: a0f20f09fde77fb7330b1a67918744149dca3318
5+
refs/heads/try: 699b33d060c5c9cc580d50cf3fe39536ae7a059a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ config.mk
6565
/mingw-build/
6666
src/.DS_Store
6767
/tmp/
68-
/dist/
6968
/stage0/
7069
/dl/
7170
/stage1/

‎branches/try/configure

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ err() {
2222
need_ok() {
2323
if [ $? -ne 0 ]
2424
then
25-
err "$1"
25+
err $1
2626
fi
2727
}
2828

@@ -340,7 +340,7 @@ DEFAULT_BUILD="${CFG_CPUTYPE}-${CFG_OSTYPE}"
340340

341341
CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
342342
CFG_BUILD_DIR="$(pwd)/"
343-
CFG_SELF="$0"
343+
CFG_SELF=${CFG_SRC_DIR}$(basename $0)
344344
CFG_CONFIGURE_ARGS="$@"
345345

346346
OPTIONS=""
@@ -412,15 +412,16 @@ fi
412412
valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
413413
valopt rustlibdir "rustlib" "subdirectory name for rustc's libraries"
414414

415+
# Validate Options
416+
step_msg "validating $CFG_SELF args"
417+
validate_opt
418+
415419
if [ $HELP -eq 1 ]
416420
then
417421
echo
418422
exit 0
419423
fi
420424

421-
# Validate Options
422-
step_msg "validating $CFG_SELF args"
423-
validate_opt
424425

425426
step_msg "looking for build programs"
426427

@@ -727,7 +728,7 @@ step_msg "making directories"
727728

728729
for i in \
729730
doc doc/std doc/extra \
730-
dl tmp dist
731+
dl tmp
731732
do
732733
make_dir $i
733734
done

‎branches/try/mk/clean.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ clean-misc:
4141
@$(call E, cleaning)
4242
$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)
4343
$(Q)rm -f $(RUSTLLVM_LIB_OBJS) $(RUSTLLVM_OBJS_OBJS) $(RUSTLLVM_DEF)
44+
$(Q)rm -Rf $(DOCS)
4445
$(Q)rm -Rf $(GENERATED)
4546
$(Q)rm -Rf tmp/*
4647
$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz $(PKG_NAME)-*.exe dist

‎branches/try/mk/crates.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
TARGET_CRATES := std extra green rustuv native flate arena glob term semver \
5353
uuid serialize sync getopts collections num test time
54-
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat
54+
HOST_CRATES := syntax rustc rustdoc fourcc
5555
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5656
TOOLS := compiletest rustdoc rustc
5757

@@ -76,7 +76,6 @@ DEPS_sync := std
7676
DEPS_getopts := std
7777
DEPS_collections := std
7878
DEPS_fourcc := syntax std
79-
DEPS_hexfloat := syntax std
8079
DEPS_num := std
8180
DEPS_test := std extra collections getopts serialize term
8281
DEPS_time := std serialize
@@ -93,7 +92,6 @@ TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
9392
################################################################################
9493

9594
DOC_CRATES := $(filter-out rustc, $(filter-out syntax, $(CRATES)))
96-
COMPILER_DOC_CRATES := rustc syntax
9795

9896
# This macro creates some simple definitions for each crate being built, just
9997
# some munging of all of the parameters above.

‎branches/try/mk/dist.mk

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
PKG_NAME := rust
66
PKG_DIR = $(PKG_NAME)-$(CFG_RELEASE)
7-
PKG_TAR = dist/$(PKG_DIR).tar.gz
7+
PKG_TAR = $(PKG_DIR).tar.gz
88

99
ifdef CFG_ISCC
1010
PKG_ISS = $(wildcard $(S)src/etc/pkg/*.iss)
1111
PKG_ICO = $(S)src/etc/pkg/rust-logo.ico
12-
PKG_EXE = dist/$(PKG_DIR)-install.exe
12+
PKG_EXE = $(PKG_DIR)-install.exe
1313
endif
1414

1515
ifeq ($(CFG_OSTYPE), apple-darwin)
16-
PKG_OSX = dist/$(PKG_DIR).pkg
16+
PKG_OSX = $(PKG_DIR).pkg
1717
endif
1818

1919
PKG_GITMODULES := $(S)src/libuv $(S)src/llvm $(S)src/gyp $(S)src/compiler-rt
@@ -71,15 +71,14 @@ dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
7171
dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
7272
dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
7373
dist-prepare-win: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
74-
dist-prepare-win: PREPARE_CLEAN=true
7574
dist-prepare-win: prepare-base
7675

7776
endif
7877

7978
$(PKG_TAR): $(PKG_FILES)
8079
@$(call E, making dist dir)
81-
$(Q)rm -Rf tmp/dist/$(PKG_DIR)
82-
$(Q)mkdir -p tmp/dist/$(PKG_DIR)
80+
$(Q)rm -Rf dist
81+
$(Q)mkdir -p dist/$(PKG_DIR)
8382
$(Q)tar \
8483
-C $(S) \
8584
--exclude-vcs \
@@ -90,9 +89,9 @@ $(PKG_TAR): $(PKG_FILES)
9089
--exclude=*/llvm/test/*/*/*.ll \
9190
--exclude=*/llvm/test/*/*/*.td \
9291
--exclude=*/llvm/test/*/*/*.s \
93-
-c $(UNROOTED_PKG_FILES) | tar -x -C tmp/dist/$(PKG_DIR)
94-
$(Q)tar -czf $(PKG_TAR) -C tmp/dist $(PKG_DIR)
95-
$(Q)rm -Rf tmp/dist/$(PKG_DIR)
92+
-c $(UNROOTED_PKG_FILES) | tar -x -C dist/$(PKG_DIR)
93+
$(Q)tar -czf $(PKG_TAR) -C dist $(PKG_DIR)
94+
$(Q)rm -Rf dist
9695

9796
.PHONY: dist distcheck
9897

@@ -157,35 +156,3 @@ distcheck-osx: $(PKG_OSX)
157156
@echo -----------------------------------------------
158157

159158
endif
160-
161-
dist-install-dir: $(foreach host,$(CFG_HOST),dist-install-dir-$(host))
162-
163-
dist-tar-bins: $(foreach host,$(CFG_HOST),dist/$(PKG_DIR)-$(host).tar.gz)
164-
165-
define DEF_INSTALLER
166-
dist-install-dir-$(1): PREPARE_HOST=$(1)
167-
dist-install-dir-$(1): PREPARE_TARGETS=$(1)
168-
dist-install-dir-$(1): PREPARE_STAGE=2
169-
dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_DIR)-$(1)
170-
dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
171-
dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
172-
dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
173-
dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
174-
dist-install-dir-$(1): PREPARE_CLEAN=true
175-
dist-install-dir-$(1): prepare-base
176-
$$(Q)(cd $$(PREPARE_DEST_DIR)/ && find -type f) \
177-
> $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/$$(CFG_RUSTLIBDIR)/manifest
178-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)COPYRIGHT $$(PREPARE_DEST_DIR)
179-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)
180-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)
181-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)
182-
$$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR)
183-
184-
dist/$$(PKG_DIR)-$(1).tar.gz: dist-install-dir-$(1)
185-
@$(call E, build: $$@)
186-
$$(Q)tar -czf dist/$$(PKG_DIR)-$(1).tar.gz -C tmp/dist $$(PKG_DIR)-$(1)
187-
188-
endef
189-
190-
$(foreach host,$(CFG_HOST),\
191-
$(eval $(call DEF_INSTALLER,$(host))))

0 commit comments

Comments
 (0)