emf2svg 1.2.1 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/main.yml +9 -5
  3. data/.github/workflows/release.yml +5 -1
  4. data/.rubocop.yml +1 -1
  5. data/Rakefile +9 -0
  6. data/emf2svg.gemspec +1 -1
  7. data/lib/emf2svg/recipe.rb +32 -9
  8. data/lib/emf2svg/version.rb +1 -1
  9. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1a04dc3833be5d000b3acc8eabada931ca67b70a6fec7381f72ed5058530c68a
4
- data.tar.gz: b24cf43224403d1203e6091f9522ba6c32179f1b8382636e967c5033078f1925
3
+ metadata.gz: 84a66d03c623b49f285016b063df075a6373ead2c095446b56b5a55ab379e043
4
+ data.tar.gz: 851c1443ba32d6e4d49f157e1159d4fbec38d1fe0f3277a96ff21e85d1c3b8df
5
5
  SHA512:
6
- metadata.gz: 167ab716215f0e6f5b2a78684c38af7202f3b89b84ff031a772f55b956a651ca86cd9a2ac114c1ac870fb0e8882a0d9f7a679dce51c827a2e8de27f7f823a919
7
- data.tar.gz: 59dc4def546200c65156ea60e8eed0436ce4fde616172b3db2d8fdbd9a359ebbd3171be7259fb1ac0c9f277410bc9b71514cbc3befb016d5248dd9d7592dba65
6
+ metadata.gz: 7ddeb8a85f0716e86746a1c50ddef3d7bd7dde9d1e7184ab179f8adc293371e9da27985c92b533b244c590426d50573ed4411c0c40cc3e93af82948c45d12808
7
+ data.tar.gz: 8a85fd97428bba4ab76d01f59e7c328587abcf078de7bb557cadeb8175d2da7197ce301d4a39f4966d664119c0ab3c789ac23c730d1ac566faa1c27aeed2433b
data/.github/workflows/main.yml CHANGED
@@ -10,7 +10,7 @@ jobs:
10
10
  test:
11
11
  runs-on: ${{ matrix.os }}
12
12
  strategy:
13
- max-parallel: 3
13
+ max-parallel: 4
14
14
  fail-fast: false
15
15
  matrix:
16
16
  os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
@@ -31,7 +31,7 @@ jobs:
31
31
  build:
32
32
  runs-on: ${{ matrix.os }}
33
33
  strategy:
34
- max-parallel: 3
34
+ max-parallel: 4
35
35
  fail-fast: false
36
36
  matrix:
37
37
  include:
@@ -76,7 +76,7 @@ jobs:
76
76
  needs: build
77
77
  runs-on: ${{ matrix.os }}
78
78
  strategy:
79
- max-parallel: 3
79
+ max-parallel: 4
80
80
  fail-fast: false
81
81
  matrix:
82
82
  include:
@@ -132,17 +132,21 @@ jobs:
132
132
  cross:
133
133
  runs-on: ${{ matrix.os }}
134
134
  strategy:
135
- max-parallel: 3
135
+ max-parallel: 4
136
136
  fail-fast: false
137
137
  matrix:
138
138
  include:
139
- - os: ubuntu-18.04
139
+ - os: ubuntu-latest
140
140
  platform: arm64-linux
141
141
  ruby-version: '2.7'
142
+ - os: macos-latest
143
+ platform: arm64-darwin
144
+ ruby-version: '2.7'
142
145
  steps:
143
146
  - uses: actions/checkout@v2
144
147
 
145
148
  - name: Install packages
149
+ if: matrix.os == 'ubuntu-latest'
146
150
  run: |
147
151
  sudo apt-get update
148
152
  sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf
data/.github/workflows/release.yml CHANGED
@@ -57,13 +57,17 @@ jobs:
57
57
  fail-fast: false
58
58
  matrix:
59
59
  include:
60
- - os: ubuntu-18.04
60
+ - os: ubuntu-latest
61
61
  platform: arm64-linux
62
62
  ruby-version: '2.7'
63
+ - os: macos-latest
64
+ platform: arm64-darwin
65
+ ruby-version: '2.7'
63
66
  steps:
64
67
  - uses: actions/checkout@v2
65
68
 
66
69
  - name: Install packages
70
+ if: matrix.os == 'ubuntu-latest'
67
71
  run: |
68
72
  sudo apt-get update
69
73
  sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf
data/.rubocop.yml CHANGED
@@ -2,7 +2,7 @@ inherit_from:
2
2
  - 'https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml'
3
3
 
4
4
  AllCops:
5
- TargetRubyVersion: 2.7
5
+ TargetRubyVersion: 2.5
6
6
  SuggestExtensions: false
7
7
 
8
8
  Gemspec/RequireMFA:
