Skip to content

Commit a3c2c98

Browse files
borsbors
committed
---
yaml --- r: 97711 b: refs/heads/snap-stage3 c: f60d937 h: refs/heads/master i: 97709: a40576d 97707: e49be6f 97703: b1f5ba2 97695: a62eba4 v: v3
1 parent e965091 commit a3c2c98

File tree

100 files changed

+4534
-13763
lines changed

Some content is hidden

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

100 files changed

+4534
-13763
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f40d5b1050fc727170d79d42ef6cbf0c6b826bfd
4+
refs/heads/snap-stage3: f60d937dd9046a522e1b50ae666e5dd6c0a38de2
55
refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/Makefile.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,8 @@ export CFG_ENABLE_MINGW_CROSS
417417
export CFG_PREFIX
418418
export CFG_LIBDIR
419419
export CFG_RUSTLIBDIR
420-
export LIBDIR_RELATIVE
420+
export CFG_LIBDIR_RELATIVE
421+
export CFG_DISABLE_INJECT_STD_VERSION
421422

422423
######################################################################
423424
# Subprograms
@@ -435,7 +436,7 @@ define SREQ
435436
# Destinations of artifacts for the host compiler
436437
HROOT$(1)_H_$(3) = $(3)/stage$(1)
437438
HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
438-
HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(LIBDIR_RELATIVE)
439+
HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
439440

440441
# Destinations of artifacts for target architectures
441442
TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLIBDIR)/$(2)

‎branches/snap-stage3/configure

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ opt clang 0 "prefer clang to gcc for building the runtime"
381381
opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
382382
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
383383
opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-patched kernels)"
384+
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
384385
valopt prefix "/usr/local" "set installation prefix"
385386
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
386387
valopt llvm-root "" "set LLVM root"
@@ -401,13 +402,13 @@ valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
401402
# On windows we just store the libraries in the bin directory because
402403
# there's no rpath
403404
# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
404-
LIBDIR_RELATIVE=lib
405+
CFG_LIBDIR_RELATIVE=lib
405406
if [ "$CFG_OSTYPE" = "pc-mingw32" ]
406407
then
407-
LIBDIR_RELATIVE=bin
408+
CFG_LIBDIR_RELATIVE=bin
408409
fi
409410

410-
valopt libdir "${CFG_PREFIX}/${LIBDIR_RELATIVE}" "install libraries"
411+
valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
411412
valopt rustlibdir "rustlib" "subdirectory name for rustc's libraries"
412413

413414
# Validate Options
@@ -771,16 +772,16 @@ do
771772
make_dir $h/stage$i/bin
772773

773774
# host lib dir
774-
make_dir $h/stage$i/$LIBDIR_RELATIVE
775+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE
775776

776777
# host test dir
777778
make_dir $h/stage$i/test
778779

779780
# target bin dir
780-
make_dir $h/stage$i/$LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/bin
781+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/bin
781782

782783
# target lib dir
783-
make_dir $h/stage$i/$LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/lib
784+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/lib
784785
done
785786
done
786787

@@ -1037,11 +1038,12 @@ putvar CFG_TARGET
10371038
putvar CFG_C_COMPILER
10381039
putvar CFG_LIBDIR
10391040
putvar CFG_RUSTLIBDIR
1040-
putvar LIBDIR_RELATIVE
1041+
putvar CFG_LIBDIR_RELATIVE
10411042
putvar CFG_DISABLE_MANAGE_SUBMODULES
10421043
putvar CFG_ANDROID_CROSS_PATH
10431044
putvar CFG_MINGW32_CROSS_PATH
10441045
putvar CFG_MANDIR
1046+
putvar CFG_DISABLE_INJECT_STD_VERSION
10451047

10461048
# Avoid spurious warnings from clang by feeding it original source on
10471049
# ccache-miss rather than preprocessed input.

‎branches/snap-stage3/doc/README.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ source code.
88
the Markdown docs (reference manual, tutorials, etc.) distributed with
99
this git repository.
1010

