0369a41f0e
New standards have arisen in recent months, mostly for the use of rustpkg, but the main Rust codebase has not been altered to match these new specifications. This changeset rectifies most of these issues. - Renamed the crate source files `src/libX/X.rs` to `lib.rs`, for consistency with current styles; this affects extra, rustc, rustdoc, rustpkg, rustuv, std, syntax. - Renamed `X/X.rs` to `X/mod.rs,` as is now recommended style, for `std::num` and `std::terminfo`. - Shifted `src/libstd/str/ascii.rs` out of the otherwise unused `str` directory, to be consistent with its import path of `std::ascii`; libstd is flat at present so it's more appropriate thus. While this removes some `#[path = "..."]` directives, it does not remove all of them, and leaves certain other inconsistencies, such as `std::u8` et al. which are actually stored in `src/libstd/num/` (one subdirectory down). No quorum has been reached on this issue, so I felt it best to leave them all alone at present. #9208 deals with the possibility of making libstd more hierarchical (such as changing the crate to match the current filesystem structure, which would make the module path `std::num::u8`). There is one thing remaining in which this repository is not rustpkg-compliant: rustpkg would have `src/std/` et al. rather than `src/libstd/` et al. I have not endeavoured to change that at this point as it would guarantee prompt bitrot and confusion. A change of that magnitude needs to be discussed first.
143 lines
5.5 KiB
Makefile
143 lines
5.5 KiB
Makefile
# Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
|
# file at the top-level directory of this distribution and at
|
|
# http://rust-lang.org/COPYRIGHT.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
# option. This file may not be copied, modified, or distributed
|
|
# except according to those terms.
|
|
|
|
# Rules for non-core tools built with the compiler, both for target
|
|
# and host architectures
|
|
|
|
# The test runner that runs the cfail/rfail/rpass and bxench tests
|
|
COMPILETEST_CRATE := $(S)src/compiletest/compiletest.rs
|
|
COMPILETEST_INPUTS := $(wildcard $(S)src/compiletest/*.rs)
|
|
|
|
# Rustpkg, the package manager and build system
|
|
RUSTPKG_LIB := $(S)src/librustpkg/lib.rs
|
|
RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*.rs)
|
|
|
|
# Rustdoc, the documentation tool
|
|
RUSTDOC_LIB := $(S)src/librustdoc/lib.rs
|
|
RUSTDOC_INPUTS := $(wildcard $(addprefix $(S)src/librustdoc/, \
|
|
*.rs */*.rs */*/*.rs))
|
|
|
|
# FIXME: These are only built for the host arch. Eventually we'll
|
|
# have tools that need to built for other targets.
|
|
define TOOLS_STAGE_N_TARGET
|
|
|
|
$$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X_$(4)): \
|
|
$$(COMPILETEST_CRATE) $$(COMPILETEST_INPUTS) \
|
|
$$(SREQ$(1)_T_$(4)_H_$(3)) \
|
|
| $$(TBIN$(1)_T_$(4)_H_$(3))/
|
|
@$$(call E, compile_and_link: $$@)
|
|
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
|
|
|
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)): \
|
|
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
|
|
$$(SREQ$(1)_T_$(4)_H_$(3)) \
|
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
|
|
| $$(TLIB$(1)_T_$(4)_H_$(3))/
|
|
@$$(call E, compile_and_link: $$@)
|
|
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTPKG_GLOB_$(4)),$$(notdir $$@))
|
|
$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
|
|
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTPKG_GLOB_$(4)),$$(notdir $$@))
|
|
|
|
$$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X_$(4)): \
|
|
$$(DRIVER_CRATE) \
|
|
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
|
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
|
|
| $$(TBIN$(1)_T_$(4)_H_$(3))/
|
|
@$$(call E, compile_and_link: $$@)
|
|
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustpkg -o $$@ $$<
|
|
|
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)): \
|
|
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
|
|
$$(SREQ$(1)_T_$(4)_H_$(3)) \
|
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
|
|
$$(SUNDOWN_LIB_$(4)) \
|
|
| $$(TLIB$(1)_T_$(4)_H_$(3))/
|
|
@$$(call E, compile_and_link: $$@)
|
|
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOC_GLOB_$(4)),$$(notdir $$@))
|
|
$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) \
|
|
-L $$(SUNDOWN_DIR_$(4)) --out-dir $$(@D) $$< && touch $$@
|
|
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOC_GLOB_$(4)),$$(notdir $$@))
|
|
|
|
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X_$(4)): \
|
|
$$(DRIVER_CRATE) \
|
|
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
|
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)) \
|
|
| $$(TBIN$(1)_T_$(4)_H_$(3))/
|
|
@$$(call E, compile_and_link: $$@)
|
|
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustdoc -o $$@ $$<
|
|
|
|
endef
|
|
|
|
define TOOLS_STAGE_N_HOST
|
|
|
|
$$(HBIN$(2)_H_$(4))/compiletest$$(X_$(4)): \
|
|
$$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X_$(4)) \
|
|
$$(HSREQ$(2)_H_$(4)) \
|
|
| $$(HBIN$(2)_H_$(4))/
|
|
@$$(call E, cp: $$@)
|
|
$$(Q)cp $$< $$@
|
|
|
|
|
|
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTPKG_$(4)): \
|
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
|
|
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
|
|
$$(HSREQ$(2)_H_$(4)) \
|
|
| $$(HLIB$(2)_H_$(4))/
|
|
@$$(call E, cp: $$@)
|
|
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTPKG_GLOB_$(4)),$$(notdir $$@))
|
|
$$(Q)cp $$< $$@
|
|
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTPKG_GLOB_$(4)),$$(notdir $$@))
|
|
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTPKG_GLOB_$(4)) \
|
|
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTPKG_DSYM_GLOB_$(4))) \
|
|
$$(HLIB$(2)_H_$(4))
|
|
|
|
$$(HBIN$(2)_H_$(4))/rustpkg$$(X_$(4)): \
|
|
$$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X_$(4)) \
|
|
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTPKG_$(4)) \
|
|
$$(HSREQ$(2)_H_$(4)) \
|
|
| $$(HBIN$(2)_H_$(4))/
|
|
@$$(call E, cp: $$@)
|
|
$$(Q)cp $$< $$@
|
|
|
|
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTDOC_$(4)): \
|
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)) \
|
|
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
|
|
$$(HSREQ$(2)_H_$(4)) \
|
|
| $$(HLIB$(2)_H_$(4))/
|
|
@$$(call E, cp: $$@)
|
|
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOC_GLOB_$(4)),$$(notdir $$@))
|
|
$$(Q)cp $$< $$@
|
|
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOC_GLOB_$(4)),$$(notdir $$@))
|
|
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTDOC_GLOB_$(4)) \
|
|
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTDOC_DSYM_GLOB_$(4))) \
|
|
$$(HLIB$(2)_H_$(4))
|
|
|
|
$$(HBIN$(2)_H_$(4))/rustdoc$$(X_$(4)): \
|
|
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X_$(4)) \
|
|
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTDOC_$(4)) \
|
|
$$(HSREQ$(2)_H_$(4)) \
|
|
| $$(HBIN$(2)_H_$(4))/
|
|
@$$(call E, cp: $$@)
|
|
$$(Q)cp $$< $$@
|
|
|
|
endef
|
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
$(foreach target,$(CFG_TARGET), \
|
|
$(eval $(call TOOLS_STAGE_N_TARGET,0,1,$(host),$(target))) \
|
|
$(eval $(call TOOLS_STAGE_N_TARGET,1,2,$(host),$(target))) \
|
|
$(eval $(call TOOLS_STAGE_N_TARGET,2,3,$(host),$(target))) \
|
|
$(eval $(call TOOLS_STAGE_N_TARGET,3,bogus,$(host),$(target)))))
|
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
$(eval $(call TOOLS_STAGE_N_HOST,0,1,$(host),$(host))) \
|
|
$(eval $(call TOOLS_STAGE_N_HOST,1,2,$(host),$(host))) \
|
|
$(eval $(call TOOLS_STAGE_N_HOST,2,3,$(host),$(host))))
|