Skip to content

Commit 354da41

Browse files
borsbors
committed
auto merge of #4799 : graydon/rust/rustpkg, r=graydon
Taking over where #4610 left off. Much rebasing and tidying.
2 parents 3e97cce + 585d6f7 commit 354da41

23 files changed

+2477
-2192
lines changed

‎AUTHORS.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,4 @@ Wade Mealing <[email protected]>
161161
William Ting <[email protected]>
162162
Yasuhiro Fujii <[email protected]>
163163
Youngsoo Son <[email protected]>
164-
Zack Corr <[email protected]>
164+
Zack Corr <[email protected]>

‎Makefile.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ CFG_STDLIB :=$(call CFG_LIB_NAME,std)
131131
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
132132
CFG_LIBSYNTAX :=$(call CFG_LIB_NAME,syntax)
133133
CFG_LIBFUZZER :=$(call CFG_LIB_NAME,fuzzer)
134-
CFG_LIBCARGO :=$(call CFG_LIB_NAME,cargo)
134+
CFG_LIBRUSTPKG :=$(call CFG_LIB_NAME,rustpkg)
135135
CFG_LIBRUSTDOC :=$(call CFG_LIB_NAME,rustdoc)
136136
CFG_LIBRUSTI :=$(call CFG_LIB_NAME,rusti)
137137

@@ -140,15 +140,15 @@ CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
140140
LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
141141
LIBSYNTAX_GLOB :=$(call CFG_LIB_GLOB,syntax)
142142
LIBFUZZER_GLOB :=$(call CFG_LIB_GLOB,fuzzer)
143-
LIBCARGO_GLOB :=$(call CFG_LIB_GLOB,cargo)
143+
LIBRUSTPKG_GLOB :=$(call CFG_LIB_GLOB,rustpkg)
144144
LIBRUSTDOC_GLOB :=$(call CFG_LIB_GLOB,rustdoc)
145145
LIBRUSTI_GLOB :=$(call CFG_LIB_GLOB,rusti)
146146
STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
147147
CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
148148
LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
149149
LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax)
150150
LIBFUZZER_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,fuzzer)
151-
LIBCARGO_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,cargo)
151+
LIBRUSTPKG_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustpkg)
152152
LIBRUSTDOC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustdoc)
153153
LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)
154154

@@ -371,19 +371,19 @@ SREQ$(1)_T_$(2)_H_$(3) = \
371371
CSREQ$(1)_T_$(2)_H_$(3) = \
372372
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
373373
$$(HBIN$(1)_H_$(3))/fuzzer$$(X) \
374-
$$(HBIN$(1)_H_$(3))/cargo$$(X) \
374+
$$(HBIN$(1)_H_$(3))/rustpkg$$(X) \
375375
$$(HBIN$(1)_H_$(3))/rustdoc$$(X) \
376376
$$(HBIN$(1)_H_$(3))/rusti$$(X) \
377377
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBFUZZER) \
378-
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBCARGO) \
378+
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTPKG) \
379379
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTDOC) \
380380
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTI) \
381381
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
382382
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \
383383
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX) \
384384
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) \
385385
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBFUZZER) \
386-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBCARGO) \
386+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTPKG) \
387387
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC) \
388388
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI)
389389

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ for more information on them.
5656