11+
[po4a](http://po4a.alioth.debian.org/) is required for generating translated
12+
docs from the master (English) docs.
13+
14+
[GNU gettext](http://www.gnu.org/software/gettext/) is required for managing
15+
the translation data.
16+
1117
# Building
1218

1319
To generate all the docs, just run `make docs` from the root of the repository.
@@ -38,3 +44,43 @@ http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown
3844

3945
A nice quick reference (for non-pandoc markdown) is at:
4046
http://kramdown.rubyforge.org/quickref.html
47+
48+
# Notes for translators
49+
50+
Notice: The procedure described below is a work in progress. We are working on
51+
translation system but the procedure contains some manual operations for now.
52+
53+
To start the translation for a new language, see po4a.conf at first.
54+
55+
To generate .pot and .po files, do something like:
56+
57+
~~~~
58+
po4a --copyright-holder="The Rust Project Developers" \
59+
--package-name="Rust" \
60+
--package-version="0.10-pre" \
61+
-M UTF-8 -L UTF-8 \
62+
po4a.conf
63+
~~~~
64+
65+
(the version number must be changed if it is not 0.10-pre now.)
66+
67+
Now you can translate documents with .po files, commonly used with gettext. If
68+
you are not familiar with gettext-based translation, please read the online
69+
manual linked from http://www.gnu.org/software/gettext/ . We use UTF-8 as the
70+
file encoding of .po files.
71+
72+
When you want to make a commit, do the command below before staging your
73+
change:
74+
75+
~~~~
76+
for f in doc/po/**/*.po; do
77+
msgattrib --translated $f -o $f.strip
78+
if [ -e $f.strip ]; then
79+
mv $f.strip $f
80+
else
81+
rm $f
82+
fi
83+
done
84+
~~~~
85+
86+
This removes untranslated entries from .po files to save disk space.

‎branches/snap-stage3/doc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[Macros](guide-macros.html)
2020
[Packaging](guide-rustpkg.html)
2121
[Testing](guide-testing.html)
22-
[Conditions](guide-conditions.html)
22+
[Conditions](guide-conditions.html)
2323
[Rust's Runtime](guide-runtime.html)
2424

2525
# Libraries

‎branches/snap-stage3/doc/po/ja/complement-cheatsheet.md.po

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
# Japanese translations for Rust package
2+
# Copyright (C) 2014 The Rust Project Developers
3+
# This file is distributed under the same license as the Rust package.
4+
# Automatically generated, 2014.
5+
#
6+
msgid ""
7+
msgstr ""
8+
"Project-Id-Version: Rust 0.10-pre\n"
9+
"POT-Creation-Date: 2014-01-13 12:01+0900\n"
10+
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
11+
"Last-Translator: Automatically generated\n"
12+
"Language-Team: none\n"
13+
"Language: ja\n"
14+
"MIME-Version: 1.0\n"
15+
"Content-Type: text/plain; charset=UTF-8\n"
16+
"Content-Transfer-Encoding: 8bit\n"
17+
"Plural-Forms: nplurals=1; plural=0;\n"
18+
19+
#. type: Plain text
20+
#: doc/complement-cheatsheet.md:13
21+
#, fuzzy
22+
#| msgid ""
23+
#| "~~~~ let x: f64 = 4.0; let y: uint = x as uint; assert!(y == 4u); ~~~~"
24+
msgid "~~~ let x: int = 42; let y: ~str = x.to_str(); ~~~"
25+
msgstr ""
26+
"~~~~\n"
27+
"let x: f64 = 4.0;\n"
28+
"let y: uint = x as uint;\n"
29+
"assert!(y == 4u);\n"
30+
"~~~~"
31+
32+
#. type: Plain text
33+
#: doc/complement-cheatsheet.md:17
34+
#, fuzzy
35+
#| msgid ""
36+
#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
37+
#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
38+
msgid ""
39+
"Use [`FromStr`](http://static.rust-lang.org/doc/master/std/from_str/trait."
40+
"FromStr.html), and its helper function, [`from_str`](http://static.rust-lang."
41+
"org/doc/master/std/from_str/fn.from_str.html)."
42+
msgstr ""
43+
"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
44+
"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
45+
46+
#. type: Plain text
47+
#: doc/complement-cheatsheet.md:22
48+
#, fuzzy
49+
#| msgid ""
50+
#| "~~~~ let x: f64 = 4.0; let y: uint = x as uint; assert!(y == 4u); ~~~~"
51+
msgid "~~~ let x: Option<int> = from_str(\"42\"); let y: int = x.unwrap(); ~~~"
52+
msgstr ""
53+
"~~~~\n"
54+
"let x: f64 = 4.0;\n"
55+
"let y: uint = x as uint;\n"
56+
"assert!(y == 4u);\n"
57+
"~~~~"
58+
59+
#. type: Plain text
60+
#: doc/complement-cheatsheet.md:29
61+
#, fuzzy
62+
#| msgid "~~~~ use std::task::spawn;"
63+
msgid "~~~ use std::num::ToStrRadix;"
64+
msgstr ""
65+
"~~~~\n"
66+
"use std::task::spawn;"
67+
68+
#. type: Plain text
69+
#: doc/complement-cheatsheet.md:33
70+
#, fuzzy
71+
#| msgid ""
72+
#| "~~~~ let x: f64 = 4.0; let y: uint = x as uint; assert!(y == 4u); ~~~~"
73+
msgid "let x: int = 42; let y: ~str = x.to_str_radix(16); ~~~"
74+
msgstr ""
75+
"~~~~\n"
76+
"let x: f64 = 4.0;\n"
77+
"let y: uint = x as uint;\n"
78+
"assert!(y == 4u);\n"
79+
"~~~~"
80+
81+
#. type: Plain text
82+
#: doc/complement-cheatsheet.md:37
83+
#, fuzzy
84+
#| msgid ""
85+
#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
86+
#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
87+
msgid ""
88+
"Use [`FromStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait."
89+
"FromStrRadix.html), and its helper function, [`from_str_radix`](http://"
90+
"static.rust-lang.org/doc/master/std/num/fn.from_str_radix.html)."
91+
msgstr ""
92+
"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
93+
"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
94+
95+
#. type: Plain text
96+
#: doc/complement-cheatsheet.md:40
97+
#, fuzzy
98+
#| msgid "~~~~ use std::task::spawn;"
99+
msgid "~~~ use std::num::from_str_radix;"
100+
msgstr ""
101+
"~~~~\n"
102+
"use std::task::spawn;"
103+
104+
#. type: Plain text
105+
#: doc/complement-cheatsheet.md:46
106+
#, fuzzy
107+
#| msgid "## Operators"
108+
msgid "# File operations"
109+
msgstr "## 演算子"
110+
111+
#. type: Plain text
112+
#: doc/complement-cheatsheet.md:54
113+
#, fuzzy
114+
#| msgid "~~~~ use std::task::spawn;"
115+
msgid "~~~ {.xfail-test} use std::path::Path; use std::io::fs::File;"
116+
msgstr ""
117+
"~~~~\n"
118+
"use std::task::spawn;"
119+
120+
#. type: Plain text
121+
#: doc/complement-cheatsheet.md:63
122+
#, fuzzy
123+
#| msgid ""
124+
#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
125+
#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
126+
msgid ""
127+
"Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer."
128+
"html#method.lines) method on a [`BufferedReader`](http://static.rust-lang."
129+
"org/doc/master/std/io/buffered/struct.BufferedReader.html)."
130+
msgstr ""
131+
"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
132+
"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
133+
134+
#. type: Plain text
135+
#: doc/complement-cheatsheet.md:77
136+
#, fuzzy
137+
#| msgid "## Using other crates"
138+
msgid "# String operations"
139+
msgstr "## 他のクレートの利用"
140+
141+
#. type: Plain text
142+
#: doc/complement-cheatsheet.md:88 doc/guide-container.md:4
143+
#, fuzzy
144+
msgid "# Containers"
145+
msgstr "## 本書の表記について"
146+
147+
#. type: Plain text
148+
#: doc/complement-cheatsheet.md:176
149+
#, fuzzy
150+
#| msgid "[The foreign function interface][ffi]"
151+
msgid "# FFI (Foreign Function Interface)"
152+
msgstr "[他言語間インターフェース (foreign function inferface)][ffi]"

‎branches/snap-stage3/doc/po/ja/complement-lang-faq.md.po

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Japanese translations for Rust package
2+
# Copyright (C) 2014 The Rust Project Developers
3+
# This file is distributed under the same license as the Rust package.
4+
# Automatically generated, 2014.
5+
#
6+
msgid ""
7+
msgstr ""
8+
"Project-Id-Version: Rust 0.10-pre\n"
9+
"POT-Creation-Date: 2014-01-13 12:01+0900\n"
10+
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
11+
"Last-Translator: Automatically generated\n"
12+
"Language-Team: none\n"
13+
"Language: ja\n"
14+
"MIME-Version: 1.0\n"
15+
"Content-Type: text/plain; charset=UTF-8\n"
16+
"Content-Transfer-Encoding: 8bit\n"
17+
"Plural-Forms: nplurals=1; plural=0;\n"
18+
19+
#. type: Plain text
20+
#: doc/complement-lang-faq.md:83
21+
#, fuzzy
22+
#| msgid ""
23+
#| "[bug-3319]: https://github.com/mozilla/rust/issues/3319 [wiki-start]: "
24+
#| "https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust"
25+
msgid ""
26+
"[rustc]: https://github.com/mozilla/rust/tree/master/src/librustc [resolve]: "
27+
"https://github.com/mozilla/rust/blob/master/src/librustc/middle/resolve.rs "
28+
"[borrowck]: https://github.com/mozilla/rust/blob/master/src/librustc/middle/"
29+
"borrowck/"
30+
msgstr ""
31+
"[bug-3319]: https://github.com/mozilla/rust/issues/3319\n"
32+
"[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-"
33+
"developing-Rust"
34+
35+
#. type: Plain text
36+
#: doc/complement-lang-faq.md:110
37+
#, fuzzy
38+
#| msgid ""
39+
#| "[bug-3319]: https://github.com/mozilla/rust/issues/3319 [wiki-start]: "
40+
#| "https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust"
41+
msgid ""
42+
"[unwind]: https://github.com/mozilla/rust/issues/908 [libgcc]: https://"
43+
"github.com/mozilla/rust/issues/1603"
44+
msgstr ""
45+
"[bug-3319]: https://github.com/mozilla/rust/issues/3319\n"
46+
"[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-"
47+
"developing-Rust"

‎branches/snap-stage3/doc/po/ja/complement-project-faq.md.po

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Japanese translations for Rust package
2+
# Copyright (C) 2014 The Rust Project Developers
3+
# This file is distributed under the same license as the Rust package.
4+
# Automatically generated, 2014.
5+
#
6+
msgid ""
7+
msgstr ""
8+
"Project-Id-Version: Rust 0.10-pre\n"
9+
"POT-Creation-Date: 2014-01-13 12:01+0900\n"
10+
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
11+
"Last-Translator: Automatically generated\n"
12+
"Language-Team: none\n"
13+
"Language: ja\n"
14+
"MIME-Version: 1.0\n"
15+
"Content-Type: text/plain; charset=UTF-8\n"
16+
"Content-Transfer-Encoding: 8bit\n"
17+
"Plural-Forms: nplurals=1; plural=0;\n"
18+
19+
#. type: Bullet: '* '
20+
#: doc/complement-project-faq.md:36
21+
#, fuzzy
22+
#| msgid "## The standard library"
23+
msgid "An evolving standard library."
24+
msgstr "## 標準ライブラリ"

0 commit comments

Comments
 (0)