nokolexbor 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f935c5e81aed7b5d964e7332a9abeaa1f44dec7e2532f01c89dfd17df14ded
-  data.tar.gz: 91c58aca5a9b16a3cfa7e2436dfb86feeb777daa3615b8b3a95b234981cc67d0
+  metadata.gz: 6bfa3062e8718581cd8aabef75f0084a6626bd90301c9db4957ee975215edec1
+  data.tar.gz: 243f5c217c85750f63bfc0dcb8af575c019d3f2fd920f41769c0affc8a219802
 SHA512:
-  metadata.gz: af6ae7b07bde270ea275a5b21221c7e90923f195a6a62ed7b85174f1d9f31f017661dc50c7d8dd1c3d39096a5c1ecbb3469f4496f2e628a3b7026f82ca3994c5
-  data.tar.gz: eea3a38dcbd81cdb7c54996248d6eaa2d2c51b964d79d3131ba04594dd449a141b32b225bc7a879844c92418f3c04e6b63c77c9c6bef86f8ee619fa6a47b03a3
+  metadata.gz: e66b390ef696ed5cafa480065e8ac8fc66ce98d86a7cb15f2f59d8acb7df21381942e5fe6f0244e3b9c7bf54787131c5241a49faeaba328eb49e65af0ac3216c
+  data.tar.gz: d266e2a7c49a202aec4112667807158b54878cc014b42fc32492fc0977c06db76b1a5ded827d9810f2e7966ba3e5068fe54ab89915a4c56e499181ddc190b6d7

data/ext/nokolexbor/CMakeLists.txt

@@ -1,8 +1,11 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 2.8.12)
 
-set(VERSION "2.11.0")
-
-project(libxml2 VERSION ${VERSION} LANGUAGES C)
+IF(CMAKE_VERSION VERSION_LESS "3.0")
+	project(libxml2)
+ELSE()
+	cmake_policy(SET CMP0048 NEW)
+	project(libxml2 VERSION "2.11.0")
+ENDIF()
 
 include(CheckFunctionExists)
 include(CheckIncludeFiles)

data/ext/nokolexbor/config.h.cmake.in

@@ -11,7 +11,9 @@
 #cmakedefine HAVE_PTHREAD_H 1
 
 /* Define to 1 if you have the `rand_r' function. */
+#ifndef _WIN32
 #cmakedefine HAVE_RAND_R 1
+#endif
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine HAVE_STDINT_H 1

data/ext/nokolexbor/extconf.rb

@@ -1,21 +1,60 @@
 require 'mkmf'
 require 'timeout'
 
+if ENV["CC"]
+  RbConfig::CONFIG["CC"] = RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"]
+end
+
+# From: https://stackoverflow.com/questions/2108727
+# Cross-platform way of finding an executable in the $PATH.
+#
+#   which('ruby') #=> /usr/bin/ruby
+def which(cmd)
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    exts.each { |ext|
+      exe = File.join(path, "#{cmd}#{ext}")
+      return exe if File.executable? exe
+    }
+  end
+  return nil
+end
+
 cmake_flags = [ ENV["CMAKE_FLAGS"] ]
-cmake_flags << "-DLEXBOR_BUILD_TESTS_CPP=OFF"
-cmake_flags << "-DLEXBOR_BUILD_SHARED=OFF"
-cmake_flags << "-DLEXBOR_BUILD_STATIC=ON"
+cmake_flags << "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
+# Set system name explicitly when cross-compiling
+cmake_flags << "-DCMAKE_SYSTEM_NAME=Windows -DWIN32=1" if Gem.win_platform?
+# On Windows, Ruby-DevKit is MSYS-based, so ensure to use MSYS Makefiles.
+cmake_flags << "-G \"MSYS Makefiles\"" if Gem.win_platform? && !ENV['NOKOLEXBOR_CROSS_COMPILE']
+
+if ENV['NOKOLEXBOR_CROSS_COMPILE']
+  # use the same toolchain for cross-compiling lexbor
+  ['CC', 'CXX'].each do |env|
+    if RbConfig::CONFIG[env]
+      ENV[env] = RbConfig::CONFIG[env]
+    end
+  end
+  {'RANLIB' => 'RANLIB', 'AR' => 'AR', 'LD' => 'LINKER'}.each do |env, cmake_opt|
+    if RbConfig::CONFIG[env]
+      cmake_flags << "-DCMAKE_#{cmake_opt}=#{which(RbConfig::CONFIG[env])}"
+    end
+  end
+end
+
+lexbor_cmake_flags = cmake_flags + ["-DLEXBOR_BUILD_TESTS_CPP=OFF"]
+lexbor_cmake_flags << "-DLEXBOR_BUILD_SHARED=OFF"
+lexbor_cmake_flags << "-DLEXBOR_BUILD_STATIC=ON"
 
 if ENV['NOKOLEXBOR_DEBUG'] || ENV['NOKOLEXBOR_ASAN']
   CONFIG["optflags"] = "-O0"
   CONFIG["debugflags"] = "-ggdb3"
