-
-
Notifications
You must be signed in to change notification settings - Fork 905
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2125 from sparklemotion/2078-fix-rake-compiler-na…
…tive-things native gems are built with `ExtensionTask.no_native=true` --- **What problem is this PR intended to solve?** Specifically, following the advice of @kou at rake-compiler/rake-compiler#171, we set `Rake::ExtensionTask.no_native=true` within the rake-compiler-dock container ("guest") so that: - the ExtensionTask `cross_compiling` block is called - so that we don't package the dependencies' tarballs in /ports - so that we don't have mini_portile2 as a dependency (#2078) - so that we don't have an extra nokogiri.so/nokogiri.bundle built and packaged (#2076) - we no longer have to hotfix rake-compiler at build time This also will enable us to more easily do things like removing the C extension source code from the native gem package (#2077). This patch set also breaks out `lib/nokogiri/version.rb` into two new files: - `lib/nokogiri/version/constant.rb` - `lib/nokogiri/version/info.rb` and `require_relative`s them both from `version.rb`. This is so that Hoe doesn't pull in `REQUIRED_LIBXML_VERSION` from `extconf.rb` after 652c6fd extracted that value into a constant. This patch set also updates how Darwin native gems are built, to mirror the same rake task structure that's used for Linux and Windows; and it renames to "builder" the rake tasks that used to be "guest". **Have you included adequate test coverage?** I'm satisfied with the level of testing we have now on different platforms, though it could always be better. I will add some testing to the packaged/installed gem when I merge #1788 which introduces that test coverage pretty nicely. **Does this change affect the behavior of either the C or the Java implementations?** Should only impact how the native (precompiled) gems are built and packaged.
- Loading branch information
Showing
9 changed files
with
242 additions
and
221 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,155 +1,3 @@ | ||
| # frozen_string_literal: true | ||
| module Nokogiri | ||
| # The version of Nokogiri you are using | ||
| VERSION = "1.11.0.rc3" | ||
|
|
||
| class VersionInfo # :nodoc: | ||
| def jruby? | ||
| ::JRUBY_VERSION if RUBY_PLATFORM == "java" | ||
| end | ||
|
|
||
| def engine | ||
| defined?(RUBY_ENGINE) ? RUBY_ENGINE : "mri" | ||
| end | ||
|
|
||
| def loaded_libxml_version | ||
| Gem::Version.new(LIBXML_LOADED_VERSION. | ||
| scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first. | ||
| collect(&:to_i). | ||
| join(".")) | ||
| end | ||
|
|
||
| def compiled_libxml_version | ||
| Gem::Version.new LIBXML_COMPILED_VERSION | ||
| end | ||
|
|
||
| def loaded_libxslt_version | ||
| Gem::Version.new(LIBXSLT_LOADED_VERSION. | ||
| scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first. | ||
| collect(&:to_i). | ||
| join(".")) | ||
| end | ||
|
|
||
| def compiled_libxslt_version | ||
| Gem::Version.new LIBXSLT_COMPILED_VERSION | ||
| end | ||
|
|
||
| def libxml2? | ||
| defined?(LIBXML_COMPILED_VERSION) | ||
| end | ||
|
|
||
| def libxml2_has_iconv? | ||
| defined?(LIBXML_ICONV_ENABLED) && LIBXML_ICONV_ENABLED | ||
| end | ||
|
|
||
| def libxml2_using_system? | ||
| !libxml2_using_packaged? | ||
| end | ||
|
|
||
| def libxml2_using_packaged? | ||
| NOKOGIRI_USE_PACKAGED_LIBRARIES | ||
| end | ||
|
|
||
| def warnings | ||
| warnings = [] | ||
|
|
||
| if libxml2? | ||
| if compiled_libxml_version != loaded_libxml_version | ||
| warnings << "Nokogiri was built against libxml version #{compiled_libxml_version}, but has dynamically loaded #{loaded_libxml_version}" | ||
| end | ||
|
|
||
| if compiled_libxslt_version != loaded_libxslt_version | ||
| warnings << "Nokogiri was built against libxslt version #{compiled_libxslt_version}, but has dynamically loaded #{loaded_libxslt_version}" | ||
| end | ||
| end | ||
|
|
||
| warnings | ||
| end | ||
|
|
||
| def to_hash | ||
| {}.tap do |vi| | ||
| vi["warnings"] = [] | ||
| vi["nokogiri"] = Nokogiri::VERSION | ||
| vi["ruby"] = {}.tap do |ruby| | ||
| ruby["version"] = ::RUBY_VERSION | ||
| ruby["platform"] = ::RUBY_PLATFORM | ||
| ruby["gem_platform"] = ::Gem::Platform.local.to_s | ||
| ruby["description"] = ::RUBY_DESCRIPTION | ||
| ruby["engine"] = engine | ||
| ruby["jruby"] = jruby? if jruby? | ||
| end | ||
|
|
||
| if libxml2? | ||
| vi["libxml"] = {}.tap do |libxml| | ||
| if libxml2_using_packaged? | ||
| libxml["source"] = "packaged" | ||
| libxml["patches"] = NOKOGIRI_LIBXML2_PATCHES | ||
| else | ||
| libxml["source"] = "system" | ||
| end | ||
| libxml["compiled"] = compiled_libxml_version.to_s | ||
| libxml["loaded"] = loaded_libxml_version.to_s | ||
| libxml["iconv_enabled"] = libxml2_has_iconv? | ||
| end | ||
|
|
||
| vi["libxslt"] = {}.tap do |libxslt| | ||
| if libxml2_using_packaged? | ||
| libxslt["source"] = "packaged" | ||
| libxslt["patches"] = NOKOGIRI_LIBXSLT_PATCHES | ||
| else | ||
| libxslt["source"] = "system" | ||
| end | ||
| libxslt["compiled"] = compiled_libxslt_version.to_s | ||
| libxslt["loaded"] = loaded_libxslt_version.to_s | ||
| end | ||
|
|
||
| vi["warnings"] = warnings | ||
| elsif jruby? | ||
| vi["xerces"] = Nokogiri::XERCES_VERSION | ||
| vi["nekohtml"] = Nokogiri::NEKO_VERSION | ||
| end | ||
| end | ||
| end | ||
|
|
||
| def to_markdown | ||
| begin | ||
| require "psych" | ||
| rescue LoadError | ||
| end | ||
| require "yaml" | ||
| "# Nokogiri (#{Nokogiri::VERSION})\n" + | ||
| YAML.dump(to_hash).each_line.map { |line| " #{line}" }.join | ||
| end | ||
|
|
||
| # FIXME: maybe switch to singleton? | ||
| @@instance = new | ||
| @@instance.warnings.each do |warning| | ||
| warn "WARNING: #{warning}" | ||
| end | ||
| def self.instance; @@instance; end | ||
| end | ||
|
|
||
| def self.uses_libxml?(requirement = nil) # :nodoc: | ||
| return false unless VersionInfo.instance.libxml2? | ||
| return true unless requirement | ||
| return Gem::Requirement.new(requirement).satisfied_by?(VersionInfo.instance.loaded_libxml_version) | ||
| end | ||
|
|
||
| def self.jruby? # :nodoc: | ||
| VersionInfo.instance.jruby? | ||
| end | ||
|
|
||
| # Ensure constants used in this file are loaded - see #1896 | ||
| if Nokogiri.jruby? | ||
| require "nokogiri/jruby/dependencies" | ||
| end | ||
| begin | ||
| RUBY_VERSION =~ /(\d+\.\d+)/ | ||
| require "nokogiri/#{$1}/nokogiri" | ||
| rescue LoadError | ||
| require "nokogiri/nokogiri" | ||
| end | ||
|
|
||
| # More complete version information about libxml | ||
| VERSION_INFO = VersionInfo.instance.to_hash | ||
| end | ||
| require_relative "version/constant" | ||
| require_relative "version/info" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # frozen_string_literal: true | ||
| module Nokogiri | ||
| # The version of Nokogiri you are using | ||
| VERSION = "1.11.0.rc3" | ||
| end |
Oops, something went wrong.