nokogiri 1.11.4-java → 1.12.0-java
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of nokogiri might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/LICENSE-DEPENDENCIES.md +243 -22
- data/LICENSE.md +1 -1
- data/README.md +6 -5
- data/ext/java/nokogiri/{HtmlDocument.java → Html4Document.java} +8 -22
- data/ext/java/nokogiri/{HtmlElementDescription.java → Html4ElementDescription.java} +6 -6
- data/ext/java/nokogiri/{HtmlEntityLookup.java → Html4EntityLookup.java} +5 -5
- data/ext/java/nokogiri/{HtmlSaxParserContext.java → Html4SaxParserContext.java} +13 -13
- data/ext/java/nokogiri/{HtmlSaxPushParser.java → Html4SaxPushParser.java} +14 -14
- data/ext/java/nokogiri/NokogiriService.java +20 -20
- data/ext/java/nokogiri/XmlAttr.java +2 -2
- data/ext/java/nokogiri/XmlDocument.java +14 -14
- data/ext/java/nokogiri/XmlElementContent.java +5 -5
- data/ext/java/nokogiri/XmlNode.java +74 -74
- data/ext/java/nokogiri/XmlSaxPushParser.java +2 -2
- data/ext/java/nokogiri/XmlSyntaxError.java +1 -1
- data/ext/java/nokogiri/XmlXpathContext.java +9 -9
- data/ext/java/nokogiri/XsltStylesheet.java +8 -8
- data/ext/java/nokogiri/internals/HtmlDomParserContext.java +4 -4
- data/ext/java/nokogiri/internals/NokogiriHandler.java +1 -1
- data/ext/java/nokogiri/internals/NokogiriHelpers.java +57 -57
- data/ext/java/nokogiri/internals/SaveContextVisitor.java +24 -24
- data/ext/java/nokogiri/internals/c14n/CanonicalizerBase.java +105 -105
- data/ext/java/nokogiri/internals/c14n/XMLUtils.java +30 -30
- data/ext/java/nokogiri/internals/dom2dtm/DOM2DTM.java +87 -87
- data/ext/java/nokogiri/internals/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java +95 -95
- data/ext/nokogiri/depend +35 -34
- data/ext/nokogiri/extconf.rb +181 -103
- data/ext/nokogiri/gumbo.c +584 -0
- data/ext/nokogiri/{html_document.c → html4_document.c} +8 -8
- data/ext/nokogiri/{html_element_description.c → html4_element_description.c} +20 -18
- data/ext/nokogiri/{html_entity_lookup.c → html4_entity_lookup.c} +7 -7
- data/ext/nokogiri/{html_sax_parser_context.c → html4_sax_parser_context.c} +5 -5
- data/ext/nokogiri/{html_sax_push_parser.c → html4_sax_push_parser.c} +4 -4
- data/ext/nokogiri/libxml2_backwards_compat.c +30 -30
- data/ext/nokogiri/nokogiri.c +70 -38
- data/ext/nokogiri/xml_document.c +13 -13
- data/ext/nokogiri/xml_element_content.c +2 -0
- data/ext/nokogiri/xml_encoding_handler.c +11 -6
- data/ext/nokogiri/xml_namespace.c +2 -0
- data/ext/nokogiri/xml_node.c +118 -110
- data/ext/nokogiri/xml_node_set.c +20 -20
- data/ext/nokogiri/xml_reader.c +2 -0
- data/ext/nokogiri/xml_sax_parser.c +6 -6
- data/ext/nokogiri/xml_sax_parser_context.c +2 -0
- data/ext/nokogiri/xml_schema.c +2 -0
- data/ext/nokogiri/xml_xpath_context.c +67 -65
- data/ext/nokogiri/xslt_stylesheet.c +2 -1
- data/gumbo-parser/CHANGES.md +63 -0
- data/gumbo-parser/Makefile +101 -0
- data/gumbo-parser/THANKS +27 -0
- data/lib/nokogiri.rb +31 -29
- data/lib/nokogiri/css.rb +14 -14
- data/lib/nokogiri/css/parser.rb +1 -1
- data/lib/nokogiri/css/parser.y +1 -1
- data/lib/nokogiri/css/syntax_error.rb +1 -1
- data/lib/nokogiri/extension.rb +2 -2
- data/lib/nokogiri/gumbo.rb +14 -0
- data/lib/nokogiri/html.rb +31 -27
- data/lib/nokogiri/html4.rb +40 -0
- data/lib/nokogiri/{html → html4}/builder.rb +2 -2
- data/lib/nokogiri/{html → html4}/document.rb +4 -4
- data/lib/nokogiri/{html → html4}/document_fragment.rb +3 -3
- data/lib/nokogiri/{html → html4}/element_description.rb +1 -1
- data/lib/nokogiri/{html → html4}/element_description_defaults.rb +1 -1
- data/lib/nokogiri/{html → html4}/entity_lookup.rb +1 -1
- data/lib/nokogiri/{html → html4}/sax/parser.rb +11 -14
- data/lib/nokogiri/html4/sax/parser_context.rb +19 -0
- data/lib/nokogiri/{html → html4}/sax/push_parser.rb +5 -5
- data/lib/nokogiri/html5.rb +473 -0
- data/lib/nokogiri/html5/document.rb +74 -0
- data/lib/nokogiri/html5/document_fragment.rb +80 -0
- data/lib/nokogiri/html5/node.rb +93 -0
- data/lib/nokogiri/nokogiri.jar +0 -0
- data/lib/nokogiri/version/constant.rb +1 -1
- data/lib/nokogiri/version/info.rb +12 -2
- data/lib/nokogiri/xml.rb +35 -36
- data/lib/nokogiri/xml/node.rb +6 -5
- data/lib/nokogiri/xml/parse_options.rb +2 -0
- data/lib/nokogiri/xml/pp.rb +2 -2
- data/lib/nokogiri/xml/sax.rb +4 -4
- data/lib/nokogiri/xml/sax/document.rb +24 -30
- data/lib/nokogiri/xml/xpath.rb +2 -2
- data/lib/nokogiri/xslt.rb +16 -16
- data/lib/nokogiri/xslt/stylesheet.rb +1 -1
- metadata +40 -40
- data/lib/nokogiri/html/sax/parser_context.rb +0 -17
data/ext/nokogiri/depend
CHANGED
@@ -1,37 +1,38 @@
|
|
1
1
|
# -*-makefile-*-
|
2
2
|
# DO NOT DELETE
|
3
3
|
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
4
|
+
gumbo.o: $(srcdir)/nokogiri.h
|
5
|
+
html_document.o: $(srcdir)/nokogiri.h
|
6
|
+
html_element_description.o: $(srcdir)/nokogiri.h
|
7
|
+
html_entity_lookup.o: $(srcdir)/nokogiri.h
|
8
|
+
html_sax_parser_context.o: $(srcdir)/nokogiri.h
|
9
|
+
html_sax_push_parser.o: $(srcdir)/nokogiri.h
|
10
|
+
libxml2_backwards_compat.o: $(srcdir)/nokogiri.h
|
11
|
+
nokogiri.o: $(srcdir)/nokogiri.h
|
12
|
+
test_global_handlers.o: $(srcdir)/nokogiri.h
|
13
|
+
xml_attr.o: $(srcdir)/nokogiri.h
|
14
|
+
xml_attribute_decl.o: $(srcdir)/nokogiri.h
|
15
|
+
xml_cdata.o: $(srcdir)/nokogiri.h
|
16
|
+
xml_comment.o: $(srcdir)/nokogiri.h
|
17
|
+
xml_document.o: $(srcdir)/nokogiri.h
|
18
|
+
xml_document_fragment.o: $(srcdir)/nokogiri.h
|
19
|
+
xml_dtd.o: $(srcdir)/nokogiri.h
|
20
|
+
xml_element_content.o: $(srcdir)/nokogiri.h
|
21
|
+
xml_element_decl.o: $(srcdir)/nokogiri.h
|
22
|
+
xml_encoding_handler.o: $(srcdir)/nokogiri.h
|
23
|
+
xml_entity_decl.o: $(srcdir)/nokogiri.h
|
24
|
+
xml_entity_reference.o: $(srcdir)/nokogiri.h
|
25
|
+
xml_namespace.o: $(srcdir)/nokogiri.h
|
26
|
+
xml_node.o: $(srcdir)/nokogiri.h
|
27
|
+
xml_node_set.o: $(srcdir)/nokogiri.h
|
28
|
+
xml_processing_instruction.o: $(srcdir)/nokogiri.h
|
29
|
+
xml_reader.o: $(srcdir)/nokogiri.h
|
30
|
+
xml_relax_ng.o: $(srcdir)/nokogiri.h
|
31
|
+
xml_sax_parser.o: $(srcdir)/nokogiri.h
|
32
|
+
xml_sax_parser_context.o: $(srcdir)/nokogiri.h
|
33
|
+
xml_sax_push_parser.o: $(srcdir)/nokogiri.h
|
34
|
+
xml_schema.o: $(srcdir)/nokogiri.h
|
35
|
+
xml_syntax_error.o: $(srcdir)/nokogiri.h
|
36
|
+
xml_text.o: $(srcdir)/nokogiri.h
|
37
|
+
xml_xpath_context.o: $(srcdir)/nokogiri.h
|
38
|
+
xslt_stylesheet.o: $(srcdir)/nokogiri.h
|
data/ext/nokogiri/extconf.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
ENV[
|
2
|
+
ENV["RC_ARCHS"] = "" if RUBY_PLATFORM =~ /darwin/
|
3
3
|
|
4
4
|
require "mkmf"
|
5
5
|
require "rbconfig"
|
@@ -8,13 +8,13 @@ require "shellwords"
|
|
8
8
|
require "pathname"
|
9
9
|
|
10
10
|
# helpful constants
|
11
|
-
PACKAGE_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__),
|
11
|
+
PACKAGE_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
|
12
12
|
REQUIRED_LIBXML_VERSION = "2.6.21"
|
13
13
|
RECOMMENDED_LIBXML_VERSION = "2.9.3"
|
14
14
|
|
15
15
|
# The gem version constraint in the Rakefile is not respected at install time.
|
16
16
|
# Keep this version in sync with the one in the Rakefile !
|
17
|
-
REQUIRED_MINI_PORTILE_VERSION = "~> 2.
|
17
|
+
REQUIRED_MINI_PORTILE_VERSION = "~> 2.6.1"
|
18
18
|
REQUIRED_PKG_CONFIG_VERSION = "~> 1.1"
|
19
19
|
|
20
20
|
# Keep track of what versions of what libraries we build against
|
@@ -91,6 +91,9 @@ NOKOGIRI_HELP_MESSAGE = <<~HELP
|
|
91
91
|
--with-xml2-include=DIRECTORY
|
92
92
|
Look for xml2 headers in DIRECTORY.
|
93
93
|
|
94
|
+
--with-xml2-source-dir=DIRECTORY
|
95
|
+
(dev only) Build libxml2 from the source code in DIRECTORY
|
96
|
+
|
94
97
|
|
95
98
|
Related to libxslt:
|
96
99
|
|
@@ -103,6 +106,9 @@ NOKOGIRI_HELP_MESSAGE = <<~HELP
|
|
103
106
|
--with-xslt-include=DIRECTORY
|
104
107
|
Look for xslt headers in DIRECTORY.
|
105
108
|
|
109
|
+
--with-xslt-source-dir=DIRECTORY
|
110
|
+
(dev only) Build libxslt from the source code in DIRECTORY
|
111
|
+
|
106
112
|
|
107
113
|
Related to libexslt:
|
108
114
|
|
@@ -150,7 +156,7 @@ HELP
|
|
150
156
|
# utility functions
|
151
157
|
#
|
152
158
|
def config_clean?
|
153
|
-
enable_config(
|
159
|
+
enable_config("clean", true)
|
154
160
|
end
|
155
161
|
|
156
162
|
def config_static?
|
@@ -164,24 +170,24 @@ end
|
|
164
170
|
|
165
171
|
def config_system_libraries?
|
166
172
|
enable_config("system-libraries", ENV.key?("NOKOGIRI_USE_SYSTEM_LIBRARIES")) do |_, default|
|
167
|
-
arg_config(
|
173
|
+
arg_config("--use-system-libraries", default)
|
168
174
|
end
|
169
175
|
end
|
170
176
|
|
171
177
|
def windows?
|
172
|
-
RbConfig::CONFIG[
|
178
|
+
RbConfig::CONFIG["target_os"] =~ /mingw32|mswin/
|
173
179
|
end
|
174
180
|
|
175
181
|
def solaris?
|
176
|
-
RbConfig::CONFIG[
|
182
|
+
RbConfig::CONFIG["target_os"] =~ /solaris/
|
177
183
|
end
|
178
184
|
|
179
185
|
def darwin?
|
180
|
-
RbConfig::CONFIG[
|
186
|
+
RbConfig::CONFIG["target_os"] =~ /darwin/
|
181
187
|
end
|
182
188
|
|
183
189
|
def openbsd?
|
184
|
-
RbConfig::CONFIG[
|
190
|
+
RbConfig::CONFIG["target_os"] =~ /openbsd/
|
185
191
|
end
|
186
192
|
|
187
193
|
def aix?
|
@@ -193,7 +199,7 @@ def nix?
|
|
193
199
|
end
|
194
200
|
|
195
201
|
def truffle?
|
196
|
-
::RUBY_ENGINE ==
|
202
|
+
::RUBY_ENGINE == "truffleruby"
|
197
203
|
end
|
198
204
|
|
199
205
|
def concat_flags(*args)
|
@@ -222,9 +228,9 @@ def try_package_configuration(pc)
|
|
222
228
|
# let's fall back to the pkg-config gem, which knows how to parse .pc files, and wrap it with the
|
223
229
|
# same logic as MakeMakefile#pkg_config
|
224
230
|
begin
|
225
|
-
require
|
226
|
-
gem(
|
227
|
-
require
|
231
|
+
require "rubygems"
|
232
|
+
gem("pkg-config", REQUIRED_PKG_CONFIG_VERSION)
|
233
|
+
require "pkg-config"
|
228
234
|
|
229
235
|
checking_for("#{pc} using pkg-config gem version #{PKGConfig::VERSION}", LOCAL_PACKAGE_RESPONSE) do
|
230
236
|
if PKGConfig.have_package(pc)
|
@@ -285,7 +291,7 @@ def chdir_for_build
|
|
285
291
|
# When using rake-compiler-dock on Windows, the underlying Virtualbox shared
|
286
292
|
# folders don't support symlinks, but libiconv expects it for a build on
|
287
293
|
# Linux. We work around this limitation by using the temp dir for cooking.
|
288
|
-
build_dir = ENV[
|
294
|
+
build_dir = ENV["RCD_HOST_RUBY_PLATFORM"].to_s =~ /mingw|mswin|cygwin/ ? "/tmp" : "."
|
289
295
|
Dir.chdir(build_dir) do
|
290
296
|
yield
|
291
297
|
end
|
@@ -339,8 +345,8 @@ def have_libxml_headers?(version = nil)
|
|
339
345
|
end
|
340
346
|
|
341
347
|
def try_link_iconv(using = nil)
|
342
|
-
checking_for(using ? "iconv using #{using}" :
|
343
|
-
[
|
348
|
+
checking_for(using ? "iconv using #{using}" : "iconv") do
|
349
|
+
["", "-liconv"].any? do |opt|
|
344
350
|
preserving_globals do
|
345
351
|
yield if block_given?
|
346
352
|
|
@@ -371,22 +377,22 @@ def iconv_configure_flags
|
|
371
377
|
end
|
372
378
|
|
373
379
|
return [
|
374
|
-
|
375
|
-
*("CPPFLAGS=#{idirs.map { |dir|
|
376
|
-
*("LDFLAGS=#{ldirs.map { |dir|
|
380
|
+
"--with-iconv=yes",
|
381
|
+
*("CPPFLAGS=#{idirs.map { |dir| "-I" + dir }.join(" ")}" if idirs),
|
382
|
+
*("LDFLAGS=#{ldirs.map { |dir| "-L" + dir }.join(" ")}" if ldirs),
|
377
383
|
]
|
378
384
|
end
|
379
385
|
|
380
386
|
if try_link_iconv
|
381
|
-
return [
|
387
|
+
return ["--with-iconv=yes"]
|
382
388
|
end
|
383
389
|
|
384
|
-
config = preserving_globals { have_package_configuration(
|
385
|
-
if config && try_link_iconv(
|
390
|
+
config = preserving_globals { have_package_configuration("libiconv") }
|
391
|
+
if config && try_link_iconv("pkg-config libiconv") { have_package_configuration("libiconv") }
|
386
392
|
cflags, ldflags, libs = config
|
387
393
|
|
388
394
|
return [
|
389
|
-
|
395
|
+
"--with-iconv=yes",
|
390
396
|
"CPPFLAGS=#{cflags}",
|
391
397
|
"LDFLAGS=#{ldflags}",
|
392
398
|
"LIBS=#{libs}",
|
@@ -396,23 +402,22 @@ def iconv_configure_flags
|
|
396
402
|
abort_could_not_find_library("libiconv")
|
397
403
|
end
|
398
404
|
|
399
|
-
def process_recipe(name, version, static_p, cross_p)
|
400
|
-
require
|
401
|
-
gem(
|
402
|
-
require
|
405
|
+
def process_recipe(name, version, static_p, cross_p, cacheable_p=true)
|
406
|
+
require "rubygems"
|
407
|
+
gem("mini_portile2", REQUIRED_MINI_PORTILE_VERSION)
|
408
|
+
require "mini_portile2"
|
403
409
|
message("Using mini_portile version #{MiniPortile::VERSION}\n")
|
404
410
|
|
405
|
-
|
411
|
+
unless ["libxml2", "libxslt"].include?(name)
|
406
412
|
OTHER_LIBRARY_VERSIONS[name] = version
|
407
413
|
end
|
408
414
|
|
409
415
|
MiniPortile.new(name, version).tap do |recipe|
|
410
|
-
recipe.target = File.join(PACKAGE_ROOT_DIR, "ports")
|
416
|
+
recipe.target = File.join(PACKAGE_ROOT_DIR, "ports") if cacheable_p
|
411
417
|
# Prefer host_alias over host in order to use i586-mingw32msvc as
|
412
418
|
# correct compiler prefix for cross build, but use host if not set.
|
413
419
|
recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
|
414
|
-
recipe.
|
415
|
-
recipe.configure_options << "--libdir=#{File.join(recipe.path, 'lib')}"
|
420
|
+
recipe.configure_options << "--libdir=#{File.join(recipe.path, "lib")}"
|
416
421
|
|
417
422
|
yield recipe
|
418
423
|
|
@@ -456,10 +461,10 @@ def process_recipe(name, version, static_p, cross_p)
|
|
456
461
|
]
|
457
462
|
end
|
458
463
|
|
459
|
-
if RbConfig::CONFIG[
|
464
|
+
if RbConfig::CONFIG["target_cpu"] == "universal"
|
460
465
|
%w[CFLAGS LDFLAGS].each do |key|
|
461
|
-
unless env[key].include?(
|
462
|
-
env[key] = concat_flags(env[key], RbConfig::CONFIG[
|
466
|
+
unless env[key].include?("-arch")
|
467
|
+
env[key] = concat_flags(env[key], RbConfig::CONFIG["ARCH_FLAG"])
|
463
468
|
end
|
464
469
|
end
|
465
470
|
end
|
@@ -469,7 +474,7 @@ def process_recipe(name, version, static_p, cross_p)
|
|
469
474
|
end
|
470
475
|
|
471
476
|
checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
|
472
|
-
if File.exist?(checkpoint)
|
477
|
+
if File.exist?(checkpoint) && !recipe.source_directory
|
473
478
|
message("Building Nokogiri with a packaged version of #{name}-#{version}.\n")
|
474
479
|
else
|
475
480
|
message(<<~EOM)
|
@@ -486,7 +491,7 @@ def process_recipe(name, version, static_p, cross_p)
|
|
486
491
|
end
|
487
492
|
end
|
488
493
|
|
489
|
-
message(<<~EOM)
|
494
|
+
message(<<~EOM) if name != "libgumbo"
|
490
495
|
|
491
496
|
The Nokogiri maintainers intend to provide timely security updates, but if
|
492
497
|
this is a concern for you and want to use your OS/distro system library
|
@@ -497,15 +502,13 @@ def process_recipe(name, version, static_p, cross_p)
|
|
497
502
|
|
498
503
|
EOM
|
499
504
|
|
500
|
-
message(<<~EOM) if name ==
|
501
|
-
Note, however, that nokogiri cannot guarantee
|
505
|
+
message(<<~EOM) if name == "libxml2"
|
506
|
+
Note, however, that nokogiri cannot guarantee compatibility with every
|
502
507
|
version of libxml2 that may be provided by OS/package vendors.
|
503
508
|
|
504
509
|
EOM
|
505
510
|
|
506
|
-
chdir_for_build
|
507
|
-
recipe.cook
|
508
|
-
end
|
511
|
+
chdir_for_build { recipe.cook }
|
509
512
|
FileUtils.touch(checkpoint)
|
510
513
|
end
|
511
514
|
recipe.activate
|
@@ -516,7 +519,7 @@ def copy_packaged_libraries_headers(to_path:, from_recipes:)
|
|
516
519
|
FileUtils.rm_rf(to_path, secure: true)
|
517
520
|
FileUtils.mkdir(to_path)
|
518
521
|
from_recipes.each do |recipe|
|
519
|
-
FileUtils.cp_r(Dir[File.join(recipe.path,
|
522
|
+
FileUtils.cp_r(Dir[File.join(recipe.path, "include/*")], to_path)
|
520
523
|
end
|
521
524
|
end
|
522
525
|
|
@@ -530,22 +533,22 @@ def do_clean
|
|
530
533
|
pwd = Pathname(Dir.pwd)
|
531
534
|
|
532
535
|
# Skip if this is a development work tree
|
533
|
-
unless (root +
|
536
|
+
unless (root + ".git").exist?
|
534
537
|
message("Cleaning files only used during build.\n")
|
535
538
|
|
536
539
|
# (root + 'tmp') cannot be removed at this stage because
|
537
540
|
# nokogiri.so is yet to be copied to lib.
|
538
541
|
|
539
542
|
# clean the ports build directory
|
540
|
-
Pathname.glob(pwd.join(
|
543
|
+
Pathname.glob(pwd.join("tmp", "*", "ports")) do |dir|
|
541
544
|
FileUtils.rm_rf(dir, verbose: true)
|
542
545
|
end
|
543
546
|
|
544
547
|
if config_static?
|
545
548
|
# ports installation can be safely removed if statically linked.
|
546
|
-
FileUtils.rm_rf(root +
|
549
|
+
FileUtils.rm_rf(root + "ports", verbose: true)
|
547
550
|
else
|
548
|
-
FileUtils.rm_rf(root +
|
551
|
+
FileUtils.rm_rf(root + "ports" + "archives", verbose: true)
|
549
552
|
end
|
550
553
|
end
|
551
554
|
|
@@ -555,25 +558,25 @@ end
|
|
555
558
|
#
|
556
559
|
# main
|
557
560
|
#
|
558
|
-
do_help if arg_config(
|
559
|
-
do_clean if arg_config(
|
561
|
+
do_help if arg_config("--help")
|
562
|
+
do_clean if arg_config("--clean")
|
560
563
|
|
561
564
|
if openbsd? && !config_system_libraries?
|
562
|
-
if %x(#{ENV[
|
563
|
-
(ENV[
|
565
|
+
if %x(#{ENV["CC"] || "/usr/bin/cc"} -v 2>&1) !~ /clang/
|
566
|
+
(ENV["CC"] ||= find_executable("egcc")) ||
|
564
567
|
abort("Please install gcc 4.9+ from ports using `pkg_add -v gcc`")
|
565
568
|
end
|
566
569
|
append_cppflags "-I/usr/local/include"
|
567
570
|
end
|
568
571
|
|
569
|
-
if ENV[
|
570
|
-
RbConfig::CONFIG[
|
572
|
+
if ENV["CC"]
|
573
|
+
RbConfig::CONFIG["CC"] = RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"]
|
571
574
|
end
|
572
575
|
|
573
576
|
# use same c compiler for libxml and libxslt
|
574
|
-
ENV[
|
577
|
+
ENV["CC"] = RbConfig::CONFIG["CC"]
|
575
578
|
|
576
|
-
if arg_config(
|
579
|
+
if arg_config("--prevent-strip")
|
577
580
|
old_cflags = $CFLAGS.split.join(" ")
|
578
581
|
old_ldflags = $LDFLAGS.split.join(" ")
|
579
582
|
old_dldflags = $DLDFLAGS.split.join(" ")
|
@@ -619,13 +622,13 @@ append_cppflags(' "-Idummypath"') if windows?
|
|
619
622
|
if config_system_libraries?
|
620
623
|
message "Building nokogiri using system libraries.\n"
|
621
624
|
ensure_package_configuration(opt: "zlib", pc: "zlib", lib: "z",
|
622
|
-
|
625
|
+
headers: "zlib.h", func: "gzdopen")
|
623
626
|
ensure_package_configuration(opt: "xml2", pc: "libxml-2.0", lib: "xml2",
|
624
|
-
|
627
|
+
headers: "libxml/parser.h", func: "xmlParseDoc")
|
625
628
|
ensure_package_configuration(opt: "xslt", pc: "libxslt", lib: "xslt",
|
626
|
-
|
629
|
+
headers: "libxslt/xslt.h", func: "xsltParseStylesheetDoc")
|
627
630
|
ensure_package_configuration(opt: "exslt", pc: "libexslt", lib: "exslt",
|
628
|
-
|
631
|
+
headers: "libexslt/exslt.h", func: "exsltFuncRegister")
|
629
632
|
|
630
633
|
have_libxml_headers?(REQUIRED_LIBXML_VERSION) ||
|
631
634
|
abort("ERROR: libxml2 version #{REQUIRED_LIBXML_VERSION} or later is required!")
|
@@ -636,15 +639,15 @@ else
|
|
636
639
|
message "Building nokogiri using packaged libraries.\n"
|
637
640
|
|
638
641
|
static_p = config_static?
|
639
|
-
message "Static linking is #{static_p ?
|
642
|
+
message "Static linking is #{static_p ? "enabled" : "disabled"}.\n"
|
640
643
|
|
641
644
|
cross_build_p = config_cross_build?
|
642
|
-
message "Cross build is #{cross_build_p ?
|
645
|
+
message "Cross build is #{cross_build_p ? "enabled" : "disabled"}.\n"
|
643
646
|
|
644
|
-
require
|
647
|
+
require "yaml"
|
645
648
|
dependencies = YAML.load_file(File.join(PACKAGE_ROOT_DIR, "dependencies.yml"))
|
646
649
|
|
647
|
-
dir_config(
|
650
|
+
dir_config("zlib")
|
648
651
|
|
649
652
|
if cross_build_p || windows?
|
650
653
|
zlib_recipe = process_recipe("zlib", dependencies["zlib"]["version"], static_p, cross_build_p) do |recipe|
|
@@ -658,8 +661,8 @@ else
|
|
658
661
|
|
659
662
|
def configure
|
660
663
|
Dir.chdir(work_path) do
|
661
|
-
mk = File.read(
|
662
|
-
File.open(
|
664
|
+
mk = File.read("win32/Makefile.gcc")
|
665
|
+
File.open("win32/Makefile.gcc", "wb") do |f|
|
663
666
|
f.puts "BINARY_PATH = #{path}/bin"
|
664
667
|
f.puts "LIBRARY_PATH = #{path}/lib"
|
665
668
|
f.puts "INCLUDE_PATH = #{path}/include"
|
@@ -671,7 +674,7 @@ else
|
|
671
674
|
|
672
675
|
def configured?
|
673
676
|
Dir.chdir(work_path) do
|
674
|
-
!!(File.read(
|
677
|
+
!!(File.read("win32/Makefile.gcc") =~ /^BINARY_PATH/)
|
675
678
|
end
|
676
679
|
end
|
677
680
|
|
@@ -689,7 +692,7 @@ else
|
|
689
692
|
def configure
|
690
693
|
cflags = concat_flags(ENV["CFLAGS"], "-fPIC", "-g")
|
691
694
|
execute("configure",
|
692
|
-
["env", "CHOST=#{host}", "CFLAGS=#{cflags}", "./configure", "--static", configure_prefix])
|
695
|
+
["env", "CHOST=#{host}", "CFLAGS=#{cflags}", "./configure", "--static", configure_prefix])
|
693
696
|
end
|
694
697
|
|
695
698
|
def compile
|
@@ -705,7 +708,7 @@ else
|
|
705
708
|
|
706
709
|
unless nix?
|
707
710
|
libiconv_recipe = process_recipe("libiconv", dependencies["libiconv"]["version"], static_p,
|
708
|
-
cross_build_p) do |recipe|
|
711
|
+
cross_build_p) do |recipe|
|
709
712
|
recipe.files = [{
|
710
713
|
url: "http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz",
|
711
714
|
sha256: dependencies["libiconv"]["sha256"],
|
@@ -714,6 +717,7 @@ cross_build_p) do |recipe|
|
|
714
717
|
cflags = concat_flags(ENV["CFLAGS"], "-O2", "-U_FORTIFY_SOURCE", "-g")
|
715
718
|
|
716
719
|
recipe.configure_options += [
|
720
|
+
"--disable-dependency-tracking",
|
717
721
|
"CPPFLAGS=-Wall",
|
718
722
|
"CFLAGS=#{cflags}",
|
719
723
|
"CXXFLAGS=#{cflags}",
|
@@ -721,7 +725,7 @@ cross_build_p) do |recipe|
|
|
721
725
|
]
|
722
726
|
end
|
723
727
|
end
|
724
|
-
elsif darwin? && !have_header(
|
728
|
+
elsif darwin? && !have_header("iconv.h")
|
725
729
|
abort(<<~EOM.chomp)
|
726
730
|
-----
|
727
731
|
The file "iconv.h" is missing in your build environment,
|
@@ -737,15 +741,21 @@ cross_build_p) do |recipe|
|
|
737
741
|
end
|
738
742
|
|
739
743
|
unless windows?
|
740
|
-
preserving_globals { local_have_library(
|
741
|
-
abort(
|
744
|
+
preserving_globals { local_have_library("z", "gzdopen", "zlib.h") } ||
|
745
|
+
abort("zlib is missing; necessary for building libxml2")
|
742
746
|
end
|
743
747
|
|
744
748
|
libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"]["version"], static_p, cross_build_p) do |recipe|
|
745
|
-
|
746
|
-
|
747
|
-
|
748
|
-
|
749
|
+
source_dir = arg_config("--with-xml2-source-dir")
|
750
|
+
if source_dir
|
751
|
+
recipe.source_directory = source_dir
|
752
|
+
else
|
753
|
+
recipe.files = [{
|
754
|
+
url: "http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz",
|
755
|
+
sha256: dependencies["libxml2"]["sha256"],
|
756
|
+
}]
|
757
|
+
recipe.patch_files = Dir[File.join(PACKAGE_ROOT_DIR, "patches", "libxml2", "*.patch")].sort
|
758
|
+
end
|
749
759
|
|
750
760
|
cflags = concat_flags(ENV["CFLAGS"], "-O2", "-U_FORTIFY_SOURCE", "-g")
|
751
761
|
|
@@ -768,6 +778,12 @@ cross_build_p) do |recipe|
|
|
768
778
|
cflags = concat_flags(cflags, "-ULIBXML_STATIC", "-DIN_LIBXML")
|
769
779
|
end
|
770
780
|
|
781
|
+
recipe.configure_options << if source_dir
|
782
|
+
"--config-cache"
|
783
|
+
else
|
784
|
+
"--disable-dependency-tracking"
|
785
|
+
end
|
786
|
+
|
771
787
|
recipe.configure_options += [
|
772
788
|
"--without-python",
|
773
789
|
"--without-readline",
|
@@ -779,10 +795,16 @@ cross_build_p) do |recipe|
|
|
779
795
|
end
|
780
796
|
|
781
797
|
libxslt_recipe = process_recipe("libxslt", dependencies["libxslt"]["version"], static_p, cross_build_p) do |recipe|
|
782
|
-
|
783
|
-
|
784
|
-
|
785
|
-
|
798
|
+
source_dir = arg_config("--with-xslt-source-dir")
|
799
|
+
if source_dir
|
800
|
+
recipe.source_directory = source_dir
|
801
|
+
else
|
802
|
+
recipe.files = [{
|
803
|
+
url: "http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz",
|
804
|
+
sha256: dependencies["libxslt"]["sha256"],
|
805
|
+
}]
|
806
|
+
recipe.patch_files = Dir[File.join(PACKAGE_ROOT_DIR, "patches", "libxslt", "*.patch")].sort
|
807
|
+
end
|
786
808
|
|
787
809
|
cflags = concat_flags(ENV["CFLAGS"], "-O2", "-U_FORTIFY_SOURCE", "-g")
|
788
810
|
|
@@ -790,6 +812,12 @@ cross_build_p) do |recipe|
|
|
790
812
|
recipe.configure_options += ["RANLIB=/usr/bin/ranlib", "AR=/usr/bin/ar"]
|
791
813
|
end
|
792
814
|
|
815
|
+
recipe.configure_options << if source_dir
|
816
|
+
"--config-cache"
|
817
|
+
else
|
818
|
+
"--disable-dependency-tracking"
|
819
|
+
end
|
820
|
+
|
793
821
|
recipe.configure_options += [
|
794
822
|
"--without-python",
|
795
823
|
"--without-crypto",
|
@@ -810,12 +838,12 @@ cross_build_p) do |recipe|
|
|
810
838
|
libname = recipe.name[/\Alib(.+)\z/, 1]
|
811
839
|
File.join(recipe.path, "bin", "#{libname}-config").tap do |config|
|
812
840
|
# call config scripts explicit with 'sh' for compat with Windows
|
813
|
-
$CPPFLAGS = %x(sh #{config} --cflags).strip <<
|
841
|
+
$CPPFLAGS = %x(sh #{config} --cflags).strip << " " << $CPPFLAGS
|
814
842
|
%x(sh #{config} --libs).strip.shellsplit.each do |arg|
|
815
843
|
case arg
|
816
844
|
when /\A-L(.+)\z/
|
817
845
|
# Prioritize ports' directories
|
818
|
-
$LIBPATH = if Regexp.last_match(1).start_with?(PACKAGE_ROOT_DIR +
|
846
|
+
$LIBPATH = if Regexp.last_match(1).start_with?(PACKAGE_ROOT_DIR + "/")
|
819
847
|
[Regexp.last_match(1)] | $LIBPATH
|
820
848
|
else
|
821
849
|
$LIBPATH | [Regexp.last_match(1)]
|
@@ -823,26 +851,26 @@ cross_build_p) do |recipe|
|
|
823
851
|
when /\A-l./
|
824
852
|
libs.unshift(arg)
|
825
853
|
else
|
826
|
-
$LDFLAGS <<
|
854
|
+
$LDFLAGS << " " << arg.shellescape
|
827
855
|
end
|
828
856
|
end
|
829
857
|
end
|
830
858
|
|
831
|
-
patches_string = recipe.patch_files.map { |path| File.basename(path) }.join(
|
859
|
+
patches_string = recipe.patch_files.map { |path| File.basename(path) }.join(" ")
|
832
860
|
append_cppflags(%[-DNOKOGIRI_#{recipe.name.upcase}_PATCHES="\\\"#{patches_string}\\\""])
|
833
861
|
|
834
862
|
case libname
|
835
|
-
when
|
863
|
+
when "xml2"
|
836
864
|
# xslt-config --libs or pkg-config libxslt --libs does not include
|
837
865
|
# -llzma, so we need to add it manually when linking statically.
|
838
|
-
if static_p && preserving_globals { local_have_library(
|
866
|
+
if static_p && preserving_globals { local_have_library("lzma") }
|
839
867
|
# Add it at the end; GH #988
|
840
|
-
libs <<
|
868
|
+
libs << "-llzma"
|
841
869
|
end
|
842
|
-
when
|
870
|
+
when "xslt"
|
843
871
|
# xslt-config does not have a flag to emit options including
|
844
872
|
# -lexslt, so add it manually.
|
845
|
-
libs.unshift(
|
873
|
+
libs.unshift("-lexslt")
|
846
874
|
end
|
847
875
|
end
|
848
876
|
end.shelljoin
|
@@ -850,10 +878,10 @@ cross_build_p) do |recipe|
|
|
850
878
|
if static_p
|
851
879
|
$libs = $libs.shellsplit.map do |arg|
|
852
880
|
case arg
|
853
|
-
when
|
854
|
-
File.join(libxml2_recipe.path,
|
855
|
-
when
|
856
|
-
File.join(libxslt_recipe.path,
|
881
|
+
when "-lxml2"
|
882
|
+
File.join(libxml2_recipe.path, "lib", libflag_to_filename(arg))
|
883
|
+
when "-lxslt", "-lexslt"
|
884
|
+
File.join(libxslt_recipe.path, "lib", libflag_to_filename(arg))
|
857
885
|
else
|
858
886
|
arg
|
859
887
|
end
|
@@ -865,14 +893,64 @@ cross_build_p) do |recipe|
|
|
865
893
|
ensure_func("exsltFuncRegister", "libexslt/exslt.h")
|
866
894
|
end
|
867
895
|
|
868
|
-
|
869
|
-
|
870
|
-
|
871
|
-
|
872
|
-
|
873
|
-
|
896
|
+
libgumbo_recipe = process_recipe("libgumbo", "1.0.0-nokogiri", static_p, cross_build_p, false) do |recipe|
|
897
|
+
recipe.configure_options = []
|
898
|
+
|
899
|
+
class << recipe
|
900
|
+
def downloaded?
|
901
|
+
true
|
902
|
+
end
|
903
|
+
|
904
|
+
def extract
|
905
|
+
target = File.join(tmp_path, "gumbo-parser")
|
906
|
+
output("Copying gumbo-parser files into #{target}...")
|
907
|
+
FileUtils.mkdir_p(target)
|
908
|
+
FileUtils.cp(Dir.glob(File.join(PACKAGE_ROOT_DIR, "gumbo-parser/src/*")), target)
|
909
|
+
end
|
910
|
+
|
911
|
+
def configured?
|
912
|
+
true
|
913
|
+
end
|
914
|
+
|
915
|
+
def install
|
916
|
+
lib_dir = File.join(port_path, "lib")
|
917
|
+
inc_dir = File.join(port_path, "include")
|
918
|
+
FileUtils.mkdir_p([lib_dir, inc_dir])
|
919
|
+
FileUtils.cp(File.join(work_path, "libgumbo.a"), lib_dir)
|
920
|
+
FileUtils.cp(Dir.glob(File.join(work_path, "*.h")), inc_dir)
|
921
|
+
end
|
922
|
+
|
923
|
+
def compile
|
924
|
+
cflags = concat_flags(ENV["CFLAGS"], "-fPIC", "-g")
|
925
|
+
|
926
|
+
env = { "CC" => gcc_cmd, "CFLAGS" => cflags }
|
927
|
+
if config_cross_build?
|
928
|
+
if host =~ /darwin/
|
929
|
+
env["AR"] = "#{host}-libtool"
|
930
|
+
env["ARFLAGS"] = "-o"
|
931
|
+
else
|
932
|
+
env["AR"] = "#{host}-ar"
|
933
|
+
end
|
934
|
+
env["RANLIB"] = "#{host}-ranlib"
|
935
|
+
end
|
936
|
+
|
937
|
+
execute("compile", make_cmd, { env: env })
|
938
|
+
end
|
939
|
+
end
|
940
|
+
end
|
941
|
+
append_cppflags("-I#{File.join(libgumbo_recipe.path, "include")}")
|
942
|
+
$libs = $libs + " " + File.join(libgumbo_recipe.path, "lib", "libgumbo.a")
|
943
|
+
$LIBPATH = $LIBPATH | [File.join(libgumbo_recipe.path, "lib")]
|
944
|
+
ensure_func("gumbo_parse_with_options", "gumbo.h")
|
945
|
+
|
946
|
+
have_func("xmlHasFeature") || abort("xmlHasFeature() is missing.") # introduced in libxml 2.6.21
|
947
|
+
have_func("xmlFirstElementChild") # introduced in libxml 2.7.3
|
948
|
+
have_func("xmlRelaxNGSetParserStructuredErrors") # introduced in libxml 2.6.24
|
949
|
+
have_func("xmlRelaxNGSetValidStructuredErrors") # introduced in libxml 2.6.21
|
950
|
+
have_func("xmlSchemaSetValidStructuredErrors") # introduced in libxml 2.6.23
|
951
|
+
have_func("xmlSchemaSetParserStructuredErrors") # introduced in libxml 2.6.23
|
874
952
|
|
875
|
-
have_func(
|
953
|
+
have_func("vasprintf")
|
876
954
|
|
877
955
|
other_library_versions_string = OTHER_LIBRARY_VERSIONS.map { |k, v| [k, v].join(":") }.join(",")
|
878
956
|
append_cppflags(%[-DNOKOGIRI_OTHER_LIBRARY_VERSIONS="\\\"#{other_library_versions_string}\\\""])
|
@@ -882,25 +960,25 @@ unless config_system_libraries?
|
|
882
960
|
# When precompiling native gems, copy packaged libraries' headers to ext/nokogiri/include
|
883
961
|
# These are packaged up by the cross-compiling callback in the ExtensionTask
|
884
962
|
copy_packaged_libraries_headers(to_path: File.join(PACKAGE_ROOT_DIR, "ext/nokogiri/include"),
|
885
|
-
|
963
|
+
from_recipes: [libxml2_recipe, libxslt_recipe])
|
886
964
|
else
|
887
965
|
# When compiling during installation, install packaged libraries' header files into ext/nokogiri/include
|
888
966
|
copy_packaged_libraries_headers(to_path: "include",
|
889
|
-
|
967
|
+
from_recipes: [libxml2_recipe, libxslt_recipe])
|
890
968
|
$INSTALLFILES << ["include/**/*.h", "$(rubylibdir)"]
|
891
969
|
end
|
892
970
|
end
|
893
971
|
|
894
|
-
create_makefile(
|
972
|
+
create_makefile("nokogiri/nokogiri")
|
895
973
|
|
896
974
|
if config_clean?
|
897
975
|
# Do not clean if run in a development work tree.
|
898
|
-
File.open(
|
976
|
+
File.open("Makefile", "at") do |mk|
|
899
977
|
mk.print(<<~EOF)
|
900
978
|
|
901
979
|
all: clean-ports
|
902
980
|
clean-ports: $(DLLIB)
|
903
|
-
\t-$(Q)$(RUBY) $(srcdir)/extconf.rb --clean --#{static_p ?
|
981
|
+
\t-$(Q)$(RUBY) $(srcdir)/extconf.rb --clean --#{static_p ? "enable" : "disable"}-static
|
904
982
|
EOF
|
905
983
|
end
|
906
984
|
end
|