Skip to content

Commit ea1430e

Browse files
borsbors
committed
---
yaml --- r: 145353 b: refs/heads/try2 c: cd2da7d h: refs/heads/master i: 145351: 38f4a26 v: v3
1 parent ac9ddae commit ea1430e

File tree

109 files changed

+651
-7812
lines changed

Some content is hidden

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

109 files changed

+651
-7812
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: 2ab278f130cb206ce9117145ddefbbb650ba8c68
8+
refs/heads/try2: cd2da7d5f37161ae1d8c3b1481c79275cf346999
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ endif
140140

141141
# version-string calculation
142142
CFG_GIT_DIR := $(CFG_SRC_DIR).git
143-
CFG_RELEASE = 0.8-pre
143+
CFG_RELEASE = 0.8
144144
CFG_VERSION = $(CFG_RELEASE)
145145
# windows exe's need numeric versions - don't use anything but
146146
# numbers and dots here
@@ -214,7 +214,6 @@ CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
214214
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
215215
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
216216
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
217-
CFG_LIBRUSTDOCNG_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc_ng)
218217
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
219218
CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
220219

@@ -224,7 +223,6 @@ LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
224223
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
225224
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
226225
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
227-
LIBRUSTDOCNG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc_ng)
228226
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
229227
LIBRUST_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rust)
230228
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
@@ -233,7 +231,6 @@ LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
233231
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
234232
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
235233
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
236-
LIBRUSTDOCNG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc_ng)
237234
LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
238235
LIBRUST_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rust)
239236

@@ -442,12 +439,10 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
442439
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
443440
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
444441
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
445-
$$(HBIN$(1)_H_$(3))/rustdoc_ng$$(X_$(3)) \
446442
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
447443
$$(HBIN$(1)_H_$(3))/rust$$(X_$(3)) \
448444
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
449445
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
450-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOCNG_$(3)) \
451446
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
452447
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUST_$(3)) \
453448
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
@@ -456,7 +451,6 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
456451
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
457452
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
458453
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
459-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOCNG_$(2)) \
460454
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \
461455
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUST_$(2))
462456

‎branches/try2/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ documentation.
1818
1919
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
2020
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
21-
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
21+
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe
2222

2323
### Linux / OS X
2424

@@ -33,9 +33,9 @@ documentation.
3333

3434
To build from the [tarball] do:
3535

36-
$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
37-
$ tar -xzf rust-0.7.tar.gz
38-
$ cd rust-0.7
36+
$ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz
37+
$ tar -xzf rust-0.8.tar.gz
38+
$ cd rust-0.8
3939

4040
Or to build from the [repo] do:
4141

@@ -60,8 +60,8 @@ documentation.
6060
4. Enjoy!
6161

6262
[repo]: https://github.com/mozilla/rust
63-
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
64-
[tutorial]: http://static.rust-lang.org/doc/0.7/tutorial.html
63+
[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz
64+
[tutorial]: http://static.rust-lang.org/doc/0.8/tutorial.html
6565

6666
## Notes
6767

‎branches/try2/RELEASES.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ Version 0.8 (October 2013)
143143
* The runtime uses jemalloc for allocations.
144144
* Segmented stacks are temporarily disabled as part of the transition to
145145
the new runtime. Stack overflows are possible!
146-
* A new documentation backend, rustdoc_ng, is available for use
146+
* A new documentation backend, rustdoc_ng, is available for use. It is
147+
still invoked through the normal `rustdoc` command.
147148

148149
Version 0.7 (July 2013)
149150
-----------------------

‎branches/try2/doc/po/ja/rust.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
1010
"PO-Revision-Date: 2013-08-05 19:40+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/try2/doc/po/ja/rustpkg.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-07-30 07:07+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/try2/doc/po/ja/tutorial-borrowed-ptr.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/try2/doc/po/ja/tutorial-container.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-05 19:40+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/try2/doc/po/ja/tutorial-ffi.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-10 07:44+0900\n"
1010
"PO-Revision-Date: 2013-07-22 23:37+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/try2/doc/po/ja/tutorial-macros.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-07-28 20:32+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/try2/doc/po/ja/tutorial-tasks.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-08 22:27+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/try2/doc/po/ja/tutorial.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
1010
"PO-Revision-Date: 2013-08-08 22:27+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/try2/doc/po/rust.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

‎branches/try2/doc/po/rustpkg.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-07-30 07:07+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

‎branches/try2/doc/po/tutorial-borrowed-ptr.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

‎branches/try2/doc/po/tutorial-container.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-05 19:40+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

‎branches/try2/doc/po/tutorial-ffi.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-10 07:44+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

‎branches/try2/doc/po/tutorial-macros.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

‎branches/try2/doc/po/tutorial-tasks.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-08 22:27+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

‎branches/try2/doc/po/tutorial.md.pot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -271,8 +271,8 @@ msgstr ""
271271
#. type: Plain text
272272
#: doc/tutorial.md:108
273273
msgid ""
274-
"~~~~ {.notrust} $ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz $ "
275-
"tar -xzf rust-0.7.tar.gz $ cd rust-0.7 $ ./configure $ make && make install "
274+
"~~~~ {.notrust} $ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz $ "
275+
"tar -xzf rust-0.8.tar.gz $ cd rust-0.8 $ ./configure $ make && make install "
276276
"~~~~"
277277
msgstr ""
278278

@@ -298,8 +298,8 @@ msgstr ""
298298
#. type: Plain text
299299
#: doc/tutorial.md:123
300300
msgid ""
301-
"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
302-
"http://static.rust-lang.org/dist/rust-0.7-install.exe"
301+
"[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz [win-exe]: "
302+
"http://static.rust-lang.org/dist/rust-0.8-install.exe"
303303
msgstr ""
304304

305305
#. type: Plain text

‎branches/try2/doc/tutorial.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ If you've fulfilled those prerequisites, something along these lines
9898
should work.
9999

100100
~~~~ {.notrust}
101-
$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
102-
$ tar -xzf rust-0.7.tar.gz
103-
$ cd rust-0.7
101+
$ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz
102+
$ tar -xzf rust-0.8.tar.gz
103+
$ cd rust-0.8
104104
$ ./configure
105105
$ make && make install
106106
~~~~
@@ -117,8 +117,8 @@ API-documentation tool; `rustpkg`, the Rust package manager;
117117
`rusti`, the Rust REPL; and `rust`, a tool which acts both as a unified
118118
interface for them, and for a few common command line scenarios.
119119

120-
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
121-
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
120+
[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz
121+
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe
122122

123123
## Compiling your first program
124124

‎branches/try2/mk/clean.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,10 @@ clean$(1)_H_$(2):
6868
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustpkg$(X_$(2))
6969
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X_$(2))
7070
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X_$(2))
71-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc_ng$(X_$(2))
7271
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X_$(2))
7372
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X_$(2))
7473
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
7574
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC_$(2))
76-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOCNG_$(2))
7775
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME_$(2))
7876
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB_$(2))
7977
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_EXTRALIB_$(2))
@@ -87,7 +85,6 @@ clean$(1)_H_$(2):
8785
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
8886
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
8987
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB_$(2))
90-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOCNG_GLOB_$(2))
9188
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB_$(2))
9289
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUST_GLOB_$(2))
9390
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM_$(2))
@@ -106,12 +103,10 @@ clean$(1)_T_$(2)_H_$(3):
106103
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X_$(2))
107104
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X_$(2))
108105
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X_$(2))
109-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc_ng$(X_$(2))
110106
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rusti$(X_$(2))
111107
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rust$(X_$(2))
112108
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))
113109
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
114-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOCNG_$(2))
115110
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2))
116111
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
117112
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
@@ -125,7 +120,6 @@ clean$(1)_T_$(2)_H_$(3):
125120
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
126121
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
127122
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
128-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOCNG_GLOB_$(2))
129123
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTI_GLOB_$(2))
130124
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUST_GLOB_$(2))
131125
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))

