Skip to content

Commit d4148d2

Browse files
borsbors
committed
---
yaml --- r: 172287 b: refs/heads/master c: c0ca57a h: refs/heads/master i: 172285: 35d37a2 172283: cbfd986 172279: a6999af 172271: dc4e048 172255: 292b9e4 172223: 19a6f6c 172159: 461b8c4 172031: fb39452 v: v3
1 parent 872a55b commit d4148d2

File tree

1,092 files changed

+15396
-14952
lines changed

Some content is hidden

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

1,092 files changed

+15396
-14952
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: c163effc2b4704e3ec9d0011c90a8bd0bab4cb6c
2+
refs/heads/master: c0ca57a6fb176d8082eac0ba1de4690f4c0eb0bb
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
55
refs/heads/try: 705b92bdfe33d0d6febdf945340262514e1b3b5c

‎trunk/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ documentation.
66
## Quick Start
77

88
1. Download a [binary installer][installer] for your platform.
9-
2. Read the [guide].
9+
2. Read [The Rust Programming Language][trpl].
1010
3. Enjoy!
1111

1212
> ***Note:*** Windows users can read the detailed
1313
> [using Rust on Windows][win-wiki] notes on the wiki.
1414
1515
[installer]: http://www.rust-lang.org/install.html
16-
[guide]: http://doc.rust-lang.org/guide.html
16+
[trpl]: http://doc.rust-lang.org/book/index.html
1717
[win-wiki]: https://github.com/rust-lang/rust/wiki/Using-Rust-on-Windows
1818

1919
## Building from Source
@@ -53,7 +53,7 @@ documentation.
5353
When complete, `make install` will place several programs into
5454
`/usr/local/bin`: `rustc`, the Rust compiler, and `rustdoc`, the
5555
API-documentation tool.
56-
3. Read the [guide].
56+
3. Read [The Rust Programming Language][trpl].
5757
4. Enjoy!
5858