5757
When complete, `make install` will place several programs into
5858
`/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
59-
API-documentation tool, and `cargo`, the Rust package manager.
59+
API-documentation tool, and `rustpkg`, the Rust package manager and build system.
6060

6161
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
6262
[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz

‎mk/clean.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ define CLEAN_HOST_STAGE_N
6464
clean$(1)_H_$(2):
6565
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustc$(X)
6666
$(Q)rm -f $$(HBIN$(1)_H_$(2))/fuzzer$(X)
67-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/cargo$(X)
67+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustpkg$(X)
6868
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X)
6969
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X)
7070
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X)
7171
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBFUZZER)
72-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBCARGO)
72+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG)
7373
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC)
7474
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME)
7575
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_CORELIB)
@@ -82,7 +82,7 @@ clean$(1)_H_$(2):
8282
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB)
8383
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB)
8484
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBFUZZER_GLOB)
85-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBCARGO_GLOB)
85+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB)
8686
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB)
8787
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB)
8888
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM)
@@ -99,11 +99,11 @@ define CLEAN_TARGET_STAGE_N
9999
clean$(1)_T_$(2)_H_$(3):
100100
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$(X)
101101
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/fuzzer$(X)
102-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/cargo$(X)
102+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X)
103103
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X)
104104
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X)
105105
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER)
106-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBCARGO)
106+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG)
107107
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC)
108108
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME)
109109
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
@@ -115,7 +115,7 @@ clean$(1)_T_$(2)_H_$(3):
115115
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB)
116116
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB)
117117
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBFUZZER_GLOB)
118-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBCARGO_GLOB)
118+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB)
119119
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB)
120120
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM)
121121
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib

‎mk/dist.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ PKG_FILES := \
2525
$(addprefix $(S)src/, \
2626
README.txt \
2727
driver \
28-
libcargo \
28+
librustpkg \
2929
librusti \
3030
librustc \
3131
compiletest \

‎mk/install.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
5555
$$(Q)$$(call INSTALL_LIB, \
5656
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB))
5757
$$(Q)$$(call INSTALL_LIB, \
58-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBCARGO_GLOB))
58+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTPKG_GLOB))
5959
$$(Q)$$(call INSTALL_LIB, \
6060
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB))
6161
$$(Q)$$(call INSTALL_LIB, \
@@ -87,11 +87,11 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
8787
$(Q)mkdir -p $(PREFIX_LIB)
8888
$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
8989
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X))
90-
$(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X))
90+
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X))
9191
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
9292
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
9393
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC))
94-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBCARGO))
94+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTPKG))
9595
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC))
9696
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI))
9797
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
@@ -112,11 +112,11 @@ HOST_LIB_FROM_HL_GLOB = \
112112

113113
uninstall:
114114
$(Q)rm -f $(PHB)/rustc$(X)
115-
$(Q)rm -f $(PHB)/cargo$(X)
115+
$(Q)rm -f $(PHB)/rustpkg$(X)
116116
$(Q)rm -f $(PHB)/rusti$(X)
117117
$(Q)rm -f $(PHB)/rustdoc$(X)
118118
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
119-
$(Q)rm -f $(PHL)/$(CFG_LIBCARGO)
119+
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTPKG)
120120
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC)
121121
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC)
122122
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI)
@@ -126,7 +126,7 @@ uninstall:
126126
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \
127127
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \
128128
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \
129-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBCARGO_GLOB)) \
129+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB)) \
130130
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB)) \
131131
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB)) \
132132
; \

‎mk/pp.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
$(wildcard $(S)src/test/*/*.rs \
1919
$(S)src/test/*/*/*.rs) \
2020
$(wildcard $(S)src/fuzzer/*.rs) \
21-
$(wildcard $(S)src/cargo/*.rs) \
21+
$(wildcard $(S)src/rustpkg/*.rs) \
2222
$(wildcard $(S)src/rusti/*.rs)
2323

2424
PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L \

‎mk/tests.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
######################################################################
1515

1616
# The names of crates that must be tested
17-
TEST_CRATES = core std syntax rustc rustdoc rusti cargo
17+
TEST_CRATES = core std syntax rustc rustdoc rusti rustpkg
1818

1919
# Markdown files under doc/ that should have their code extracted and run
2020
DOC_TEST_NAMES = tutorial tutorial-ffi tutorial-macros tutorial-borrowed-ptr tutorial-tasks rust
@@ -229,8 +229,8 @@ $(3)/test/rustctest.stage$(1)-$(2)$$(X): \
229229
@$$(call E, compile_and_link: $$@)
230230
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
231231

232-
$(3)/test/cargotest.stage$(1)-$(2)$$(X): \
233-
$$(CARGO_LIB) $$(CARGO_INPUTS) \
232+
$(3)/test/rustpkgtest.stage$(1)-$(2)$$(X): \
233+
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
234234
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
235235
@$$(call E, compile_and_link: $$@)
236236
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test

‎mk/tools.mk

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
FUZZER_LIB := $(S)src/libfuzzer/fuzzer.rc
1515
FUZZER_INPUTS := $(wildcard $(addprefix $(S)src/libfuzzer/, *.rs))
1616

17-
# The test runner that runs the cfail/rfail/rpass and bench tests
17+
# The test runner that runs the cfail/rfail/rpass and bxench tests
1818
COMPILETEST_CRATE := $(S)src/compiletest/compiletest.rc
1919
COMPILETEST_INPUTS := $(wildcard $(S)src/compiletest/*rs)
2020

21-
# Cargo, the package manager
22-
CARGO_LIB := $(S)src/libcargo/cargo.rc
23-
CARGO_INPUTS := $(wildcard $(S)src/libcargo/*rs)
21+
# Rustpkg, the package manager and build system
22+
RUSTPKG_LIB := $(S)src/librustpkg/rustpkg.rc
23+
RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*rs)
2424

2525
# Rustdoc, the documentation tool
2626
RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rc
@@ -57,20 +57,20 @@ $$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X): \
5757
@$$(call E, compile_and_link: $$@)
5858
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
5959

60-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBCARGO): \
61-
$$(CARGO_LIB) $$(CARGO_INPUTS) \
60+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTPKG): \
61+
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
6262
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
6363
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
6464
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
6565
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
6666
@$$(call E, compile_and_link: $$@)
6767
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
6868

69-
$$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X): \
69+
$$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X): \
7070
$$(DRIVER_CRATE) \
71-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBCARGO)
71+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTPKG)
7272
@$$(call E, compile_and_link: $$@)
73-
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg cargo -o $$@ $$<
73+
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustpkg -o $$@ $$<
7474

7575
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTDOC): \
7676
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
@@ -134,19 +134,19 @@ $$(HBIN$(2)_H_$(4))/compiletest$$(X): \
134134
$$(Q)cp $$< $$@
135135

136136

137-
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBCARGO): \
138-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBCARGO) \
137+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTPKG): \
138+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTPKG) \
139139
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC) \
140140
$$(HSREQ$(2)_H_$(4))
141141
@$$(call E, cp: $$@)
142142
$$(Q)cp $$< $$@
143-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBCARGO_GLOB) \
144-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBCARGO_DSYM_GLOB)) \
143+
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTPKG_GLOB) \
144+
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTPKG_DSYM_GLOB)) \
145145
$$(HLIB$(2)_H_$(4))
146146

147-
$$(HBIN$(2)_H_$(4))/cargo$$(X): \
148-
$$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X) \
149-
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBCARGO) \
147+
$$(HBIN$(2)_H_$(4))/rustpkg$$(X): \
148+
$$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X) \
149+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTPKG) \
150150
$$(HSREQ$(2)_H_$(4))
151151
@$$(call E, cp: $$@)
152152
$$(Q)cp $$< $$@

‎src/README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ test/auxiliary - Dependencies of tests
2929

3030
compiletest/ The test runner
3131

32-
libcargo/ The package manager
32+
librustpkg/ The package manager and build system
3333

3434
librusti/ The JIT REPL
3535

‎src/driver/driver.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#[no_core];
1212
extern mod core(vers = "0.6");
1313

14-
#[cfg(cargo)]
15-
extern mod this(name = "cargo", vers = "0.6");
14+
#[cfg(rustpkg)]
15+
extern mod this(name = "rustpkg", vers = "0.6");
1616

1717
#[cfg(fuzzer)]
1818
extern mod this(name = "fuzzer", vers = "0.6");

0 commit comments

Comments
 (0)