data/Rakefile CHANGED
@@ -35,7 +35,16 @@ platforms = [
35
35
  "x64-mingw-ucrt",
36
36
  "x86_64-linux",
37
37
  "arm64-linux",
38
+ "aarch64-linux",
38
39
  "x86_64-darwin",
40
+ "arm64-darwin",
41
+ "aarch64-darwin",
42
+ "x86_64-macos",
43
+ "arm64-macos",
44
+ "aarch64-macos",
45
+ "x86_64-osx",
46
+ "arm64-osx",
47
+ "aarch64-osx",
39
48
  ]
40
49
 
41
50
  platforms.each do |platform|
data/emf2svg.gemspec CHANGED
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
11
11
  spec.summary = "Ruby interface to libemf2svg."
12
12
  spec.homepage = "https://github.com/metanorma/emf2svg-ruby"
13
13
  spec.license = "BSD-2-Clause"
14
- spec.required_ruby_version = ">= 2.7.0"
14
+ spec.required_ruby_version = ">= 2.5.0"
15
15
 
16
16
  spec.metadata["homepage_uri"] = spec.homepage
17
17
  spec.metadata["source_code_uri"] = "https://github.com/metanorma/emf2svg-ruby"
data/lib/emf2svg/recipe.rb CHANGED
@@ -8,11 +8,11 @@ module Emf2svg
8
8
  ROOT = Pathname.new(File.expand_path("../..", __dir__))
9
9
 
10
10
  def initialize
11
- super("libemf2svg", "1.4.0")
11
+ super("libemf2svg", "1.6.0")
12
12
 
13
13
  @files << {
14
- url: "https://github.com/metanorma/libemf2svg/releases/download/v1.4.0/libemf2svg.tar.gz",
15
- sha256: "e05081986a0ec6c5bd494068825c7b55dd21fa1814942a61293b225af2d957d2", # rubocop:disable Layout/LineLength
14
+ url: "https://github.com/metanorma/libemf2svg/releases/download/v1.6.0/libemf2svg.tar.gz",
15
+ sha256: "0f186f40b98c06acdec1278a314cEc1f093e7504d34f7a15b697ebfe6c4d3097", # rubocop:disable Layout/LineLength
16
16
  }
17
17
 
18
18
  @target = ROOT.join(@target).to_s
@@ -44,21 +44,44 @@ module Emf2svg
44
44
  "arm64-linux"
45
45
  when /\Ai[3-6]86.*linux/
46
46
  "x86-linux"
47
- when /\Ax86_64.*darwin/
47
+ when /\Ax86_64.*(darwin|macos|osx)/
48
48
  "x86_64-darwin"
49
- when /\Aarm64.*darwin/
49
+ when /\A(arm64|aarch64).*(darwin|macos|osx)/
50
50
  "arm64-darwin"
51
51
  else
52
52
  @host
53
53
  end
54
54
  end
55
- # rubocop:enable Metrics/CyclomaticComplexity
56
- # rubocop:enable Metrics/MethodLength
57
55
 
58
56
  def target_platform
59
- @target_platform = ENV["target_platform"] || host_platform
57
+ @target_platform ||=
58
+ case ENV["target_platform"]
59
+ when /\A(arm64|aarch64).*(darwin|macos|osx)/
60
+ "arm64-darwin"
61
+ when /\Ac86_64.*(darwin|macos|osx)/
62
+ "x86_64-darwin"
63
+ when /\A(arm64|aarch64).*linux/
64
+ "arm64-linux"
65
+ else
66
+ ENV["target_platform"] || host_platform
67
+ end
60
68
  end
61
69
 
70
+ def target_triplet
71
+ @target_triplet ||=
72
+ case target_platform
73
+ when "arm64-darwin"
74
+ "arm64-osx"
75
+ when "x86_64-darwin"
76
+ "x86_64-osx"
77
+ else
78
+ target_platform
79
+ end
80
+ end
81
+
82
+ # rubocop:enable Metrics/CyclomaticComplexity
83
+ # rubocop:enable Metrics/MethodLength
84
+
62
85
  def cross_compiling?
63
86
  not host_platform.eql? target_platform
64
87
  end
@@ -78,7 +101,7 @@ module Emf2svg
78
101
 
79
102
  if cross_compiling? && (not MiniPortile.windows?)
80
103
  message("Cross-compiling on #{host_platform} for #{target_platform}\n")
81
- opts << "-DVCPKG_TARGET_TRIPLET=#{target_platform}"
104
+ opts << "-DVCPKG_TARGET_TRIPLET=#{target_triplet}"
82
105
  end
83
106
 
84
107
  opts
data/lib/emf2svg/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Emf2svg
4
- VERSION = "1.2.1"
4
+ VERSION = "1.3.0"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: emf2svg
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-03-22 00:00:00.000000000 Z
11
+ date: 2022-03-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ffi
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
123
123
  requirements:
124
124
  - - ">="
125
125
  - !ruby/object:Gem::Version
126
- version: 2.7.0
126
+ version: 2.5.0
127
127
  required_rubygems_version: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - ">="