Skip to content

Commit 234a325

Browse files
adrientetaradrientetar
committed
---
yaml --- r: 149863 b: refs/heads/try2 c: 862aced h: refs/heads/master i: 149861: 36dc46d 149859: 95fe7db 149855: 56f0e53 v: v3
1 parent 6c3666a commit 234a325

Some content is hidden

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

64 files changed

+240
-2117
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 3bede9fd310540a0fd72371008f8aa606b23b11b
8+
refs/heads/try2: 862acedf514fe806d2ab7d337fc0e156faf1d7b4
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/.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/try2/configure

Lines changed: 7 additions & 7 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

@@ -456,7 +457,6 @@ probe CFG_PANDOC pandoc
456457
probe CFG_PDFLATEX pdflatex
457458
probe CFG_XETEX xetex
458459
probe CFG_LUATEX luatex
459-
probe CFG_NODE nodejs node
460460
probe CFG_GDB gdb
461461
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
462462
then
@@ -727,7 +727,7 @@ step_msg "making directories"
727727

728728
for i in \
729729
doc doc/std doc/extra \
730-
dl tmp dist
730+
dl tmp
731731
do
732732
make_dir $i
733733
done

‎branches/try2/mk/crates.mk

Lines changed: 1 addition & 2 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

‎branches/try2/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))))

‎branches/try2/mk/docs.mk

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ $(info cfg: no pandoc found, omitting PDF and EPUB docs)
9393
ONLY_HTML_DOCS = 1
9494
endif
9595

96-
ifeq ($(CFG_NODE),)
97-
$(info cfg: no node found, omitting PDF and EPUB docs)
98-
ONLY_HTML_DOCS = 1
99-
endif
100-
10196

10297
######################################################################
10398
# Rust version
@@ -118,7 +113,7 @@ doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
118113
GENERATED += doc/version.md doc/version_info.html
119114

120115
######################################################################
121-
# Docs, from rustdoc and sometimes pandoc & node
116+
# Docs, from rustdoc and sometimes pandoc
122117
######################################################################
123118

124119
doc/:
@@ -168,15 +163,13 @@ ifneq ($(ONLY_HTML_DOCS),1)
168163
DOC_TARGETS += doc/$(1).epub
169164
doc/$(1).epub: $$(D)/$(1).md | doc/
170165
@$$(call E, pandoc: $$@)
171-
$$(Q)$$(CFG_NODE) $$(D)/prep.js --highlight $$< | \
172-
$$(CFG_PANDOC) $$(PANDOC_EPUB_OPTS) --output=$$@
166+
$$(CFG_PANDOC) $$(PANDOC_EPUB_OPTS) $$< --output=$$@
173167

174168
# PDF (md =(pandoc)=> tex =(pdflatex)=> pdf)
175169
DOC_TARGETS += doc/$(1).tex
176170
doc/$(1).tex: $$(D)/$(1).md doc/footer.tex doc/version.md | doc/
177171
@$$(call E, pandoc: $$@)
178-
$$(Q)$$(CFG_NODE) $$(D)/prep.js $$< | \
179-
$$(CFG_PANDOC) $$(PANDOC_TEX_OPTS) --output=$$@
172+
$$(CFG_PANDOC) $$(PANDOC_TEX_OPTS) $$< --output=$$@
180173

181174
ifneq ($(NO_PDF_DOCS),1)
182175
ifeq ($$(SHOULD_BUILD_PDF_DOC_$(1)),1)

