emf2svg 1.1.1-x64-mingw32 → 1.3.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97d4f2f978fb14ae224bb4dd9813d018eafea261c67dcb1f17c3897cdee0cf43
-  data.tar.gz: 064b2fbcd6188e24a22d76cacb8a4224121360a740dadefcccc22c1a09901be1
+  metadata.gz: 7f0a2d49ece4961dc2255c1b04fe18ab0c6bdc2a07256aa4ddb2ebad8ab76794
+  data.tar.gz: 7bd4def2d3736b974b1ba657a79e7857250c4a6a1b037e4445f268f67751358b
 SHA512:
-  metadata.gz: 4b6196df190b61a05e9d8ea880dfe580b4b2f15c81ff519579d15941e8abc73f50899df6ee1f9fc6ecb226331452804bbbd08c6c247a43e68b5243bb80f121c1
-  data.tar.gz: 7604721b144fea96d0ac2e46019dadeaa02481bded0e76bf8e9404d203b8e023a764c780bdf74e8e03069e302f44822ee867b48c7e492b634acee2c42209446a
+  metadata.gz: 64690bd78188967b0e3800b4ce15ba1c949fad3d5fc47b32ace8aed1b1033545acdbc806dbb4d807003046c64d4dc35f35213586a3b1e606b197d2940fe517d3
+  data.tar.gz: 70782d4c9fad691c232044087fcf83ff2171e1d13e9b41b2f37028163f14fabded2e3ea382522709249341da5305c1e2addb69f5334e55607e69094331c5fffb

data/.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: main
 
 on:
   push:
-    branches: [ main, master ]
+    branches: [ main ]
   pull_request:
   workflow_dispatch:
 
@@ -10,6 +10,7 @@ jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 4
       fail-fast: false
       matrix:
         os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
@@ -22,14 +23,15 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
+        ruby-version: ${{ matrix.ruby-version }}
 
     - run: bundle exec rake
 
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 4
       fail-fast: false
       matrix:
         include:
@@ -74,6 +76,7 @@ jobs:
     needs: build
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 4
       fail-fast: false
       matrix:
         include:
@@ -101,6 +104,7 @@ jobs:
           - os: macos-latest
             platform: x86_64-darwin
             ruby-version: '2.7'
+            
     steps:
       - uses: actions/checkout@v2
 
@@ -124,3 +128,40 @@ jobs:
       - 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: 4
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            platform: arm64-linux
+            ruby-version: '2.7'
+          - os: macos-latest
+            platform: arm64-darwin
+            ruby-version: '2.7'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        if: matrix.os == 'ubuntu-latest'
+        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,6 +9,7 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
         include:
@@ -49,8 +50,45 @@ jobs:
         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-latest
+            platform: arm64-linux
+            ruby-version: '2.7'
+          - os: macos-latest
+            platform: arm64-darwin
+            ruby-version: '2.7'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        if: matrix.os == 'ubuntu-latest'
+        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

data/.rubocop.yml

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

data/Rakefile

@@ -34,13 +34,23 @@ platforms = [
   "x64-mingw32",
   "x64-mingw-ucrt",
   "x86_64-linux",
+  "arm64-linux",
+  "aarch64-linux",
   "x86_64-darwin",
+  "arm64-darwin",
+  "aarch64-darwin",
+  "x86_64-macos",
+  "arm64-macos",
+  "aarch64-macos",
+  "x86_64-osx",
+  "arm64-osx",
+  "aarch64-osx",
 ]
 
 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.7.0"
+  spec.required_ruby_version = ">= 2.5.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.1")
+      super("libemf2svg", "1.6.0")
 
       @files << {
-        url: "https://github.com/metanorma/libemf2svg/releases/download/1.3.1/libemf2svg.tar.gz",
-        sha256: "732c60c54d0692a8634221e6ffb0733ad0bb1d9a246a03ba2433c535441eb73e", # rubocop:disable Layout/LineLength
+        url: "https://github.com/metanorma/libemf2svg/releases/download/v1.6.0/libemf2svg.tar.gz",
+        sha256: "0f186f40b98c06acdec1278a314cEc1f093e7504d34f7a15b697ebfe6c4d3097", # rubocop:disable Layout/LineLength
       }
 
       @target = ROOT.join(@target).to_s
@@ -28,8 +29,65 @@ 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|macos|osx)/
+          "x86_64-darwin"
+        when /\A(arm64|aarch64).*(darwin|macos|osx)/
+          "arm64-darwin"
+        else
+          @host
+        end
+    end
+
+    def target_platform
+      @target_platform ||=
+        case ENV["target_platform"]
+        when /\A(arm64|aarch64).*(darwin|macos|osx)/
+          "arm64-darwin"
+        when /\Ac86_64.*(darwin|macos|osx)/
+          "x86_64-darwin"
+        when /\A(arm64|aarch64).*linux/
+          "arm64-linux"
+        else
+          ENV["target_platform"] || host_platform
+        end
+    end
+
+    def target_triplet
+      @target_triplet ||=
+        case target_platform
+        when "arm64-darwin"
+          "arm64-osx"
+        when "x86_64-darwin"
+          "x86_64-osx"
+        else
+          target_platform
+        end
+    end
+
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
+
+    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,10 +95,15 @@ module Emf2svg
 
       opts << "-DCMAKE_BUILD_TYPE=Release"
 
-      if MiniPortile.windows?
+      if MiniPortile.windows? || cross_compiling?
         opts << "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
       end
 
+      if cross_compiling? && (not MiniPortile.windows?)
+        message("Cross-compiling on #{host_platform} for #{target_platform}\n")
+        opts << "-DVCPKG_TARGET_TRIPLET=#{target_triplet}"
+      end
+
       opts
     end
 

data/lib/emf2svg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emf2svg
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: x64-mingw32
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="