5959
### Building on Windows
@@ -75,7 +75,7 @@ To easily build on windows we can use [MSYS2](http://sourceforge.net/projects/ms
7575

7676
[repo]: https://github.com/rust-lang/rust
7777
[tarball]: https://static.rust-lang.org/dist/rust-nightly.tar.gz
78-
[guide]: http://doc.rust-lang.org/guide.html
78+
[trpl]: http://doc.rust-lang.org/book/index.html
7979

8080
## Notes
8181

‎trunk/RELEASES.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ Version 1.0.0-alpha (January 2015)
1919
distribution into the Cargo ecosystem so they can evolve
2020
separately and don't need to be stabilized as quickly, including
2121
'time', 'getopts', 'num', 'regex', and 'term'.
22-
* Documentation continues to be expanded with more guides, more
23-
API coverage and more examples.
22+
* Documentation continues to be expanded with more API coverage, more
23+
examples, and more in-depth explanations. The guides have been
24+
consolidated into [The Rust Programming Language][trpl].
25+
* "[Rust By Example][rbe]" is now maintained by the Rust team.
2426
* All official Rust binary installers now come with [Cargo], the
2527
Rust package manager.
2628

@@ -179,6 +181,8 @@ Version 1.0.0-alpha (January 2015)
179181
[objsafe]: https://github.com/rust-lang/rfcs/blob/master/text/0255-object-safety.md
180182
[assoc]: https://github.com/rust-lang/rfcs/blob/master/text/0195-associated-items.md
181183
[ints]: https://github.com/rust-lang/rfcs/pull/544#issuecomment-68760871
184+
[trpl]: http://doc.rust-lang.org/book/index.html
185+
[rbe]: http://rustbyexample.com/
182186

183187
Version 0.12.0 (October 2014)
184188
-----------------------------

‎trunk/configure

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,18 +1055,6 @@ do
10551055
make_dir $h/test/debuginfo-gdb
10561056
make_dir $h/test/debuginfo-lldb
10571057
make_dir $h/test/codegen
1058-
make_dir $h/test/doc-guide
1059-
make_dir $h/test/doc-guide-ffi
1060-
make_dir $h/test/doc-guide-runtime
1061-
make_dir $h/test/doc-guide-macros
1062-
make_dir $h/test/doc-guide-ownership
1063-
make_dir $h/test/doc-guide-pointers
1064-
make_dir $h/test/doc-guide-container
1065-
make_dir $h/test/doc-guide-tasks
1066-
make_dir $h/test/doc-guide-plugin
1067-
make_dir $h/test/doc-guide-crates
1068-
make_dir $h/test/doc-guide-error-handling
1069-
make_dir $h/test/doc-reference
10701058
done
10711059

10721060
# Configure submodules

‎trunk/mk/cfg/aarch64-apple-ios.mk

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# aarch64-apple-ios configuration
2+
CFG_SDK_NAME_aarch64-apple-ios := iphoneos
3+
CFG_SDK_ARCHS_aarch64-apple-ios := arm64
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOS_SDK_aarch64-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
6+
CFG_IOS_SDK_FLAGS_aarch64-apple-ios := -target aarch64-apple-darwin -isysroot $(CFG_IOS_SDK_aarch64-apple-ios) -mios-version-min=7.0 -arch arm64
7+
CC_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
8+
CXX_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
9+
CPP_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
10+
AR_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
11+
endif
12+
CFG_LIB_NAME_aarch64-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_aarch64-apple-ios = lib$(1)-*.a
14+
CFG_LIB_SKIP_INSTALL_aarch64-apple-ios = 1 #lib$(1)-*.a
15+
CFG_STATIC_LIB_NAME_aarch64-apple-ios=lib$(1).a
16+
CFG_LIB_DSYM_GLOB_aarch64-apple-ios = lib$(1)-*.a.dSYM
17+
CFG_CFLAGS_aarch64-apple-ios := $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios)
18+
CFG_JEMALLOC_CFLAGS_aarch64-apple-ios := $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios)
19+
CFG_GCCISH_CFLAGS_aarch64-apple-ios := -Wall -Werror -fPIC $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios)
20+
CFG_GCCISH_CXXFLAGS_aarch64-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios) -I$(CFG_IOS_SDK_aarch64-apple-ios)/usr/include/c++/4.2.1
21+
CFG_GCCISH_LINK_FLAGS_aarch64-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_aarch64-apple-ios) -Wl,-no_compact_unwind
22+
CFG_GCCISH_DEF_FLAG_aarch64-apple-ios := -Wl,-exported_symbols_list,
23+
CFG_GCCISH_PRE_LIB_FLAGS_aarch64-apple-ios :=
24+
CFG_GCCISH_POST_LIB_FLAGS_aarch64-apple-ios :=
25+
CFG_DEF_SUFFIX_aarch64-apple-ios := .darwin.def
26+
CFG_LLC_FLAGS_aarch64-apple-ios := -mattr=+neon,+cyclone,+fp-armv8
27+
CFG_INSTALL_NAME_aarch64-apple-ios = -Wl,-install_name,@rpath/$(1)
28+
CFG_LIBUV_LINK_FLAGS_aarch64-apple-ios =
29+
CFG_EXE_SUFFIX_aarch64-apple-ios :=
30+
CFG_WINDOWSY_aarch64-apple-ios :=
31+
CFG_UNIXY_aarch64-apple-ios := 1
32+
CFG_PATH_MUNGE_aarch64-apple-ios := true
33+
CFG_LDPATH_aarch64-apple-ios :=
34+
CFG_RUN_aarch64-apple-ios = $(2)
35+
CFG_RUN_TARG_aarch64-apple-ios = $(call CFG_RUN_aarch64-apple-ios,,$(2))
36+
CFG_GNU_TRIPLE_aarch64-apple-ios := aarch64-apple-ios

