emf2svg 1.0.0-x64-mingw32 → 1.2.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7513937773bd6544eaa43ee27090ef54c5d4692a3ae5fba36b9dab8086851fc
-  data.tar.gz: 711652a830aef3205d4d3aec7da28c1b49db66d255f2252a1d3f7807e092280c
+  metadata.gz: 9ae6121102d164899f348d406a8df56fa407a8c26ce14621d58cf0b33d50ee89
+  data.tar.gz: 5ea0ebaa05d56fb48a015f356a7cd7bd1023669f0fe5ad9bef26db996f88b73a
 SHA512:
-  metadata.gz: 86291df0f7e62095ef9210a3d6c9e5b89155ea5cf5b832387d6967db8aaced587050c5b0be3085a8deabb93cf568da18c9bb4cdba109c799ca79b408b81ca183
-  data.tar.gz: 02344b44ffb0c5504b57f5c10c35ca3fa027d58c2e1e87daf5087368cdb50d8f38937fe14428b1dd3293f7b3b8e0f7a28d85e09059e8d8ac59f1640f018fe4ae
+  metadata.gz: c9ce0260c95c54372f1f95ff4794b83be8980413634bf61fa4ec7cf4806d9b8d611fc4bd275169743fc20beb4ed5580f887754bfcdcdbc48ecb453376397caee
+  data.tar.gz: 05c70a66c18e93444101fb89733b7ae0270cc10e161335f8cad5d51c26747710d0f7169d2a33e71b011fabb81814d74bb7e189f56e0509e734309a7cc4055ba5

data/.github/workflows/main.yml

@@ -2,46 +2,60 @@ name: main
 
 on:
   push:
-    branches: [ main, master ]
+    branches: [ main ]
   pull_request:
+  workflow_dispatch:
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
         os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
+        ruby-version: [ '2.7' ]
+        include:
+          - os: windows-latest
+            ruby-version: '3.1'
     steps:
     - uses: actions/checkout@v2
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.6
         bundler-cache: true
+        ruby-version: ${{ matrix.ruby-version }}
 
     - run: bundle exec rake
 
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-18.04
             platform: any
+            ruby-version: '2.7'
           - os: ubuntu-18.04
             platform: x86_64-linux
+            ruby-version: '2.7'
           - os: windows-latest
             platform: x64-mingw32
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw-ucrt
+            ruby-version: '3.1'
           - os: macos-latest
             platform: x86_64-darwin
+            ruby-version: '2.7'
     steps:
       - uses: actions/checkout@v2
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
       - run: bundle exec rake gem:native:${{ matrix.platform }}