-  cmake_flags << "-DLEXBOR_OPTIMIZATION_LEVEL='-O0 -g'"
+  lexbor_cmake_flags << "-DLEXBOR_OPTIMIZATION_LEVEL='-O0 -g'"
 end
 
 if ENV['NOKOLEXBOR_ASAN']
   $LDFLAGS << " -fsanitize=address"
   $CFLAGS << " -fsanitize=address -DNOKOLEXBOR_ASAN"
-  cmake_flags << "-DLEXBOR_BUILD_WITH_ASAN=ON"
+  lexbor_cmake_flags << "-DLEXBOR_BUILD_WITH_ASAN=ON"
 end
 
 append_cflags("-DLEXBOR_STATIC")
@@ -35,7 +74,7 @@ end
 
 def self.run_cmake(timeout, args)
   # Set to process group so we can kill it and its children
-  pgroup = Gem.win_platform? ? :new_pgroup : :pgroup
+  pgroup = (Gem.win_platform? && !ENV['NOKOLEXBOR_CROSS_COMPILE']) ? :new_pgroup : :pgroup
   pid = Process.spawn("cmake #{args}", pgroup => true)
 
   Timeout.timeout(timeout) do
@@ -50,21 +89,6 @@ rescue Timeout::Error
   raise CMakeTimeout.new("cmake has exceeded its timeout of #{timeout}s")
 end
 
-# From: https://stackoverflow.com/questions/2108727
-# Cross-platform way of finding an executable in the $PATH.
-#
-#   which('ruby') #=> /usr/bin/ruby
-def which(cmd)
-  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-    exts.each { |ext|
-      exe = File.join(path, "#{cmd}#{ext}")
-      return exe if File.executable? exe
-    }
-  end
-  return nil
-end
-
 # From: https://github.com/flavorjones/mini_portile/blob/main/lib/mini_portile2/mini_portile.rb#L94
 def apply_patch(patch_file, chdir)
   case
@@ -109,9 +133,7 @@ Dir.chdir(LEXBOR_DIR) do
   Dir.mkdir("build") if !Dir.exist?("build")
 
   Dir.chdir("build") do
-    # On Windows, Ruby-DevKit is MSYS-based, so ensure to use MSYS Makefiles.
-    generator = "-G \"MSYS Makefiles\"" if Gem.win_platform?
-    run_cmake(10 * 60, ".. -DCMAKE_INSTALL_PREFIX:PATH=#{INSTALL_DIR} #{cmake_flags.join(' ')} #{generator}")
+    run_cmake(10 * 60, ".. -DCMAKE_INSTALL_PREFIX:PATH=#{INSTALL_DIR} #{lexbor_cmake_flags.join(' ')}")
     sys("#{MAKE} install")
   end
 end
@@ -121,7 +143,7 @@ Dir.chdir(EXT_DIR) do
   Dir.mkdir("build") if !Dir.exist?("build")
 
   Dir.chdir("build") do
-    run_cmake(10 * 60, "..#{Gem.win_platform? ? " -DLIBXML2_WITH_THREADS=OFF" : ""}")
+    run_cmake(10 * 60, ".. #{cmake_flags.join(' ')} #{Gem.win_platform? ? "-DLIBXML2_WITH_THREADS=OFF" : ""}")
   end
 end
 

data/ext/nokolexbor/libxml/SAX2.h