‎trunk/mk/cfg/arm-apple-ios.mk

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎trunk/mk/cfg/armv7-apple-ios.mk

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# armv7-apple-ios configuration
2+
CFG_SDK_NAME_armv7-apple-ios := iphoneos
3+
CFG_SDK_ARCHS_armv7-apple-ios := armv7
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOS_SDK_armv7-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
6+
CFG_IOS_SDK_FLAGS_armv7-apple-ios := -target armv7-apple-ios -isysroot $(CFG_IOS_SDK_armv7-apple-ios) -mios-version-min=7.0
7+
CC_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
8+
CXX_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
9+
CPP_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
10+
AR_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
11+
endif
12+
CFG_LIB_NAME_armv7-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_armv7-apple-ios = lib$(1)-*.a
14+
CFG_LIB_SKIP_INSTALL_armv7-apple-ios = 1 #lib$(1)-*.a
15+
CFG_STATIC_LIB_NAME_armv7-apple-ios=lib$(1).a
16+
CFG_LIB_DSYM_GLOB_armv7-apple-ios = lib$(1)-*.a.dSYM
17+
CFG_JEMALLOC_CFLAGS_armv7-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_SDK_FLAGS_armv7-apple-ios)
18+
CFG_GCCISH_CFLAGS_armv7-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7-apple-ios) -mfpu=vfp3 -arch armv7
19+
CFG_GCCISH_CXXFLAGS_armv7-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_armv7-apple-ios) -I$(CFG_IOS_SDK_armv7-apple-ios)/usr/include/c++/4.2.1
20+
CFG_GCCISH_LINK_FLAGS_armv7-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_armv7-apple-ios) -Wl,-no_compact_unwind
21+
CFG_GCCISH_DEF_FLAG_armv7-apple-ios := -Wl,-exported_symbols_list,
22+
CFG_GCCISH_PRE_LIB_FLAGS_armv7-apple-ios :=
23+
CFG_GCCISH_POST_LIB_FLAGS_armv7-apple-ios :=
24+
CFG_DEF_SUFFIX_armv7-apple-ios := .darwin.def
25+
CFG_LLC_FLAGS_armv7-apple-ios := -mattr=+vfp3,+v7,+neon -march=arm
26+
CFG_INSTALL_NAME_armv7-apple-ios = -Wl,-install_name,@rpath/$(1)
27+
CFG_EXE_SUFFIX_armv7-apple-ios :=
28+
CFG_WINDOWSY_armv7-apple-ios :=
29+
CFG_UNIXY_armv7-apple-ios := 1
30+
CFG_PATH_MUNGE_armv7-apple-ios := true
31+
CFG_LDPATH_armv7-apple-ios :=
32+
CFG_RUN_armv7-apple-ios = $(2)
33+
CFG_RUN_TARG_armv7-apple-ios = $(call CFG_RUN_armv7-apple-ios,,$(2))
34+
CFG_GNU_TRIPLE_armv7-apple-ios := armv7-apple-ios

