emf2svg 1.1.1-x86_64-linux → 1.3.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c3e4be69da52e2d6e0877a108982ca3c45c40000a343da25ef3e4a48432710
-  data.tar.gz: 23f56219df2f9feb5544e8d4bcbd12ec36b30eb7aa19768749c3ba99782c7c7b
+  metadata.gz: 97c97332398805ddf4b0ab23e10ca8c83f798d0fac88a290b336d9c5e3c79d28
+  data.tar.gz: e8f9fcaa174837ef74e89fef0a9b2596ade0c3eacfa9fbd8c75d162aa3426f8a
 SHA512:
-  metadata.gz: 135c3e21141f382ad0276910564dc58ca69b179a4c7daf429592a790187541f533408e5e478968164b9ea77e620000f8367c59a3eb9148a143107862479ff036
-  data.tar.gz: 9b84a00f02cea6604fa6fe01cb6770e99da80f004156d442fbcc02ec0d0bcaed9cb28257025d67d3638bdb373c56bc0be5966e60fd62aeae19e89938724df60c
+  metadata.gz: dc6e6bc9d8f32a1c51d4a87a128a7e44f3bf36223a7498a12ca464e9b134b111b7fc5ccd5f109876a917b7b1240f38990b0885ca3fac06b9445f6cae8a8e5c43
+  data.tar.gz: 90991eadcfd362f2ca769919166df55f4c5c731118de2e42a4ec79039c82e93fb75b45d71e2100c39e26652093fede4ba9108da8a979b64ae8291c87ee7d93a3

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: x86_64-linux
 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
@@ -109,7 +109,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:
   - - ">="