@@ -52,7 +66,7 @@ jobs:
           path: pkg/*.gem
 
       - name: Install gem
-        run: gem install --no-document pkg/emf2svg-*.gem
+        run: gem install -b pkg/emf2svg-*.gem
 
       - name: Test conversion
         run: |
@@ -62,29 +76,41 @@ jobs:
     needs: build
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
             platform: any
+            ruby-version: '2.7'
           - os: windows-latest
             platform: any
+            ruby-version: '2.7'
           - os: macos-latest
             platform: any
+            ruby-version: '2.7'
           - os: ubuntu-18.04
             platform: x86_64-linux
+            ruby-version: '2.7'
           - os: ubuntu-latest
             platform: x86_64-linux
+            ruby-version: '2.7'
           - os: windows-latest
             platform: x64-mingw32
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw-ucrt
+            ruby-version: '3.1'
           - os: macos-latest
             platform: x86_64-darwin
+            ruby-version: '2.7'
+            
     steps:
       - uses: actions/checkout@v2
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: ${{ matrix.ruby-version }}
 
       - uses: actions/download-artifact@v2
         with:
@@ -93,12 +119,45 @@ jobs:
 
       - name: Install native gem
         if: matrix.platform == 'any'
-        run: gem install --no-document pkg/emf2svg-$(ruby -I lib -r emf2svg/version -e "puts Emf2svg::VERSION").gem
+        run: gem install -b pkg/emf2svg-$(ruby -I lib -r emf2svg/version -e "puts Emf2svg::VERSION").gem
 
       - name: Install binary gem
         if: matrix.platform != 'any'
-        run: gem install --no-document pkg/emf2svg-*-${{ matrix.platform }}.gem
+        run: gem install -b pkg/emf2svg-*-${{ matrix.platform }}.gem
 
       - name: Test conversion
         run: |
           ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
+
+  cross:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 3
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-18.04
+            platform: arm64-linux
+            ruby-version: '2.7'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf
+        
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - run: bundle exec rake gem:native:${{ matrix.platform }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pkg
+          path: pkg/*.gem
+
+      - name: Install gem
+        run: gem install -b pkg/emf2svg-*.gem

data/.github/workflows/release.yml

@@ -9,23 +9,31 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-18.04
             platform: any
+            ruby-version: '2.7'
           - os: ubuntu-18.04
             platform: x86_64-linux
+            ruby-version: '2.7'
           - os: windows-latest
             platform: x64-mingw32
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw-ucrt
+            ruby-version: '3.1'
           - os: macos-latest
             platform: x86_64-darwin
+            ruby-version: '2.7'
     steps:
       - uses: actions/checkout@v2
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
       - run: bundle exec rake gem:native:${{ matrix.platform }}
@@ -36,21 +44,54 @@ jobs:
           path: pkg/*.gem
 
       - name: Install gem
-        run: gem install --no-document pkg/emf2svg-*.gem
+        run: gem install -b pkg/emf2svg-*.gem
 
       - name: Test conversion
         run: |
           ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
 
+  cross:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 3
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-18.04
+            platform: arm64-linux
+            ruby-version: '2.7'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf
+        
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - run: bundle exec rake gem:native:${{ matrix.platform }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pkg
+          path: pkg/*.gem
+
+      - name: Install gem
+        run: gem install -b pkg/emf2svg-*.gem
+
   publish:
-    needs: build
+    needs: [ build, cross ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: '2.7'
           bundler-cache: true
 
       - uses: actions/download-artifact@v2

data/.rubocop.yml

@@ -2,4 +2,8 @@ inherit_from:
   - 'https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml'
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
+  SuggestExtensions: false
+
+Gemspec/RequireMFA:
+  Enabled: false

data/Rakefile

@@ -32,14 +32,16 @@ end
 
 platforms = [
   "x64-mingw32",
+  "x64-mingw-ucrt",
   "x86_64-linux",
+  "arm64-linux",
   "x86_64-darwin",
 ]
 
 platforms.each do |platform|
   desc "Build pre-compiled gem for the #{platform} platform"
   task "gem:native:#{platform}" do
-    sh "rake compile platform:#{platform} gem"
+    sh "rake compile platform:#{platform} gem target_platform=#{platform}"
   end
 
   desc "Define the gem task to build on the #{platform} platform (binary gem)"

data/emf2svg.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Ruby interface to libemf2svg."
   spec.homepage      = "https://github.com/metanorma/emf2svg-ruby"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/metanorma/emf2svg-ruby"

data/lib/emf2svg/recipe.rb

@@ -1,3 +1,4 @@
+require "rbconfig"
 require "mini_portile2"
 require "pathname"
 require "tmpdir"
@@ -7,11 +8,11 @@ module Emf2svg
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
 
     def initialize
-      super("libemf2svg", "1.3.0")
+      super("libemf2svg", "1.4.0")
 
       @files << {
-        url: "https://github.com/metanorma/libemf2svg/releases/download/1.3.0/libemf2svg.tar.gz",
-        sha256: "aacbf001701e3f863e97c6c117146ee710636283851d866b715de653fb79343e", # rubocop:disable Layout/LineLength
+        url: "https://github.com/metanorma/libemf2svg/releases/download/v1.4.0/libemf2svg.tar.gz",
+        sha256: "e05081986a0ec6c5bd494068825c7b55dd21fa1814942a61293b225af2d957d2", # rubocop:disable Layout/LineLength
       }
 
       @target = ROOT.join(@target).to_s
@@ -28,8 +29,42 @@ module Emf2svg
       FileUtils.touch(checkpoint)
     end
 
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def host_platform
+      @host_platform ||=
+        case @host
+        when /\Ax86_64.*mingw32/
+          "x64-mingw32"
+        when /\Ai[3-6]86.*mingw32/
+          "x86-mingw32"
+        when /\Ax86_64.*linux/
+          "x86_64-linux"
+        when /\A(arm64|aarch64).*linux/
+          "arm64-linux"
+        when /\Ai[3-6]86.*linux/
+          "x86-linux"
+        when /\Ax86_64.*darwin/
+          "x86_64-darwin"
+        when /\Aarm64.*darwin/
+          "arm64-darwin"
+        else
+          @host
+        end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
+
+    def target_platform
+      @target_platform = ENV["target_platform"] || host_platform
+    end
+
+    def cross_compiling?
+      not host_platform.eql? target_platform
+    end
+
     def checkpoint
-      File.join(@target, "#{name}-#{version}-#{host}.installed")
+      File.join(@target, "#{name}-#{version}-#{target_platform}.installed")
     end
 
     def configure_defaults
@@ -37,9 +72,13 @@ module Emf2svg
 
       opts << "-DCMAKE_BUILD_TYPE=Release"
 
-      if MiniPortile.windows?
+      if MiniPortile.windows? || cross_compiling?
         opts << "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
-        opts << "-GVisual Studio 16 2019"
+      end
+
+      if cross_compiling? && (not MiniPortile.windows?)
+        message("Cross-compiling on #{host_platform} for #{target_platform}\n")
+        opts << "-DVCPKG_TARGET_TRIPLET=#{target_platform}"
       end
 
       opts

data/lib/emf2svg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Emf2svg
-  VERSION = "1.0.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emf2svg
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: x64-mingw32
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -98,7 +98,6 @@ files:
 - lib/emf2svg/fontconfig-1.dll
 - lib/emf2svg/freetype.dll
 - lib/emf2svg/iconv-2.dll
-- lib/emf2svg/intl-8.dll
 - lib/emf2svg/libexpat.dll
 - lib/emf2svg/libpng16.dll
 - lib/emf2svg/recipe.rb
@@ -119,14 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ruby interface to libemf2svg.