OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6e24b750e2
rust/mk/install.mk

265 lines
11 KiB
Makefile
Raw Normal View History

Reliciense makefiles and testsuite. Yup.
2012-12-11 02:32:48 +01:00
# 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.
Add more comments to install.mk
2011-10-26 06:18:22 +02:00
# FIXME: Docs are currently not installed from the stageN dirs.
# For consistency it might be desirable for stageN to be an exact
# mirror of the installation directory structure.
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
# Installation macros.
# For INSTALL,
# $(1) is the source dirctory
# $(2) is the destination directory
# $(3) is the filename/libname-glob
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
ifdef VERBOSE
build: Don't use -T option on install cmd. Not OS X compatible
2012-01-28 23:32:38 +01:00
INSTALL = install -m755 $(1)/$(3) $(2)/$(3)
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
else
build: Don't use -T option on install cmd. Not OS X compatible
2012-01-28 23:32:38 +01:00
INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
endif
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
# For INSTALL_LIB,
# Target-specific $(LIB_SOURCE_DIR) is the source directory
# Target-specific $(LIB_DESTIN_DIR) is the destination directory
# $(1) is the filename/libname-glob
ifdef VERBOSE
DO_INSTALL_LIB = install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(LIB_DESTIN_DIR)/
else
DO_INSTALL_LIB = $(Q)$(call E, install_lib: $(LIB_DESTIN_DIR)/$(1)) && \
install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(LIB_DESTIN_DIR)/
endif
# Target-specific $(LIB_SOURCE_DIR) is the source directory
# Target-specific $(LIB_DESTIN_DIR) is the destination directory
# $(1) is the filename/libname-glob
Fix #3225: Check for old Rust libraries when building and installing. When building Rust libraries (e.g. librustc, libstd, etc), checks for and verbosely removes previous build products before invoking rustc. (Also, when Make variable VERBOSE is defined, it will list all of the libraries matching the object library's glob after the rustc invocation has completed.) When installing Rust libraries, checks for previous libraries in target install directory, but does not remove them. The thinking behind these two different modes of operation is that the installation target, unlike the build tree, is not under the control of this infrastructure and it is not up to this Makefile to decide if the previous libraries should be removed.
2013-07-04 16:51:45 +02:00
define INSTALL_LIB
Fix #3225: Incorporate feedback from Graydon. This is a small follow-up fix to the previous commit: I needed to quote the right-hand side of the definition for the variable MATCHES, to handle the case where there are more than one previously installed libraries in the target directory.
2013-07-09 15:31:43 +02:00
$(if $(filter-out 1,$(words $(wildcard $(LIB_SOURCE_DIR)/$(1)))), \
$(error Aborting install because more than one library matching \
$(1) is present in build tree $(LIB_SOURCE_DIR): \
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
$(wildcard $(LIB_SOURCE_DIR)/$(1))))
Fix #3225: Incorporate feedback from Graydon. This is a small follow-up fix to the previous commit: I needed to quote the right-hand side of the definition for the variable MATCHES, to handle the case where there are more than one previously installed libraries in the target directory.
2013-07-09 15:31:43 +02:00
$(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(LIB_SOURCE_DIR)/$(1))))"; \
MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(LIB_SOURCE_DIR)/$(1)))),\
$(wildcard $(LIB_DESTIN_DIR)/$(1)))"; \
if [ -n "$$MATCHES" ]; then \
echo "Warning, one or libraries matching Rust library '$(1)'" && \
echo " (other than '$$LIB_NAME' itself) already present" && \
echo " at destination $(LIB_DESTIN_DIR):" && \
echo $$MATCHES ; \
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
fi
$(call DO_INSTALL_LIB,$(1))
Fix #3225: Check for old Rust libraries when building and installing. When building Rust libraries (e.g. librustc, libstd, etc), checks for and verbosely removes previous build products before invoking rustc. (Also, when Make variable VERBOSE is defined, it will list all of the libraries matching the object library's glob after the rustc invocation has completed.) When installing Rust libraries, checks for previous libraries in target install directory, but does not remove them. The thinking behind these two different modes of operation is that the installation target, unlike the build tree, is not under the control of this infrastructure and it is not up to this Makefile to decide if the previous libraries should be removed.
2013-07-04 16:51:45 +02:00
endef
Lots of build system cleanup and documentation This splits mk/stageN.mk into host.mk and target.mk and makes the build rules somewhat simpler - there's no more building from stageN into stageN+1; instead we always build from stageN(host) to stageN(target) then promote from stageN(target) to stageN+1(host). Add a big honkin explaination right at the top of Makefile.in
2011-10-02 05:12:08 +02:00
# The stage we install from
build: Stop building stage3 on normal test cycles Issue #1419
2012-01-16 06:42:03 +01:00
ISTAGE = 2
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
PREFIX_ROOT = $(CFG_PREFIX)
PREFIX_BIN = $(PREFIX_ROOT)/bin
Correct install.mk to use CFG_LIBDIR for correct install paths on windows.
2012-02-25 03:29:44 +01:00
PREFIX_LIB = $(PREFIX_ROOT)/$(CFG_LIBDIR)
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
mk: install/uninstall for multiple target
2013-03-04 11:14:24 +01:00
define INSTALL_PREPARE_N
basic builds function
2011-11-21 22:11:40 +01:00
# $(1) is the target triple
# $(2) is the host triple
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
basic builds function
2011-11-21 22:11:40 +01:00
# T{B,L} == Target {Bin, Lib} for stage ${ISTAGE}
improve install, fix MKFILE_DEPS so it works
2011-11-29 21:42:05 +01:00
TB$(1)$(2) = $$(TBIN$$(ISTAGE)_T_$(1)_H_$(2))
TL$(1)$(2) = $$(TLIB$$(ISTAGE)_T_$(1)_H_$(2))
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
basic builds function
2011-11-21 22:11:40 +01:00
# PT{R,B,L} == Prefix Target {Root, Bin, Lib}
improve install, fix MKFILE_DEPS so it works
2011-11-29 21:42:05 +01:00
PTR$(1)$(2) = $$(PREFIX_LIB)/rustc/$(1)
PTB$(1)$(2) = $$(PTR$(1)$(2))/bin
Correct install.mk to use CFG_LIBDIR for correct install paths on windows.
2012-02-25 03:29:44 +01:00
PTL$(1)$(2) = $$(PTR$(1)$(2))/$(CFG_LIBDIR)
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
mk: install/uninstall for multiple target
2013-03-04 11:14:24 +01:00
endef
$(foreach target,$(CFG_TARGET_TRIPLES), \
$(eval $(call INSTALL_PREPARE_N,$(target),$(CFG_BUILD_TRIPLE))))
define INSTALL_TARGET_N
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
mk: install/uninstall for multiple target
2013-03-04 11:14:24 +01:00
install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
$$(Q)mkdir -p $$(PTL$(1)$(2))
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
mk: install/uninstall for multiple target
2013-03-04 11:14:24 +01:00
endef
define INSTALL_HOST_N
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
Tools should not be build prereqs of tests. Closes #3946
2012-11-13 22:32:49 +01:00
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
improve install, fix MKFILE_DEPS so it works
2011-11-29 21:42:05 +01:00
$$(Q)mkdir -p $$(PTL$(1)$(2))
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
Install librustllvm.so to target lib directory
2013-07-14 07:50:54 +02:00
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUSTLLVM_$(1)))
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTC_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(LIBSYNTAX_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTPKG_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTDOC_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTI_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(LIBRUST_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
Add a 'make uninstall' target. Close #1668.
2012-01-31 00:32:04 +01:00
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
endef
$(foreach target,$(CFG_TARGET_TRIPLES), \
mk: install/uninstall for multiple target
2013-03-04 11:14:24 +01:00
$(if $(findstring $(target), $(CFG_BUILD_TRIPLE)), \
$(eval $(call INSTALL_HOST_N,$(target),$(CFG_BUILD_TRIPLE))), \
$(eval $(call INSTALL_TARGET_N,$(target),$(CFG_BUILD_TRIPLE)))))
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
INSTALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
mk: Split target triples into bulid triple + host triples + target triples For cross compiling to targets that don't want to build a compiler
2013-02-22 01:15:01 +01:00
install-target-$(target)-host-$(CFG_BUILD_TRIPLE))
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
Make install and check targets depend on all. Close #1395.
2011-12-30 21:48:07 +01:00
install: all install-host install-targets
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
basic builds function
2011-11-21 22:11:40 +01:00
# Shorthand for build/stageN/bin
mk: Split target triples into bulid triple + host triples + target triples For cross compiling to targets that don't want to build a compiler
2013-02-22 01:15:01 +01:00
HB = $(HBIN$(ISTAGE)_H_$(CFG_BUILD_TRIPLE))
HB2 = $(HBIN2_H_$(CFG_BUILD_TRIPLE))
basic builds function
2011-11-21 22:11:40 +01:00
# Shorthand for build/stageN/lib
mk: Split target triples into bulid triple + host triples + target triples For cross compiling to targets that don't want to build a compiler
2013-02-22 01:15:01 +01:00
HL = $(HLIB$(ISTAGE)_H_$(CFG_BUILD_TRIPLE))
basic builds function
2011-11-21 22:11:40 +01:00
# Shorthand for the prefix bin directory
PHB = $(PREFIX_BIN)
# Shorthand for the prefix bin directory
PHL = $(PREFIX_LIB)
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
install-host: LIB_SOURCE_DIR=$(HL)
install-host: LIB_DESTIN_DIR=$(PHL)
mk: Split target triples into bulid triple + host triples + target triples For cross compiling to targets that don't want to build a compiler
2013-02-22 01:15:01 +01:00
install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
$(Q)mkdir -p $(PREFIX_BIN)
$(Q)mkdir -p $(PREFIX_LIB)
install.mk: make man1 directory
2011-11-05 00:53:23 +01:00
$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
mk: cleanup - lib and executable suffix handling
2013-03-02 13:25:12 +01:00
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X_$(CFG_BUILD_TRIPLE)))
Fix #3225: Incorporate feedback from Graydon. Namely, switched in many places to using GNU make provided functions for directory listing and text processing, rather than spawning a shell process to do that work. In the process of the revision, learned about Target-specific variables, which were very applicable to INSTALL_LIB (which, on a per-recipe basis, was always receiving the same actual arguments for its first two formal parameters in every invocation). http://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html (We might be able to make use of those in future refactorings.) ---- Also adds a cleanup pass to get-snapshot.py as well, since the same problem arises when we unpack libraries from the snapshot archive into a build directory with a prior snapshot's artifacts. (I put this step into the python script rather than the makefile because I wanted to delay the cleanup pass until after we have at least successfully downloaded the tarball. That way, if the download fails, you should not destroy the previous unarchived snapshot libraries and build products.) ---- Also reverted whitespace changes to minimize diff. I plan to put them back in in a dedicated commit elsewhere.
2013-07-08 18:35:47 +02:00
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL_LIB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL_LIB,$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE)))
mk: Cross-compile fixes
2013-03-02 00:48:11 +01:00
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE)))
Add new manpages to install script
2013-07-07 06:43:11 +02:00
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rust.1)
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustc.1)
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustdoc.1)
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rusti.1)
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustpkg.1)
Have 'make install' do something close to useful We'll copy the files to the right location. Still need to rpath. Issue #529
2011-10-01 04:00:19 +02:00
install-targets: $(INSTALL_TARGET_RULES)
Add a 'make uninstall' target. Close #1668.
2012-01-31 00:32:04 +01:00
HOST_LIB_FROM_HL_GLOB = \
Revert "Reorganize lib-glob code to avoid accidentally duplicating lib/ subdirectory." This reverts commit 2cf6bf87c348f4a1079aa1c17e51eb45d9b89a5f.
2012-07-12 00:04:32 +02:00
$(patsubst $(HL)/%,$(PHL)/%,$(wildcard $(HL)/$(1)))
Add a 'make uninstall' target. Close #1668.
2012-01-31 00:32:04 +01:00
uninstall:
mk: cleanup - lib and executable suffix handling
2013-03-02 13:25:12 +01:00
$(Q)rm -f $(PHB)/rustc$(X_$(CFG_BUILD_TRIPLE))
$(Q)rm -f $(PHB)/rustpkg$(X_$(CFG_BUILD_TRIPLE))
$(Q)rm -f $(PHB)/rusti$(X_$(CFG_BUILD_TRIPLE))
$(Q)rm -f $(PHB)/rust$(X_$(CFG_BUILD_TRIPLE))
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD_TRIPLE))
mk: Cross-compile fixes
2013-03-02 00:48:11 +01:00
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
Add a 'make uninstall' target. Close #1668.
2012-01-31 00:32:04 +01:00
$(Q)for i in \
mk: Cross-compile fixes
2013-03-02 00:48:11 +01:00
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE))) \
libstd: Rename libcore to libstd and libstd to libextra; update makefiles. This only changes the directory names; it does not change the "real" metadata names.
2013-05-17 19:45:09 +02:00
$(call HOST_LIB_FROM_HL_GLOB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE))) \
mk: Cross-compile fixes
2013-03-02 00:48:11 +01:00
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE))) \
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE))) \
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE))) \
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE))) \
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE))) \
Add a 'make uninstall' target. Close #1668.
2012-01-31 00:32:04 +01:00
; \
do rm -f $$i ; \
done
$(Q)rm -Rf $(PHL)/rustc
remove new man pages on make uninstall
2013-07-13 20:56:08 +02:00
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rust.1
Add a 'make uninstall' target. Close #1668.
2012-01-31 00:32:04 +01:00
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustc.1
remove new man pages on make uninstall
2013-07-13 20:56:08 +02:00
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustdoc.1
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rusti.1
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustpkg.1
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
# target platform specific variables
# for arm-linux-androidabi
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
define DEF_ADB_DEVICE_STATUS
CFG_ADB_DEVICE_STATUS=$(1)
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
endef
$(foreach target,$(CFG_TARGET_TRIPLES), \
$(if $(findstring $(target),"arm-linux-androideabi"), \
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
$(if $(findstring adb,$(CFG_ADB)), \
$(if $(findstring device,$(shell adb devices 2>/dev/null | grep -E '^[_A-Za-z0-9-]+[[:blank:]]+device')), \
$(info install: install-runtime-target for $(target) enabled \
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
$(info install: android device attached) \
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
$(eval $(call DEF_ADB_DEVICE_STATUS, true))), \
$(info install: install-runtime-target for $(target) disabled \
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
$(info install: android device not attached) \
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
$(eval $(call DEF_ADB_DEVICE_STATUS, false))) \
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
), \
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
$(info install: install-runtime-target for $(target) disabled \
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
$(info install: adb not found) \
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
$(eval $(call DEF_ADB_DEVICE_STATUS, false))) \
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
), \
) \
)
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
ifeq (install-runtime-target,$(firstword $(MAKECMDGOALS)))
$(eval $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS)):;@:)
L_TOKEN := $(word 2,$(MAKECMDGOALS))
ifeq ($(L_TOKEN),)
mk: configurable android test directory
2013-05-03 04:14:01 +02:00
CFG_RUNTIME_PUSH_DIR=/system/lib
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
else
CFG_RUNTIME_PUSH_DIR=$(L_TOKEN)
endif
mk: configurable android test directory
2013-05-03 04:14:01 +02:00
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
ifeq ($(CFG_ADB_DEVICE_STATUS),true)
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
ifdef VERBOSE
ADB = adb $(1)
ADB_PUSH = adb push $(1) $(2)
minor automatic whitespace fixes
2013-05-07 03:09:34 +02:00
ADB_SHELL = adb shell $(1) $(2)
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
else
minor automatic whitespace fixes
2013-05-07 03:09:34 +02:00
ADB = $(Q)$(call E, adb $(1)) && adb $(1) 1>/dev/null
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
ADB_PUSH = $(Q)$(call E, adb push $(1)) && adb push $(1) $(2) 1>/dev/null
ADB_SHELL = $(Q)$(call E, adb shell $(1) $(2)) && adb shell $(1) $(2) 1>/dev/null
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
endif
define INSTALL_RUNTIME_TARGET_N
install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
mk: configurable android test directory
2013-05-03 04:14:01 +02:00
$(Q)$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR))
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CFG_RUNTIME_$(1)),$(CFG_RUNTIME_PUSH_DIR))
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(STDLIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
libstd: Rename libcore to libstd and libstd to libextra; update makefiles. This only changes the directory names; it does not change the "real" metadata names.
2013-05-17 19:45:09 +02:00
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(EXTRALIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
endef
define INSTALL_RUNTIME_TARGET_CLEANUP_N
install-runtime-target-$(1)-cleanup:
$(Q)$(call ADB,remount)
mk: configurable android test directory
2013-05-03 04:14:01 +02:00
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(CFG_RUNTIME_$(1)))
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(STDLIB_GLOB_$(1)))
libstd: Rename libcore to libstd and libstd to libextra; update makefiles. This only changes the directory names; it does not change the "real" metadata names.
2013-05-17 19:45:09 +02:00
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(EXTRALIB_GLOB_$(1)))
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
endef
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD_TRIPLE)))
$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,arm-linux-androideabi))
install-runtime-target: \
install-runtime-target-arm-linux-androideabi-cleanup \
install-runtime-target-arm-linux-androideabi-host-$(CFG_BUILD_TRIPLE)
else
minor automatic whitespace fixes
2013-05-07 03:09:34 +02:00
install-runtime-target:
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
@echo "No device to install runtime library"
minor automatic whitespace fixes
2013-05-07 03:09:34 +02:00
@echo
mk: install.mk directory argument pass for install-runtime-target
2013-05-03 17:47:54 +02:00
endif
mk: install-runtime-target added to install.mk (pushing shared library to android target)
2013-05-01 11:49:19 +02:00
endif
Reference in New Issue Copy Permalink