‎trunk/mk/cfg/armv7s-apple-ios.mk

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# armv7s-apple-ios configuration
2+
CFG_SDK_NAME_armv7s-apple-ios := iphoneos
3+
CFG_SDK_ARCHS_armv7s-apple-ios := armv7s
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOS_SDK_armv7s-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
6+
CFG_IOS_SDK_FLAGS_armv7s-apple-ios := -target armv7s-apple-ios -isysroot $(CFG_IOS_SDK_armv7s-apple-ios) -mios-version-min=7.0
7+
CC_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
8+
CXX_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
9+
CPP_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
10+
AR_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
11+
endif
12+
CFG_LIB_NAME_armv7s-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_armv7s-apple-ios = lib$(1)-*.a
14+
CFG_LIB_SKIP_INSTALL_armv7s-apple-ios = 1 #lib$(1)-*.a
15+
CFG_STATIC_LIB_NAME_armv7s-apple-ios=lib$(1).a
16+
CFG_LIB_DSYM_GLOB_armv7s-apple-ios = lib$(1)-*.a.dSYM
17+
CFG_JEMALLOC_CFLAGS_armv7s-apple-ios := -arch armv7s -mfpu=vfp4 $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios)
18+
CFG_GCCISH_CFLAGS_armv7s-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -mfpu=vfp4 -arch armv7s
19+
CFG_GCCISH_CXXFLAGS_armv7s-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -I$(CFG_IOS_SDK_armv7s-apple-ios)/usr/include/c++/4.2.1
20+
CFG_GCCISH_LINK_FLAGS_armv7s-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_armv7s-apple-ios) -Wl,-no_compact_unwind
21+
CFG_GCCISH_DEF_FLAG_armv7s-apple-ios := -Wl,-exported_symbols_list,
22+
CFG_GCCISH_PRE_LIB_FLAGS_armv7s-apple-ios :=
23+
CFG_GCCISH_POST_LIB_FLAGS_armv7s-apple-ios :=
24+
CFG_DEF_SUFFIX_armv7s-apple-ios := .darwin.def
25+
CFG_LLC_FLAGS_armv7s-apple-ios := -mattr=+vfp4,+v7,+neon
26+
CFG_INSTALL_NAME_armv7s-apple-ios = -Wl,-install_name,@rpath/$(1)
27+
CFG_EXE_SUFFIX_armv7s-apple-ios :=
28+
CFG_WINDOWSY_armv7s-apple-ios :=
29+
CFG_UNIXY_armv7s-apple-ios := 1
30+
CFG_PATH_MUNGE_armv7s-apple-ios := true
31+
CFG_LDPATH_armv7s-apple-ios :=
32+
CFG_RUN_armv7s-apple-ios = $(2)
33+
CFG_RUN_TARG_armv7s-apple-ios = $(call CFG_RUN_armv7s-apple-ios,,$(2))
34+
CFG_GNU_TRIPLE_armv7s-apple-ios := armv7s-apple-ios

‎trunk/mk/cfg/i386-apple-ios.mk

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# i386-apple-ios configuration
2-
CFG_SDK_NAME_i386-apple-ios = iphonesimulator
3-
CFG_SDK_ARCHS_i386-apple-ios = i386
2+
CFG_SDK_NAME_i386-apple-ios := iphonesimulator
3+
CFG_SDK_ARCHS_i386-apple-ios := i386
44
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5-
CFG_IOSSIM_SDK = $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
6-
CFG_IOSSIM_FLAGS = -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK) -mios-simulator-version-min=7.0
5+
CFG_IOSSIM_SDK_i386-apple-ios := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
6+
CFG_IOSSIM_FLAGS_i386-apple-ios := -m32 -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK_i386-apple-ios) -mios-simulator-version-min=7.0
77
CC_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
88
CXX_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
99
CPP_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
@@ -13,21 +13,21 @@ CFG_LIB_NAME_i386-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
1414
CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
1515
CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
16-
CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
17-
CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
18-
CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
19-
CFG_GCCISH_DEF_FLAG_i386-apple-ios = -Wl,-exported_symbols_list,
20-
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios =
21-
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios =
22-
CFG_DEF_SUFFIX_i386-apple-ios = .darwin.def
16+
CFG_GCCISH_CFLAGS_i386-apple-ios := -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS_i386-apple-ios)
17+
CFG_GCCISH_CXXFLAGS_i386-apple-ios := -fno-rtti $(CFG_IOSSIM_FLAGS_i386-apple-ios) -I$(CFG_IOSSIM_SDK_i386-apple-ios)/usr/include/c++/4.2.1
18+
CFG_GCCISH_LINK_FLAGS_i386-apple-ios := -lpthread -m32 -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK_i386-apple-ios)
19+
CFG_GCCISH_DEF_FLAG_i386-apple-ios := -Wl,-exported_symbols_list,
20+
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios :=
21+
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios :=
22+
CFG_DEF_SUFFIX_i386-apple-ios := .darwin.def
2323
CFG_LLC_FLAGS_i386-apple-ios =
2424
CFG_INSTALL_NAME_i386-apple-ios = -Wl,-install_name,@rpath/$(1)
25-
CFG_EXE_SUFFIX_i386-apple-ios =
26-
CFG_WINDOWSY_i386-apple-ios =
27-
CFG_UNIXY_i386-apple-ios = 1
28-
CFG_PATH_MUNGE_i386-apple-ios = true
25+
CFG_EXE_SUFFIX_i386-apple-ios :=
26+
CFG_WINDOWSY_i386-apple-ios :=
27+
CFG_UNIXY_i386-apple-ios := 1
28+
CFG_PATH_MUNGE_i386-apple-ios = :true
2929
CFG_LDPATH_i386-apple-ios =
3030
CFG_RUN_i386-apple-ios = $(2)
3131
CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
32-
CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS) -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
32+
CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS_i386-apple-ios) -target i386-apple-ios #-Wl,-syslibroot $(CFG_IOSSIM_SDK_i386-apple-ios) -Wl,-no_compact_unwind
3333
CFG_GNU_TRIPLE_i386-apple-ios := i386-apple-ios

