Merge pull request #2318 from rbenv/with-bundled-gems (cba395e4) · Commits · mirror / rbenv / ruby-build mirror

bin/ruby-build

+11 −15

Original line number	Diff line number	Diff line
		@@ -634,7 +634,7 @@ build_package_warn_unsupported() {
		} >&2
		}

		build_package_standard_build() {
		build_package_standard() {
		local package_name="$1"

		if [ "${MAKEOPTS+defined}" ]; then
		@@ -708,13 +708,7 @@ build_package_standard_build() {
		sed "s:\$[[:space:]]Check\$ \$ext/.\$:\\1 ${PWD}/\\2:" >&2
		fi

		return $status
		}

		build_package_standard_install() {
		local package_name="$1"
		local package_var_name
		package_var_name="$(capitalize "${package_name%%-*}")"
		[ $status -eq 0 ] \|\| return $status

		local PACKAGE_MAKE_INSTALL_OPTS="${package_var_name}_MAKE_INSTALL_OPTS"
		local PACKAGE_MAKE_INSTALL_OPTS_ARRAY="${package_var_name}_MAKE_INSTALL_OPTS_ARRAY[@]"
		@@ -724,17 +718,19 @@ build_package_standard_install() {
		capture_command "$MAKE" ${MAKE_INSTALL_TARGET:-install} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}" $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS}
		}

		# Used in place of "standard" step for building development branches of Ruby.
		build_package_standard_install_with_bundled_gems() {
		capture_command "$MAKE" update-gems
		capture_command "$MAKE" extract-gems
		MAKE_INSTALL_TARGET="update-gems extract-gems install" build_package_standard "$@"
		}

		build_package_standard_install "$@"
		# Kept for backward compatibility with 3rd-party Ruby definitions.
		build_package_standard_build() {
		true
		}

		# Backward Compatibility for standard function
		build_package_standard() {
		build_package_standard_build "$@"
		build_package_standard_install "$@"
		# Kept for backward compatibility with 3rd-party Ruby definitions.
		build_package_standard_install() {
		build_package_standard "$@"
		}

		build_package_autoconf() {

share/ruby-build/2.2.0-dev

+1 −1

install_package "openssl-1.0.2u" "https://www.openssl.org/source/openssl-1.0.2u.tar.gz#ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16" openssl --if needs_openssl:0.9.6-1.0.x

install_git "ruby-2.2.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_2" warn_eol autoconf standard_build standard_install_with_bundled_gems

install_git "ruby-2.2.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_2" warn_eol autoconf standard_install_with_bundled_gems

share/ruby-build/2.3.0-dev

+1 −1

install_package "openssl-1.0.2u" "https://www.openssl.org/source/openssl-1.0.2u.tar.gz#ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16" openssl --if needs_openssl:0.9.6-1.0.x

install_git "ruby-2.3.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_3" warn_eol autoconf standard_build standard_install_with_bundled_gems

install_git "ruby-2.3.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_3" warn_eol autoconf standard_install_with_bundled_gems

share/ruby-build/2.4.0-dev

+1 −1

install_package "openssl-1.1.1w" "https://www.openssl.org/source/openssl-1.1.1w.tar.gz#cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8" openssl --if needs_openssl:1.0.1-1.x.x

install_git "ruby-2.4.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_4" warn_eol autoconf standard_build standard_install_with_bundled_gems

install_git "ruby-2.4.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_4" warn_eol autoconf standard_install_with_bundled_gems

share/ruby-build/2.5.0-dev

+1 −1

install_package "openssl-1.1.1w" "https://www.openssl.org/source/openssl-1.1.1w.tar.gz#cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8" openssl --if needs_openssl:1.0.1-1.x.x

install_git "ruby-2.5.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_5" warn_eol autoconf standard_build standard_install_with_bundled_gems

install_git "ruby-2.5.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_5" warn_eol autoconf standard_install_with_bundled_gems