diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index 58fbeba403c4..1e58e0f153dd 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -1,358 +1,358 @@ # Provide support for Ruby releated ports. # # Feature: ruby # Usage: USES=ruby[:args,..] # Valid ARGS: build, extconf, run, setup # ARGS description: # build Says that ruby is required only for build time. # extconf Says that the port uses extconf.rb to configure. # none Says that no dependency is added to the port. # Intended to be used with lang/ruby*. # run Says that ruby is required only for run time. # setup Says that the port uses setup.rb to configure and # build. # # [variables that a user may define] # # RUBY_VER - (See below) # RUBY_DEFAULT_VER - Set to (e.g.) "3.1" if you want to refer to "ruby31" # just as "ruby". # RUBY_ARCH - (See below) # # [variables that each port can define] # # RUBY - Set to full path of ruby. If you set this, the values # of the following variables are automatically obtained # from the ruby executable: RUBY_VER, RUBY_VERSION, # RUBY_ARCH, RUBY_LIBDIR, RUBY_ARCHLIBDIR, # RUBY_SITELIBDIR, and RUBY_SITEARCHLIBDIR. # RUBY_VER - Set to the alternative short version of ruby in the # form of `x.y' (see below for current value). # RUBY_EXTCONF - Set to the alternative name of extconf.rb # (default: extconf.rb). # RUBY_EXTCONF_SUBDIRS - Set to list of subdirectories, if multiple modules # are included. # RUBY_SETUP - Set to the alternative name of setup.rb # (default: setup.rb). # # [variables that each port should not (re)define] # # RUBY_PKGNAMEPREFIX - Common PKGNAMEPREFIX for ruby ports # (default: ruby${RUBY_SUFFIX}-) # RUBY_VERSION - Full version of ruby without preview/beta suffix in # the form of `x.y.z' (see below for current value). # RUBY_VERSION_CODE - Integer version of RUBY_VERSION in the form of # `xyz'. # RUBY_DISTVERSION - DISTVERSION for the standard ruby ports (ruby, # ruby-gdbm, etc.). # RUBY_PORTVERSION - PORTVERSION for the standard ruby ports (ruby, # ruby-gdbm, etc.). # RUBY_PORTREVISION - PORTREVISION for the standard ruby ports. # RUBY_PORTEPOCH - PORTEPOCH for the standard ruby ports. # RUBY_DISTNAME - DISTNAME for the standard ruby ports, i.e. the # basename of the ruby distribution tarball. # RUBY_PATCHFILES - PATCHFILES for the standard ruby ports, i.e. the # basename of the ruby distribution tarball. # RUBY_WRKSRC - WRKSRC for the ruby port. # MASTER_SITE_SUBDIR_RUBY - MASTER_SITE_SUBDIR for the ruby distfiles. # # RUBY_SHLIBVER - Major version of libruby (see below for current # value). # RUBY_ARCH - Set to target architecture name. # (e.g. i386-freebsd7) # RUBY_SUFFIX - Suffix for ruby binaries and directories # (${RUBY_VER:S/.//}). # RUBY_WITHOUT_SUFFIX - Always ${LOCALBASE}/bin/ruby. # RUBY_WITH_SUFFIX - Always ${RUBY_WITHOUT_SUFFIX}${RUBY_SUFFIX}. # # RUBY_MODNAME - Set to the module name (default: ${PORTNAME}). # # RUBY_BASE_PORT - Port path of base ruby without PORTSDIR, without # suffix except version. # RUBY_PORT - Port path of ruby without PORTSDIR. # # DEPEND_RUBY - BUILD_DEPENDS/RUN_DEPENDS entry for ruby. # # RUBY_LIBDIR - Installation path for architecture independent # libraries. # RUBY_ARCHLIBDIR - Installation path for architecture dependent # libraries. # RUBY_SITELIBDIR - Installation path for site architecture independent # libraries. # RUBY_SITEARCHLIBDIR - Installation path for site architecture dependent # libraries. # RUBY_DOCDIR - Installation path for documents. # RUBY_EXAMPLESDIR - Installation path for examples. # RUBY_RIDIR - Installation path for site architecture independent ri # documents. # RUBY_SITERIDIR - Installation path for site architecture dependent ri # documents. # RUBY_MODDOCDIR - Installation path for the module's documents. # RUBY_MODEXAMPLESDIR - Installation path for the module's examples. # # MAINTAINER: ruby@FreeBSD.org .if !defined(_INCLUDE_USES_RUBY_MK) _INCLUDE_USES_RUBY_MK= yes _valid_ARGS= build extconf none run setup # "USES=gem" implies "USES=ruby" . if defined(_INCLUDE_USES_GEM_MK) ruby_ARGS= . endif # Sanity check . for arg in ${ruby_ARGS} . if empty(_valid_ARGS:M${arg}) IGNORE= Incorrect 'USES+= ruby:${ruby_ARGS}' usage: argument [${arg}] is not recognized . endif . endfor . if defined(RUBY_DEFAULT_VER) WARNING+= "RUBY_DEFAULT_VER is defined, consider using DEFAULT_VERSIONS=ruby=${RUBY_DEFAULT_VER} instead" . endif RUBY_DEFAULT_VER?= ${RUBY_DEFAULT} RUBY_VER?= ${RUBY_DEFAULT_VER} . if defined(RUBY) . if !exists(${RUBY}) IGNORE= cannot install: you set the variable RUBY to "${RUBY}", but it does not seem to exist. Please specify an already installed ruby executable . endif _RUBY_TEST!= ${RUBY} -e 'begin; require "rbconfig"; puts "ok" ; rescue LoadError; puts "error"; end' . if !empty(_RUBY_TEST) && ${_RUBY_TEST} != "ok" IGNORE= cannot install: you set the variable RUBY to "${RUBY}", but it failed to include rbconfig. Please specify a properly installed ruby executable . endif _RUBY_CONFIG= ${RUBY} -r rbconfig -e 'C = RbConfig::CONFIG' -e RUBY_VERSION!= ${_RUBY_CONFIG} 'puts C["ruby_version"]' RUBY_SUFFIX?= # empty RUBY_ARCH!= ${_RUBY_CONFIG} 'puts C["target"]' _RUBY_SYSLIBDIR!= ${_RUBY_CONFIG} 'puts C["libdir"]' _RUBY_SITEDIR!= ${_RUBY_CONFIG} 'puts C["sitedir"]' _RUBY_VENDORDIR!= ${_RUBY_CONFIG} 'puts C["vendordir"]' . else RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} . if defined(RUBY_VER) # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. . if ${RUBY_VER} == 3.1 # # Ruby 3.1 # RUBY_DISTVERSION= 3.1.6 RUBY_PORTREVISION= 0 . elif ${RUBY_VER} == 3.2 # # Ruby 3.2 # -RUBY_DISTVERSION= 3.2.5 +RUBY_DISTVERSION= 3.2.6 RUBY_PORTREVISION= 0 . elif ${RUBY_VER} == 3.3 # # Ruby 3.3 # RUBY_DISTVERSION= 3.3.5 RUBY_PORTREVISION= 0 # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. . else # # Other versions # IGNORE= Only ruby 3.1, 3,2 and 3.3 are supported _INVALID_RUBY_VER= 1 . endif RUBY_PORTEPOCH= 1 RUBY_VERSION= ${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} . endif # defined(RUBY_VER) . if !defined(_INVALID_RUBY_VER) RUBY31?= "@comment " RUBY32?= "@comment " RUBY33?= "@comment " . if defined(BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}) . if ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} == "yes" BROKEN= does not build with Ruby ${RUBY_VER} . else BROKEN= ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} . endif . endif RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \ --with-rubylibprefix="${PREFIX}/lib/ruby" \ --docdir="${RUBY_DOCDIR}" \ --with-soname=ruby${RUBY_SUFFIX} CONFIGURE_TARGET?= ${ARCH}-portbld-${OPSYS:tl}${OSREL:C/\..*//} RUBY_ARCH?= ${ARCH}-${OPSYS:tl}${OSREL:C/\..*//} _RUBY_SYSLIBDIR?= ${PREFIX}/lib _RUBY_SITEDIR?= ${_RUBY_SYSLIBDIR}/ruby/site_ruby _RUBY_VENDORDIR?= ${_RUBY_SYSLIBDIR}/ruby/vendor_ruby . endif . endif # defined(RUBY) . if !defined(_INVALID_RUBY_VER) RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//} RUBY_PORTVERSION?= ${RUBY_DISTVERSION:tl:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g} MASTER_SITE_SUBDIR_RUBY?= ${RUBY_VER} RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} RUBY_RELVERSION_CODE?= ${RUBY_RELVERSION:S/.//g} RUBY_VERSION_CODE?= ${RUBY_VERSION:S/.//g} RUBY_VER= ${RUBY_VERSION:C/([[:digit:]]+\.[[:digit:]]+).*/\1/} RUBY_SUFFIX= ${RUBY_VER:S/.//} RUBY_WITHOUT_SUFFIX?= ${LOCALBASE}/bin/ruby RUBY_WITH_SUFFIX?= ${RUBY_WITHOUT_SUFFIX}${RUBY_SUFFIX} RUBY_PKGNAMEPREFIX?= ruby${RUBY_SUFFIX}- RUBY_SHLIBVER?= ${RUBY_VER:S/.//} RUBY_CONFIGURE_ARGS+= --program-prefix="" . if ${RUBY_VER} != ${RUBY_DEFAULT_VER} DEPENDS_ARGS+= RUBY_VER=${RUBY_VER} . endif RUBY_CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" RUBY_MODNAME?= ${PORTNAME} # Ports RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//} RUBY_PORT?= ${RUBY_BASE_PORT} # Depends DEPEND_RUBY?= ${RUBY}:${RUBY_PORT} # Directories RUBY_LIBDIR?= ${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER} RUBY_ARCHLIBDIR?= ${RUBY_LIBDIR}/${RUBY_ARCH} RUBY_SITELIBDIR?= ${_RUBY_SITEDIR}/${RUBY_VER} RUBY_SITEARCHLIBDIR?= ${RUBY_SITELIBDIR}/${RUBY_ARCH} RUBY_VENDORLIBDIR?= ${_RUBY_VENDORDIR}/${RUBY_VER} RUBY_VENDORARCHLIBDIR?= ${RUBY_VENDORLIBDIR}/${RUBY_ARCH} RUBY_DOCDIR?= ${PREFIX}/share/doc/ruby${RUBY_SUFFIX} RUBY_EXAMPLESDIR?= ${PREFIX}/share/examples/ruby${RUBY_SUFFIX} RUBY_RIDIR?= ${PREFIX}/share/ri/${RUBY_VER}/system RUBY_SITERIDIR?= ${PREFIX}/share/ri/${RUBY_VER}/site RUBY_MODDOCDIR?= ${RUBY_DOCDIR}/${RUBY_MODNAME} RUBY_MODEXAMPLESDIR?= ${RUBY_EXAMPLESDIR}/${RUBY_MODNAME} # PLIST PLIST_RUBY_DIRS= RUBY_LIBDIR="${RUBY_LIBDIR}" \ RUBY_ARCHLIBDIR="${RUBY_ARCHLIBDIR}" \ RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" \ RUBY_SITEARCHLIBDIR="${RUBY_SITEARCHLIBDIR}" \ RUBY_VENDORLIBDIR="${RUBY_VENDORLIBDIR}" \ RUBY_VENDORARCHLIBDIR="${RUBY_VENDORARCHLIBDIR}" \ RUBY_MODDOCDIR="${RUBY_MODDOCDIR}" \ RUBY_MODEXAMPLESDIR="${RUBY_MODEXAMPLESDIR}" \ RUBY_DOCDIR="${RUBY_DOCDIR}" \ RUBY_EXAMPLESDIR="${RUBY_EXAMPLESDIR}" \ RUBY_RIDIR="${RUBY_RIDIR}" \ RUBY_SITERIDIR="${RUBY_SITERIDIR}" PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \ RUBY_VERSION="${RUBY_VERSION}" \ RUBY_VER="${RUBY_VER}" \ RUBY_SHLIBVER="${RUBY_SHLIBVER}" \ RUBY_ARCH="${RUBY_ARCH}" \ RUBY_SUFFIX="${RUBY_SUFFIX}" \ RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" . if ${PORT_OPTIONS:MDEBUG} RUBY_FLAGS+= -d . endif # # extconf.rb support # . if ${ruby_ARGS:Mextconf} RUBY_EXTCONF?= extconf.rb CONFIGURE_ARGS+= --with-opt-dir="${LOCALBASE}" CONFIGURE_ENV+= RB_USER_INSTALL=yes do-configure: ruby-extconf-configure ruby-extconf-configure: . if defined(RUBY_EXTCONF_SUBDIRS) . for d in ${RUBY_EXTCONF_SUBDIRS} @${ECHO_MSG} "===> Running ${RUBY_EXTCONF} in ${d} to configure" @cd ${CONFIGURE_WRKSRC}/${d}; \ ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS} . endfor . else @${ECHO_MSG} "===> Running ${RUBY_EXTCONF} to configure" @cd ${CONFIGURE_WRKSRC}; \ ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS} . endif . endif # # setup.rb support # . if ${ruby_ARGS:Msetup} RUBY_SETUP?= setup.rb do-configure: ruby-setup-configure ruby-setup-configure: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to configure" @cd ${BUILD_WRKSRC}; \ ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} config ${CONFIGURE_ARGS} do-build: ruby-setup-build ruby-setup-build: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to build" @cd ${BUILD_WRKSRC}; \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} setup do-install: ruby-setup-install ruby-setup-install: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to install" @cd ${INSTALL_WRKSRC}; \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR} . endif . if !${ruby_ARGS:Mbuild} && !${ruby_ARGS:Mrun} && !${ruby_ARGS:Mnone} EXTRACT_DEPENDS+= ${DEPEND_RUBY} PATCH_DEPENDS+= ${DEPEND_RUBY} BUILD_DEPENDS+= ${DEPEND_RUBY} RUN_DEPENDS+= ${DEPEND_RUBY} . elif ${ruby_ARGS:Mbuild} EXTRACT_DEPENDS+= ${DEPEND_RUBY} PATCH_DEPENDS+= ${DEPEND_RUBY} BUILD_DEPENDS+= ${DEPEND_RUBY} . elif ${ruby_ARGS:Mrun} RUN_DEPENDS+= ${DEPEND_RUBY} . endif . endif # _INVALID_RUBY_VER .endif diff --git a/lang/ruby32/distinfo b/lang/ruby32/distinfo index 1981a560aaf7..4798229c81e3 100644 --- a/lang/ruby32/distinfo +++ b/lang/ruby32/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723780635 -SHA256 (ruby/ruby-3.2.5.tar.xz) = 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c -SIZE (ruby/ruby-3.2.5.tar.xz) = 15189072 +TIMESTAMP = 1730295152 +SHA256 (ruby/ruby-3.2.6.tar.xz) = 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb +SIZE (ruby/ruby-3.2.6.tar.xz) = 15126888 diff --git a/lang/ruby32/files/patch-tool_rbinstall.rb b/lang/ruby32/files/patch-tool_rbinstall.rb index 039e80baaed0..81d17b5f59cf 100644 --- a/lang/ruby32/files/patch-tool_rbinstall.rb +++ b/lang/ruby32/files/patch-tool_rbinstall.rb @@ -1,158 +1,178 @@ ---- tool/rbinstall.rb.orig 2023-03-30 11:06:29 UTC +--- tool/rbinstall.rb.orig 2024-10-30 09:47:11 UTC +++ tool/rbinstall.rb -@@ -909,155 +909,6 @@ end +@@ -909,175 +909,6 @@ end # :startdoc: -install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do - install_default_gem('lib', srcdir, bindir) -end -install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do - install_default_gem('ext', srcdir, bindir) -end - -def load_gemspec(file, base = nil) - file = File.realpath(file) - code = File.read(file, encoding: "utf-8:-") - code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split\([^\)]*\)/m) do - files = [] - if base - Dir.glob("**/*", File::FNM_DOTMATCH, base: base) do |n| - case File.basename(n); when ".", ".."; next; end - next if File.directory?(File.join(base, n)) - files << n.dump - end - end - "[" + files.join(", ") + "]" - end - spec = eval(code, binding, file) - unless Gem::Specification === spec - raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)." - end - spec.loaded_from = base ? File.join(base, File.basename(file)) : file - spec.files.reject! {|n| n.end_with?(".gemspec") or n.start_with?(".git")} - spec.date = RUBY_RELEASE_DATE - - spec -end - -def install_default_gem(dir, srcdir, bindir) - gem_dir = Gem.default_dir - install_dir = with_destdir(gem_dir) - prepare "default gems from #{dir}", gem_dir - RbInstall.no_write do - makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)}) - end - - options = { - :install_dir => with_destdir(gem_dir), - :bin_dir => with_destdir(bindir), - :ignore_dependencies => true, - :dir_mode => $dir_mode, - :data_mode => $data_mode, - :prog_mode => $script_mode, - :wrappers => true, - :format_executable => true, - :install_as_default => true, - } - default_spec_dir = Gem.default_specifications_dir - - base = "#{srcdir}/#{dir}" - gems = Dir.glob("**/*.gemspec", base: base).map {|src| - spec = load_gemspec("#{base}/#{src}") - file_collector = RbInstall::Specs::FileCollector.for(srcdir, dir, src) - files = file_collector.collect - if file_collector.skip_install?(files) - next - end - spec.files = files - spec - } - gems.compact.sort_by(&:name).each do |gemspec| - old_gemspecs = Dir[File.join(with_destdir(default_spec_dir), "#{gemspec.name}-*.gemspec")] - if old_gemspecs.size > 0 - old_gemspecs.each {|spec| rm spec } - end - - full_name = "#{gemspec.name}-#{gemspec.version}" - - gemspec.loaded_from = File.join srcdir, gemspec.spec_name - - package = RbInstall::DirPackage.new gemspec, {gemspec.bindir => 'libexec'} - ins = RbInstall::UnpackedInstaller.new(package, options) - puts "#{INDENT}#{gemspec.name} #{gemspec.version}" - ins.install - end -end - -install?(:ext, :comm, :gem, :'bundled-gems') do - gem_dir = Gem.default_dir - install_dir = with_destdir(gem_dir) - prepare "bundled gems", gem_dir - RbInstall.no_write do - makedirs(Gem.ensure_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)}) - end - - installed_gems = {} +- skipped = {} - options = { - :install_dir => install_dir, - :bin_dir => with_destdir(bindir), - :domain => :local, - :ignore_dependencies => true, - :dir_mode => $dir_mode, - :data_mode => $data_mode, - :prog_mode => $script_mode, - :wrappers => true, - :format_executable => true, - } - - extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir - specifications_dir = File.join(gem_dir, "specifications") - build_dir = Gem::StubSpecification.gemspec_stub("", ".bundle", ".bundle").extensions_dir - - # We are about to build extensions, and want to configure extensions with the - # newly installed ruby. - Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) - # Prevent fake.rb propagation. It conflicts with the natural mkmf configs of - # the newly installed ruby. - ENV.delete('RUBYOPT') - - File.foreach("#{srcdir}/gems/bundled_gems") do |name| - next if /^\s*(?:#|$)/ =~ name - next unless /^(\S+)\s+(\S+).*/ =~ name +- gem = $1 - gem_name = "#$1-#$2" -- # Try to find the gemspec file for C ext gems -- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec -- # This gemspec keep the original dependencies -- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" +- # Try to find the original gemspec file +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem}.gemspec" - unless File.exist?(path) -- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" -- next unless File.exist?(path) +- # Try to find the gemspec file for C ext gems +- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec +- # This gemspec keep the original dependencies +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" +- unless File.exist?(path) +- # Try to find the gemspec file for gems that hasn't own gemspec +- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" +- unless File.exist?(path) +- skipped[gem_name] = "gemspec not found" +- next +- end +- end - end - spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}") -- next unless spec.platform == Gem::Platform::RUBY -- next unless spec.full_name == gem_name +- unless spec.platform == Gem::Platform::RUBY +- skipped[gem_name] = "not ruby platform (#{spec.platform})" +- next +- end +- unless spec.full_name == gem_name +- skipped[gem_name] = "full name unmatch #{spec.full_name}" +- next +- end - spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" - package = RbInstall::DirPackage.new spec - ins = RbInstall::UnpackedInstaller.new(package, options) - puts "#{INDENT}#{spec.name} #{spec.version}" - ins.install - install_recursive("#{build_dir}/#{gem_name}", "#{extensions_dir}/#{gem_name}") do |src, dest| - # puts "#{INDENT} #{dest[extensions_dir.size+gem_name.size+2..-1]}" - install src, dest, :mode => (File.executable?(src) ? $prog_mode : $data_mode) - end - installed_gems[spec.full_name] = true - end - installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} - unless installed_gems.empty? - prepare "bundled gem cache", gem_dir+"/cache" - install installed_gems, gem_dir+"/cache" - end - unless gems.empty? -- puts "skipped bundled gems: #{gems.join(' ')}" +- skipped.default = "not found in bundled_gems" +- puts "skipped bundled gems:" +- gems.each do |gem| +- printf " %-32s%s\n", File.basename(gem), skipped[gem] +- end - end -end - parse_args() include FileUtils