‎branches/try2/mk/dist.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ PKG_FILES := \
3939
libsyntax \
4040
rt \
4141
librustdoc \
42-
rustdoc_ng \
4342
rustllvm \
4443
snapshots.txt \
4544
test) \

‎branches/try2/mk/docs.mk

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -213,40 +213,21 @@ else
213213

214214
# The rustdoc executable
215215
RUSTDOC = $(HBIN2_H_$(CFG_BUILD_TRIPLE))/rustdoc$(X_$(CFG_BUILD_TRIPLE))
216-
RUSTDOC_NG = $(HBIN2_H_$(CFG_BUILD_TRIPLE))/rustdoc_ng$(X_$(CFG_BUILD_TRIPLE))
217216

218217
# The library documenting macro
219-
# $(1) - The output directory
218+
# $(1) - The crate name (std/extra)
220219
# $(2) - The crate file
221-
# $(3) - The crate soruce files
220+
# $(3) - The relevant host build triple (to depend on libstd)
222221
define libdoc
223-
doc/$(1)/index.html: $(2) $(3) $$(RUSTDOC) doc/$(1)/rust.css
222+
doc/$(1)/index.html: $$(RUSTDOC) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3))
224223
@$$(call E, rustdoc: $$@)
225-
$(Q)$(RUSTDOC) $(2) --output-dir=doc/$(1)
226-
227-
doc/$(1)/rust.css: rust.css
228-
@$$(call E, cp: $$@)
229-
$(Q)cp $$< $$@
224+
$(Q)$(RUSTDOC) html $(2)
230225

231226
DOCS += doc/$(1)/index.html
232227
endef
233228

234-
# The "next generation" library documenting macro
235-
# $(1) - The crate name (std/extra)
236-
# $(2) - The crate file
237-
# $(3) - The relevant host build triple (to depend on libstd)
238-
define libdocng
239-
doc/ng/$(1)/index.html: $$(RUSTDOC_NG) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3))
240-
@$$(call E, rustdoc_ng: $$@)
241-
$(Q)$(RUSTDOC_NG) html $(2) -o doc/ng
242-
243-
DOCS += doc/ng/$(1)/index.html
244-
endef
245-
246-
$(eval $(call libdoc,std,$(STDLIB_CRATE),$(STDLIB_INPUTS)))
247-
$(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(EXTRALIB_INPUTS)))
248-
$(eval $(call libdocng,std,$(STDLIB_CRATE),$(CFG_BUILD_TRIPLE)))
249-
$(eval $(call libdocng,extra,$(EXTRALIB_CRATE),$(CFG_BUILD_TRIPLE)))
229+
$(eval $(call libdoc,std,$(STDLIB_CRATE),$(CFG_BUILD_TRIPLE)))
230+
$(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(CFG_BUILD_TRIPLE)))
250231
endif
251232

252233

0 commit comments

Comments
 (0)