Unverified Commit 4d0c3d57 authored by SHIBATA Hiroshi's avatar SHIBATA Hiroshi
Browse files

Separated standard function to standard_build and standard_install. 

  * 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.
parent eb61f1d9

bin/ruby-build

+22 −9
Original line number Diff line number Diff line
@@ -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,18 +564,33 @@ 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

}



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[@]"



  if [ "$package_name" == "ruby-trunk" ]; then

  { "$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

  fi



  { "$MAKE" install $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"

  } >&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() {