Hideki Yamane pushed to branch debian/sid at Debian Java Maintainers / jcodings
Commits: a35d2eae by Marcin Mielzynski at 2018-09-20T16:18:13Z [maven-release-plugin] prepare for next development iteration - - - - - 422a1235 by Marcin Mielzynski at 2018-09-22T23:22:43Z add -html5 javadoc option - - - - - 78505daf by Marcin Mielzynski at 2018-10-03T21:49:11Z add shebang - - - - - ee1d9e08 by Marcin Mielzynski at 2018-10-03T23:04:30Z sort transcoder entries by name - - - - - 226a7597 by Marcin Mielzynski at 2018-10-03T23:07:44Z use .rodata section on linux - - - - - 1443a7b4 by Marcin Mielzynski at 2018-10-04T19:33:22Z fix code range and transcoder binary file naming - - - - - 70c6621e by Marcin Mielzynski at 2018-10-05T19:31:14Z whoops, redundant - - - - - a90dbc47 by Marcin Mielzynski at 2018-10-11T18:18:24Z support table generation on osx - - - - - 292dde52 by Marcin Mielzynski at 2018-10-12T17:05:00Z [maven-release-plugin] prepare release jcodings-1.0.41 - - - - - fcfa0615 by Hideki Yamane at 2018-10-15T12:37:36Z Merge tag 'jcodings-1.0.41' into debian/sid [maven-release-plugin] copy for tag jcodings-1.0.41 - - - - - 454438a1 by Hideki Yamane at 2018-10-15T12:38:11Z new upstream release - - - - - 5fca39d3 by Hideki Yamane at 2018-10-15T12:39:55Z refresh patch - - - - - 6 changed files: - debian/changelog - debian/patches/remove_unnecessary_dependency.patch - pom.xml - resources/tables/CR_In_Miscellaneous_Symbols_And_Pictographs.bin → resources/tables/CR_In_Miscellaneous_Symbols_and_Pictographs.bin - resources/tables/CR_In_Transport_And_Map_Symbols.bin → resources/tables/CR_In_Transport_and_Map_Symbols.bin - scripts/generate.rb Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +jcodings (1.0.41-1) unstable; urgency=medium + + * New upstream release + * debian/patches + - refresh patch + + -- Hideki Yamane <[email protected]> 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> ===================================== resources/tables/CR_In_Miscellaneous_Symbols_And_Pictographs.bin → resources/tables/CR_In_Miscellaneous_Symbols_and_Pictographs.bin ===================================== ===================================== resources/tables/CR_In_Transport_And_Map_Symbols.bin → resources/tables/CR_In_Transport_and_Map_Symbols.bin ===================================== ===================================== scripts/generate.rb ===================================== @@ -1,7 +1,13 @@ +#!/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") View it on GitLab: https://salsa.debian.org/java-team/jcodings/compare/1f6f8977796d28c239898d906aee115cb8396f41...5fca39d387a0d3f54a0805430956e294b821310f -- View it on GitLab: https://salsa.debian.org/java-team/jcodings/compare/1f6f8977796d28c239898d906aee115cb8396f41...5fca39d387a0d3f54a0805430956e294b821310f You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
