debian/changelog

+jcodings (1.0.41-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/patches
+    - refresh patch
+
+ -- Hideki Yamane <henrich@debian.org>  Mon, 15 Oct 2018 21:38:06 +0900
+
 jcodings (1.0.40-3) unstable; urgency=medium
 
   * debian/control

debian/patches/remove_unnecessary_dependency.patch

@@ -6,7 +6,7 @@ Last-Update: 2018-09-17
 --- a/pom.xml
 +++ b/pom.xml
 @@ -6,11 +6,6 @@
-   <version>1.0.40</version>
+   <version>1.0.41</version>
    <name>JCodings</name>
    <description>Byte based encoding support library for java</description>
 -  <parent>

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jruby.jcodings</groupId>
   <artifactId>jcodings</artifactId>
-  <version>1.0.40</version>
+  <version>1.0.41</version>
   <name>JCodings</name>
   <description>Byte based encoding support library for java</description>
   <parent>
@@ -147,7 +147,7 @@
           </plugin>
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -157,7 +157,8 @@
               </execution>
             </executions>
             <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
+              <additionalJOption>-Xdoclint:none</additionalJOption>
+              <additionalOptions>-html5</additionalOptions>
               <quiet>true</quiet>
             </configuration>
           </plugin>

scripts/generate.rb

+#!/usr/bin/env ruby
 # coding: utf-8
 
 REPO_PATH = ARGV.first || '/usr/src/ruby-2.5.1' # path to ruby repo
-SECTION_NAME = "rdata"
+SECTION_NAME, G_PREFIX = case RUBY_PLATFORM
+when /linux/i; ["rodata", ""]
+when /darwin/i; ["const_data", "g"]
+else ;["rdata", ""]
+end
+
 UNICODE_VERSION = "10.0.0"
 SRC_DIR = "../src/org/jcodings"
 DST_BIN_DIR =  "../resources/tables"
@@ -18,8 +24,8 @@ end
 
 def process_binary obj_name
     binary = open(obj_name, "rb"){|f|f.read}
-    offset = `objdump -h -j .#{SECTION_NAME} #{obj_name}`[/\.#{SECTION_NAME}.*?(\w+)\s+\S+$/, 1].to_i(16)
-    `nm --no-sort --defined-only #{obj_name}`.split("\n").map{|s|s.split(/\s+/)}.each do |address, _, name|
+    offset = `#{G_PREFIX}objdump -h -j .#{SECTION_NAME} #{obj_name}`[/\.#{SECTION_NAME}.*?(\w+)\s+\S+$/, 1].to_i(16)
+    `#{G_PREFIX}nm --no-sort --defined-only #{obj_name}`.split("\n").map{|s|s.split(/\s+/)}.each do |address, _, name|
         yield name, binary, address.to_i(16) + offset
     end
 end
@@ -86,7 +92,7 @@ def generate_transcoder_list
     generic_list = []
     transcoder_list = []
 
-    Dir["#{REPO_PATH}/enc/trans/*.c"].reject{|f| f =~ /transdb/}.each do |trans_file|
+    Dir["#{REPO_PATH}/enc/trans/*.c"].reject{|f| f =~ /transdb/}.sort.each do |trans_file|
         name = trans_file[/(\w+)\.c/, 1].split('_').map{|e| e.capitalize}.join("")
         trans_src = open(trans_file){|f|f.read}
 
@@ -113,23 +119,24 @@ def generate_transcoder_list
 end
 
 def generate_transoder_data
-    Dir["#{REPO_PATH}/enc/trans/*.c"].reject{|f| f =~ /transdb/}.each do |trans_file|
+    Dir["#{REPO_PATH}/enc/trans/*.c"].reject{|f| f =~ /transdb/}.sort.each do |trans_file|
         # next unless trans_file =~ /utf8/
         trans_file = trans_file[/(.*)\./, 1]
         src = open("#{trans_file}.c", "rb").read
+        make_name = -> (name) {name.split('_').map{|e|e.capitalize}.join('')}
         process_binary "#{trans_file}.o" do |name, binary, address|
             case name
             when /(.*)_byte_array/
                 name = $1
                 size = src[/(\w+?_byte_array)\[(\d+?)\]/m, 2].to_i
-                open("#{DST_BIN_DIR}/" + "Transcoder_#{name.capitalize.tr('_', '')}_ByteArray.bin", "wb") do |f|
+                open("#{DST_BIN_DIR}/" + "Transcoder_#{make_name.(name)}_ByteArray.bin", "wb") do |f|
                     f << [size].pack("N")
                     f << binary[address, size]
                 end
             when /(.*)_word_array/
                 name = $1
                 size = src[/(\w+?_word_array)\[(\d+?)\]/m, 2].to_i
-                open("#{DST_BIN_DIR}/" + "Transcoder_#{name.capitalize.tr('_', '')}_WordArray.bin", "wb") do |f|
+                open("#{DST_BIN_DIR}/" + "Transcoder_#{make_name.(name)}_WordArray.bin", "wb") do |f|
                     f << [size].pack("N")
                     address.step(address + (size * 4 - 1), 4).each do |adr|
                         f << binary[adr, 4].unpack("l").pack("N")