‎branches/try2/mk/prepare.mk

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ prepare-base: PREPARE_SOURCE_LIB_DIR=$(PREPARE_SOURCE_DIR)/$(CFG_LIBDIR_RELATIVE
3333
prepare-base: PREPARE_SOURCE_MAN_DIR=$(S)/man
3434
prepare-base: PREPARE_DEST_BIN_DIR=$(PREPARE_DEST_DIR)/bin
3535
prepare-base: PREPARE_DEST_LIB_DIR=$(PREPARE_DEST_DIR)/$(CFG_LIBDIR_RELATIVE)
36-
prepare-base: PREPARE_DEST_MAN_DIR=$(PREPARE_DEST_DIR)/man/man1
36+
prepare-base: PREPARE_DEST_MAN_DIR=$(PREPARE_DEST_DIR)/man1
3737
prepare-base: prepare-host prepare-targets
3838

3939
prepare-everything: prepare-host prepare-targets
4040

4141
DEFAULT_PREPARE_DIR_CMD = umask 022 && mkdir -p
4242
DEFAULT_PREPARE_BIN_CMD = install -m755
4343
DEFAULT_PREPARE_LIB_CMD = install -m644
44-
DEFAULT_PREPARE_MAN_CMD = install -m644
44+
DEFAULT_PREPARE_MAN_CMD = install -m755
4545

4646
# On windows we install from stage3, but on unix only stage2
4747
# Because of the way these rules are organized, preparing from any
@@ -55,14 +55,14 @@ endif
5555
# Create a directory
5656
# $(1) is the directory
5757
define PREPARE_DIR
58-
@$(Q)$(call E, prepare: $(1))
58+
@$(Q)$(call E, install: $(1))
5959
$(Q)$(PREPARE_DIR_CMD) $(1)
6060
endef
6161

6262
# Copy an executable
6363
# $(1) is the filename/libname-glob
6464
define PREPARE_BIN
65-
@$(call E, prepare: $(PREPARE_DEST_BIN_DIR)/$(1))
65+
@$(call E, install: $(PREPARE_DEST_BIN_DIR)/$(1))
6666
$(Q)$(PREPARE_BIN_CMD) $(PREPARE_SOURCE_BIN_DIR)/$(1) $(PREPARE_DEST_BIN_DIR)/$(1)
6767
endef
6868

@@ -75,7 +75,7 @@ endef
7575
# problem. I'm sorry, just don't remove the $(nop), alright?
7676
define PREPARE_LIB
7777
$(nop)
78-
@$(call E, prepare: $(PREPARE_WORKING_DEST_LIB_DIR)/$(1))
78+
@$(call E, install: $(PREPARE_WORKING_DEST_LIB_DIR)/$(1))
7979
$(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1))))"; \
8080
MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)))),\
8181
$(wildcard $(PREPARE_WORKING_DEST_LIB_DIR)/$(1)))"; \
@@ -91,7 +91,7 @@ endef
9191
# Copy a man page
9292
# $(1) - source dir
9393
define PREPARE_MAN
94-
@$(call E, prepare: $(PREPARE_DEST_MAN_DIR)/$(1))
94+
@$(call E, install: $(PREPARE_DEST_MAN_DIR)/$(1))
9595
$(Q)$(PREPARE_MAN_CMD) $(PREPARE_SOURCE_MAN_DIR)/$(1) $(PREPARE_DEST_MAN_DIR)/$(1)
9696
endef
9797

@@ -106,7 +106,7 @@ prepare-host-tools: \
106106
$(foreach host,$(CFG_HOST),\
107107
prepare-host-tool-$(tool)-$(stage)-$(host))))
108108