‎trunk/mk/cfg/x86_64-apple-ios.mk

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# x86_64-apple-ios configuration
2+
CFG_SDK_NAME_x86_64-apple-ios := iphonesimulator
3+
CFG_SDK_ARCHS_x86_64-apple-ios := x86_64
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOSSIM_SDK_x86_64-apple-ios := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
6+
CFG_IOSSIM_FLAGS_x86_64-apple-ios := -m64 -target x86_64-apple-ios -isysroot $(CFG_IOSSIM_SDK_x86_64-apple-ios) -mios-simulator-version-min=7.0
7+
CC_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
8+
CXX_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
9+
CPP_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
10+
AR_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
11+
endif
12+
CFG_LIB_NAME_x86_64-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_x86_64-apple-ios = lib$(1)-*.a
14+
CFG_LIB_SKIP_INSTALL_x86_64-apple-ios = 1 #lib$(1)-*.a
15+
CFG_STATIC_LIB_NAME_x86_64-apple-ios=lib$(1).a
16+
CFG_LIB_DSYM_GLOB_x86_64-apple-ios = lib$(1)-*.a.dSYM
17+
CFG_CFLAGS_x86_64-apple-ios := $(CFG_IOSSIM_FLAGS_x86_64-apple-ios)
18+
CFG_JEMALLOC_CFLAGS_x86_64-apple-ios := $(CFG_IOSSIM_FLAGS_x86_64-apple-ios)
19+
CFG_GCCISH_CFLAGS_x86_64-apple-ios := -Wall -Werror -fPIC $(CFG_IOSSIM_FLAGS_x86_64-apple-ios)
20+
CFG_GCCISH_CXXFLAGS_x86_64-apple-ios := -fno-rtti $(CFG_IOSSIM_FLAGS_x86_64-apple-ios) -I$(CFG_IOSSIM_SDK_x86_64-apple-ios)/usr/include/c++/4.2.1
21+
CFG_GCCISH_LINK_FLAGS_x86_64-apple-ios := -lpthread -Wl,-no_compact_unwind -m64 -Wl,-syslibroot $(CFG_IOSSIM_SDK_x86_64-apple-ios)
22+
CFG_GCCISH_DEF_FLAG_x86_64-apple-ios := -Wl,-exported_symbols_list,
23+
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-apple-ios :=
24+
CFG_GCCISH_POST_LIB_FLAGS_x86_64-apple-ios :=
25+
CFG_DEF_SUFFIX_x86_64-apple-ios := .darwin.def
26+
CFG_LLC_FLAGS_x86_64-apple-ios :=
27+
CFG_INSTALL_NAME_x86_64-apple-ios = -Wl,-install_name,@rpath/$(1)
28+
CFG_LIBUV_LINK_FLAGS_x86_64-apple-ios :=
29+
CFG_EXE_SUFFIX_x86_64-apple-ios :=
30+
CFG_WINDOWSY_x86_64-apple-ios :=
31+
CFG_UNIXY_x86_64-apple-ios := 1
32+
CFG_PATH_MUNGE_x86_64-apple-ios := true
33+
CFG_LDPATH_x86_64-apple-ios :=
34+
CFG_RUN_x86_64-apple-ios = $(2)
35+
CFG_RUN_TARG_x86_64-apple-ios = $(call CFG_RUN_x86_64-apple-ios,,$(2))
36+
CFG_GNU_TRIPLE_i386-apple-ios := x86_64-apple-ios