@@ -21,17 +21,17 @@
 extern "C" {
 #endif
 XMLPUBFUN const xmlChar * XMLCALL
-		xmlSAX2GetPublicId		(void *ctx);
+		nl_xmlSAX2GetPublicId		(void *ctx);
 XMLPUBFUN const xmlChar * XMLCALL
-		xmlSAX2GetSystemId		(void *ctx);
+		nl_xmlSAX2GetSystemId		(void *ctx);
 XMLPUBFUN void XMLCALL
 		xmlSAX2SetDocumentLocator	(void *ctx,
 						 xmlSAXLocatorPtr loc);
 
 XMLPUBFUN int XMLCALL
-		xmlSAX2GetLineNumber		(void *ctx);
+		nl_xmlSAX2GetLineNumber		(void *ctx);
 XMLPUBFUN int XMLCALL
-		xmlSAX2GetColumnNumber		(void *ctx);
+		nl_xmlSAX2GetColumnNumber		(void *ctx);
 
 XMLPUBFUN int XMLCALL
 		xmlSAX2IsStandalone		(void *ctx);

data/ext/nokolexbor/libxml/chvalid.h

@@ -52,7 +52,7 @@ struct _xmlChRangeGroup {
  * Range checking routine
  */
 XMLPUBFUN int XMLCALL
-		xmlCharInRange(unsigned int val, const xmlChRangeGroup *group);
+		nl_xmlCharInRange(unsigned int val, const xmlChRangeGroup *group);
 
 
 /**
@@ -75,9 +75,9 @@ XMLPUBFUN int XMLCALL
  */
 #define xmlIsBaseCharQ(c)	(((c) < 0x100) ? \
 				 xmlIsBaseChar_ch((c)) : \
-				 xmlCharInRange((c), &xmlIsBaseCharGroup))
+				 nl_xmlCharInRange((c), &nl_xmlIsBaseCharGroup))
 
-XMLPUBVAR const xmlChRangeGroup xmlIsBaseCharGroup;
+XMLPUBVAR const xmlChRangeGroup nl_xmlIsBaseCharGroup;
 
 /**
  * xmlIsBlank_ch:
@@ -121,7 +121,7 @@ XMLPUBVAR const xmlChRangeGroup xmlIsBaseCharGroup;
 				 ((0xe000 <= (c)) && ((c) <= 0xfffd)) || \
 				 ((0x10000 <= (c)) && ((c) <= 0x10ffff))))
 
-XMLPUBVAR const xmlChRangeGroup xmlIsCharGroup;
+XMLPUBVAR const xmlChRangeGroup nl_xmlIsCharGroup;
 
 /**
  * xmlIsCombiningQ:
@@ -131,9 +131,9 @@ XMLPUBVAR const xmlChRangeGroup xmlIsCharGroup;
  */
 #define xmlIsCombiningQ(c)	(((c) < 0x100) ? \
 				 0 : \
-				 xmlCharInRange((c), &xmlIsCombiningGroup))
+				 nl_xmlCharInRange((c), &nl_xmlIsCombiningGroup))
 
-XMLPUBVAR const xmlChRangeGroup xmlIsCombiningGroup;
+XMLPUBVAR const xmlChRangeGroup nl_xmlIsCombiningGroup;
 
 /**
  * xmlIsDigit_ch:
@@ -151,9 +151,9 @@ XMLPUBVAR const xmlChRangeGroup xmlIsCombiningGroup;
  */
 #define xmlIsDigitQ(c)		(((c) < 0x100) ? \
 				 xmlIsDigit_ch((c)) : \
-				 xmlCharInRange((c), &xmlIsDigitGroup))
+				 nl_xmlCharInRange((c), &nl_xmlIsDigitGroup))
 
-XMLPUBVAR const xmlChRangeGroup xmlIsDigitGroup;
+XMLPUBVAR const xmlChRangeGroup nl_xmlIsDigitGroup;
 
 /**
  * xmlIsExtender_ch:
@@ -171,9 +171,9 @@ XMLPUBVAR const xmlChRangeGroup xmlIsDigitGroup;
  */
 #define xmlIsExtenderQ(c)	(((c) < 0x100) ? \
 				 xmlIsExtender_ch((c)) : \
-				 xmlCharInRange((c), &xmlIsExtenderGroup))
+				 nl_xmlCharInRange((c), &nl_xmlIsExtenderGroup))
 
-XMLPUBVAR const xmlChRangeGroup xmlIsExtenderGroup;
+XMLPUBVAR const xmlChRangeGroup nl_xmlIsExtenderGroup;
 
 /**
  * xmlIsIdeographicQ:
@@ -187,8 +187,8 @@ XMLPUBVAR const xmlChRangeGroup xmlIsExtenderGroup;
 				 ((c) == 0x3007) || \
 				 ((0x3021 <= (c)) && ((c) <= 0x3029))))
 
-XMLPUBVAR const xmlChRangeGroup xmlIsIdeographicGroup;
-XMLPUBVAR const unsigned char xmlIsPubidChar_tab[256];
+XMLPUBVAR const xmlChRangeGroup nl_xmlIsIdeographicGroup;
+XMLPUBVAR const unsigned char nl_xmlIsPubidChar_tab[256];
 
 /**
  * xmlIsPubidChar_ch:
@@ -196,7 +196,7 @@ XMLPUBVAR const unsigned char xmlIsPubidChar_tab[256];
  *
  * Automatically generated by genChRanges.py
  */