109-
prepare-host-dirs: prepare-maybe-clean
109+
prepare-host-dirs:
110110
$(call PREPARE_DIR,$(PREPARE_DEST_BIN_DIR))
111111
$(call PREPARE_DIR,$(PREPARE_DEST_LIB_DIR))
112112
$(call PREPARE_DIR,$(PREPARE_DEST_MAN_DIR))
@@ -115,8 +115,7 @@ prepare-host-dirs: prepare-maybe-clean
115115
# $(2) is stage
116116
# $(3) is host
117117
define DEF_PREPARE_HOST_TOOL
118-
prepare-host-tool-$(1)-$(2)-$(3): prepare-maybe-clean \
119-
$$(foreach dep,$$(TOOL_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3)) \
118+
prepare-host-tool-$(1)-$(2)-$(3): $$(foreach dep,$$(TOOL_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3)) \
120119
$$(HBIN$(2)_H_$(3))/$(1)$$(X_$(3)) \
121120
prepare-host-dirs
122121
$$(if $$(findstring $(2), $$(PREPARE_STAGE)),\
@@ -141,8 +140,7 @@ $(foreach tool,$(PREPARE_TOOLS),\
141140
define DEF_PREPARE_HOST_LIB
142141
prepare-host-lib-$(1)-$(2)-$(3): PREPARE_WORKING_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_LIB_DIR)
143142
prepare-host-lib-$(1)-$(2)-$(3): PREPARE_WORKING_DEST_LIB_DIR=$$(PREPARE_DEST_LIB_DIR)
144-
prepare-host-lib-$(1)-$(2)-$(3): prepare-maybe-clean \
145-
$$(foreach dep,$$(RUST_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3))\
143+
prepare-host-lib-$(1)-$(2)-$(3): $$(foreach dep,$$(RUST_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3))\
146144
$$(HLIB$(2)_H_$(3))/stamp.$(1) \
147145
prepare-host-dirs
148146
$$(if $$(findstring $(2), $$(PREPARE_STAGE)),\
@@ -168,7 +166,7 @@ define DEF_PREPARE_TARGET_N
168166
# Rebind PREPARE_*_LIB_DIR to point to rustlib, then install the libs for the targets
169167
prepare-target-$(2)-host-$(3)-$(1): PREPARE_WORKING_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_LIB_DIR)/$$(CFG_RUSTLIBDIR)/$(2)/lib
170168
prepare-target-$(2)-host-$(3)-$(1): PREPARE_WORKING_DEST_LIB_DIR=$$(PREPARE_DEST_LIB_DIR)/$$(CFG_RUSTLIBDIR)/$(2)/lib
171-
prepare-target-$(2)-host-$(3)-$(1): prepare-maybe-clean \
169+
prepare-target-$(2)-host-$(3)-$(1): \
172170
$$(foreach crate,$$(TARGET_CRATES), \
173171
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(crate)) \
174172
$$(if $$(findstring $(2),$$(CFG_HOST)), \
@@ -196,9 +194,3 @@ $(foreach host,$(CFG_HOST),\
196194
$(foreach target,$(CFG_TARGET), \
197195
$(foreach stage,$(PREPARE_STAGES),\
198196
$(eval $(call DEF_PREPARE_TARGET_N,$(stage),$(target),$(host))))))
199-
200-
prepare-maybe-clean:
201-
$(if $(findstring true,$(PREPARE_CLEAN)),\
202-
@$(call E, cleaning destination $@),)
203-
$(if $(findstring true,$(PREPARE_CLEAN)),\
204-
$(Q)rm -rf $(PREPARE_DEST_DIR),)

‎branches/try2/src/doc/README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
document converter, is required to generate docs as HTML from Rust's
55
source code.
66

7-
[Node.js](http://nodejs.org/) is also required for generating HTML from
8-
the Markdown docs (reference manual, tutorials, etc.) distributed with
9-
this git repository.
10-
117
[po4a](http://po4a.alioth.debian.org/) is required for generating translated
128
docs from the master (English) docs.
139

@@ -30,8 +26,8 @@ rustdoc --output-dir html-doc/ --output-format html ../src/libstd/path.rs
3026

3127
# Additional notes
3228

33-
To generate an HTML version of a doc from Markdown without having Node.js
34-
installed, you can do something like:
29+
To generate an HTML version of a doc from Markdown manually, you can do
30+
something like:
3531

3632
~~~~
3733
pandoc --from=markdown --to=html5 --number-sections -o rust.html rust.md

0 commit comments

Comments
 (0)