mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-11-16 00:51:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Separated standard function to standard_build and standard_install.

Browse source 
* standard_build invoke configure and make. It not invoke `make install`.
  * standard_install invoke only `make install`.
  * Added backword compatibility function for above separation.
  * Added new function for bundled_gems support named standard_install_with_bundled_gems.
This commit is contained in:
SHIBATA Hiroshi 2017-06-12 18:27:00 +09:00
parent eb61f1d938
commit 4d0c3d57c8
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
bin/ruby-build
View file

@ -531,7 +531,7 @@ build_package_warn_unsupported() {
} >&3
}
build_package_standard() {
build_package_standard_build() {
local package_name="$1"
if [ "${MAKEOPTS+defined}" ]; then
@ -548,8 +548,6 @@ build_package_standard() {
local PACKAGE_CONFIGURE_OPTS_ARRAY="${package_var_name}_CONFIGURE_OPTS_ARRAY[@]"
local PACKAGE_MAKE_OPTS="${package_var_name}_MAKE_OPTS"
local PACKAGE_MAKE_OPTS_ARRAY="${package_var_name}_MAKE_OPTS_ARRAY[@]"
local PACKAGE_MAKE_INSTALL_OPTS="${package_var_name}_MAKE_INSTALL_OPTS"
local PACKAGE_MAKE_INSTALL_OPTS_ARRAY="${package_var_name}_MAKE_INSTALL_OPTS_ARRAY[@]"
local PACKAGE_CFLAGS="${package_var_name}_CFLAGS"
if [ "$package_var_name" = "RUBY" ]; then
@ -566,20 +564,35 @@ build_package_standard() {
$CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} "${!PACKAGE_CONFIGURE_OPTS_ARRAY}" || return 1
) >&4 2>&1
{ "$MAKE" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} "${!PACKAGE_MAKE_OPTS_ARRAY}"
} >&4 2>&1
}
if [ "$package_name" == "ruby-trunk" ]; then
{ "$MAKE" update-gems
"$MAKE" extract-gems
} >&4 2>&1
fi
build_package_standard_install() {
local package_name="$1"
local package_var_name="$(capitalize "${package_name%%-*}")"
local PACKAGE_MAKE_INSTALL_OPTS="${package_var_name}_MAKE_INSTALL_OPTS"
local PACKAGE_MAKE_INSTALL_OPTS_ARRAY="${package_var_name}_MAKE_INSTALL_OPTS_ARRAY[@]"
{ "$MAKE" install $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"
} >&4 2>&1
}
build_package_standard_install_with_bundled_gems() {
{ "$MAKE" update-gems
"$MAKE" extract-gems
} >&4 2>&1
build_package_standard_install
}
# Backword Compatibility for standard function
build_package_standard() {
build_package_standard_build
build_package_standard_install
}
build_package_autoconf() {
{ autoconf
} >&4 2>&1