-#define xmlIsPubidChar_ch(c)	(xmlIsPubidChar_tab[(c)])
+#define xmlIsPubidChar_ch(c)	(nl_xmlIsPubidChar_tab[(c)])
 
 /**
  * xmlIsPubidCharQ:
@@ -208,21 +208,21 @@ XMLPUBVAR const unsigned char xmlIsPubidChar_tab[256];
 				 xmlIsPubidChar_ch((c)) : 0)
 
 XMLPUBFUN int XMLCALL
-		xmlIsBaseChar(unsigned int ch);
+		nl_xmlIsBaseChar(unsigned int ch);
 XMLPUBFUN int XMLCALL
-		xmlIsBlank(unsigned int ch);
+		nl_xmlIsBlank(unsigned int ch);
 XMLPUBFUN int XMLCALL
-		xmlIsChar(unsigned int ch);
+		nl_xmlIsChar(unsigned int ch);
 XMLPUBFUN int XMLCALL
-		xmlIsCombining(unsigned int ch);
+		nl_xmlIsCombining(unsigned int ch);
 XMLPUBFUN int XMLCALL
-		xmlIsDigit(unsigned int ch);
+		nl_xmlIsDigit(unsigned int ch);
 XMLPUBFUN int XMLCALL
-		xmlIsExtender(unsigned int ch);
+		nl_xmlIsExtender(unsigned int ch);
 XMLPUBFUN int XMLCALL
-		xmlIsIdeographic(unsigned int ch);
+		nl_xmlIsIdeographic(unsigned int ch);
 XMLPUBFUN int XMLCALL
-		xmlIsPubidChar(unsigned int ch);
+		nl_xmlIsPubidChar(unsigned int ch);
 
 #ifdef __cplusplus
 }

data/ext/nokolexbor/libxml/dict.h

@@ -28,52 +28,52 @@ typedef xmlDict *xmlDictPtr;
  * Initializer
  */
 XML_DEPRECATED
-XMLPUBFUN int XMLCALL  xmlInitializeDict(void);
+XMLPUBFUN int XMLCALL  nl_xmlInitializeDict(void);
 
 /*
  * Constructor and destructor.
  */
 XMLPUBFUN xmlDictPtr XMLCALL
-			xmlDictCreate	(void);
+			nl_xmlDictCreate	(void);
 XMLPUBFUN size_t XMLCALL
-			xmlDictSetLimit	(xmlDictPtr dict,
+			nl_xmlDictSetLimit	(xmlDictPtr dict,
                                          size_t limit);
 XMLPUBFUN size_t XMLCALL
-			xmlDictGetUsage (xmlDictPtr dict);
+			nl_xmlDictGetUsage (xmlDictPtr dict);
 XMLPUBFUN xmlDictPtr XMLCALL
-			xmlDictCreateSub(xmlDictPtr sub);
+			nl_xmlDictCreateSub(xmlDictPtr sub);
 XMLPUBFUN int XMLCALL
-			xmlDictReference(xmlDictPtr dict);
+			nl_xmlDictReference(xmlDictPtr dict);
 XMLPUBFUN void XMLCALL
-			xmlDictFree	(xmlDictPtr dict);
+			nl_xmlDictFree	(xmlDictPtr dict);
 
 /*
  * Lookup of entry in the dictionary.
  */
 XMLPUBFUN const xmlChar * XMLCALL
-			xmlDictLookup	(xmlDictPtr dict,
+			nl_xmlDictLookup	(xmlDictPtr dict,
 		                         const xmlChar *name,
 		                         int len);
 XMLPUBFUN const xmlChar * XMLCALL
-			xmlDictExists	(xmlDictPtr dict,
+			nl_xmlDictExists	(xmlDictPtr dict,
 		                         const xmlChar *name,
 		                         int len);
 XMLPUBFUN const xmlChar * XMLCALL
-			xmlDictQLookup	(xmlDictPtr dict,
+			nl_xmlDictQLookup	(xmlDictPtr dict,
 		                         const xmlChar *prefix,
 		                         const xmlChar *name);
 XMLPUBFUN int XMLCALL
-			xmlDictOwns	(xmlDictPtr dict,
+			nl_xmlDictOwns	(xmlDictPtr dict,
 					 const xmlChar *str);
 XMLPUBFUN int XMLCALL
-			xmlDictSize	(xmlDictPtr dict);
+			nl_xmlDictSize	(xmlDictPtr dict);
 
 /*
  * Cleanup function
  */
 XML_DEPRECATED
 XMLPUBFUN void XMLCALL
-                        xmlDictCleanup  (void);
+                        nl_xmlDictCleanup  (void);
 
 #ifdef __cplusplus
 }