‎trunk/mk/crates.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
5757
rustc_trans rustc_back rustc_llvm
5858
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
5959
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
60-
TOOLS := compiletest rustdoc rustc
60+
TOOLS := compiletest rustdoc rustc rustbook
6161

6262
DEPS_core :=
6363
DEPS_libc := core
@@ -99,9 +99,11 @@ DEPS_fmt_macros = std
9999
TOOL_DEPS_compiletest := test getopts
100100
TOOL_DEPS_rustdoc := rustdoc
101101
TOOL_DEPS_rustc := rustc_driver
102+
TOOL_DEPS_rustbook := std regex rustdoc
102103
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
103104
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
104105
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
106+
TOOL_SOURCE_rustbook := $(S)src/rustbook/main.rs
105107

106108
ONLY_RLIB_core := 1
107109
ONLY_RLIB_libc := 1

‎trunk/mk/dist.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ PKG_FILES := \
5959
rustllvm \
6060
snapshots.txt \
6161
rust-installer \
62+
rustbook \
6263
test) \
6364
$(PKG_GITMODULES) \
6465
$(filter-out config.stamp, \

‎trunk/mk/docs.mk

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# except according to those terms.
1010

1111
######################################################################
12-
# The various pieces of standalone documentation: guides, manual, etc
12+
# The various pieces of standalone documentation.
1313
#
1414
# The DOCS variable is their names (with no file extension).
1515
#
@@ -25,13 +25,17 @@
2525
# L10N_LANGS are the languages for which the docs have been
2626
# translated.
2727
######################################################################
28-
DOCS := index intro tutorial guide guide-ffi guide-macros guide-ownership \
29-
guide-tasks guide-container guide-pointers guide-testing \
30-
guide-plugin guide-crates complement-bugreport guide-error-handling \
31-
complement-lang-faq complement-design-faq complement-project-faq \
32-
rustdoc guide-unsafe guide-strings reference
28+
DOCS := index intro tutorial complement-bugreport \
29+
complement-lang-faq complement-design-faq complement-project-faq \
30+
rustdoc reference
3331

34-
PDF_DOCS := guide reference
32+
# Legacy guides, preserved for a while to reduce the number of 404s
33+
DOCS += guide-crates guide-error-handling guide-ffi guide-macros guide \
34+
guide-ownership guide-plugins guide-pointers guide-strings guide-tasks \
35+
guide-testing
36+
37+
38+
PDF_DOCS := reference
3539

3640
RUSTDOC_DEPS_reference := doc/full-toc.inc
3741
RUSTDOC_FLAGS_reference := --html-in-header=doc/full-toc.inc
@@ -61,9 +65,15 @@ RUSTDOC_EXE = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
6165
# ./configure
6266
RUSTDOC = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTDOC_EXE)
6367

68+
# The rustbook executable...
69+
RUSTBOOK_EXE = $(HBIN2_H_$(CFG_BUILD))/rustbook$(X_$(CFG_BUILD))
70+
# ...with rpath included in case --disable-rpath was provided to
71+
# ./configure
72+
RUSTBOOK = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTBOOK_EXE)
73+
6474
D := $(S)src/doc
6575

66-
DOC_TARGETS :=
76+
DOC_TARGETS := trpl
6777
COMPILER_DOC_TARGETS :=
6878
DOC_L10N_TARGETS :=
6979

@@ -270,3 +280,9 @@ endif
270280

271281
docs: $(DOC_TARGETS)
272282
compiler-docs: $(COMPILER_DOC_TARGETS)
283+
284+
trpl: doc/book/index.html
285+
286+
doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
287+
$(Q)rm -rf doc/book
288+
$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book

0 commit comments

Comments
 (0)