mini_portile2 2.8.5 → 2.8.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +36 -7
  3. data/CHANGELOG.md +7 -0
  4. data/lib/mini_portile2/mini_portile_cmake.rb +3 -0
  5. data/lib/mini_portile2/version.rb +1 -1
  6. data/test/test_cmake.rb +23 -0
  7. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8f53843a25ac2651fd9970c34a44edf44de0904f99d9e63eadb3802f8dcd59bc
4
- data.tar.gz: 075527f5c56f12de2ba5e3dfd72965a0093f62558eabb02571be5aee61cbe9f5
3
+ metadata.gz: 8e05baa930606f2d6523ea99ac9e8eedebd895c7ce4d54cfeb66ec18cd765929
4
+ data.tar.gz: 4176f83bb1d2bba075e03e3e97d3205198cf595d6462da3c3004cae98421c341
5
5
  SHA512:
6
- metadata.gz: 0e251640701cf8ea166e1ce6725b8e7bf3d3dbf20a659a6b90ffe127667a80f908fab5b7f816f8a766edd4166464d5375c53a3c31c862a4a7a04e0e87929127d
7
- data.tar.gz: 1d540e216342ef799de2188935d6de440b865606a244dd7ca6a27146a259bf5a1211c53b49668eee668187770e5e030d06508b4605779c4366999dcf831cc2b3
6
+ metadata.gz: 9d665ab774d8f71ed02c2f0fc1fb79cea7dfaf4b989093afe58f666f9b71d731d95981e261e21d49c2d8ccbea759929ad3dce0420885daf1251a834e6c060f6f
7
+ data.tar.gz: d225acb7e38adff4ad72f54a5dfa786791a45c61cff83c8cf8e85aef749446632da5d23dbf133ff6617304b47ded60b617fd2a0582b759216390add7d69b1565
data/.github/workflows/ci.yml CHANGED
@@ -33,7 +33,7 @@ jobs:
33
33
  run: |
34
34
  git config --system core.autocrlf false
35
35
  git config --system core.eol lf
36
- - uses: actions/checkout@v3
36
+ - uses: actions/checkout@v4
37
37
  - uses: MSP-Greg/setup-ruby-pkgs@v1
38
38
  with:
39
39
  apt-get: _update_ build-essential cmake
@@ -57,20 +57,24 @@ jobs:
57
57
  run: |
58
58
  git config --system core.autocrlf false
59
59
  git config --system core.eol lf
60
- - uses: actions/checkout@v3
60
+ - uses: actions/checkout@v4
61
61
  - uses: MSP-Greg/setup-ruby-pkgs@v1
62
62
  with:
63
63
  apt-get: _update_ build-essential cmake
64
64
  mingw: _upgrade_ cmake
65
65
  ruby-version: ${{ matrix.ruby }}
66
66
  bundler-cache: true
67
- - uses: actions/cache@v3
67
+ - uses: actions/cache@v4
68
68
  with:
69
69
  path: examples/ports/archives
70
70
  key: examples-${{ hashFiles('examples/Rakefile') }}
71
71
  - run: bundle exec rake test:examples
72
72
 
73
73
  fedora: # see https://github.com/flavorjones/mini_portile/issues/118
74
+ strategy:
75
+ fail-fast: false
76
+ matrix:
77
+ task: ["test:unit", "test:examples"]
74
78
  runs-on: ubuntu-latest
75
79
  container:
76
80
  image: fedora:35
@@ -78,11 +82,36 @@ jobs:
78
82
  - run: |
79
83
  dnf group install -y "C Development Tools and Libraries"
80
84
  dnf install -y ruby ruby-devel libyaml-devel git-all patch cmake xz
81
- - uses: actions/checkout@v3
82
- - uses: actions/cache@v3
85
+ - uses: actions/checkout@v4
86
+ - uses: actions/cache@v4
83
87
  with:
84
88
  path: examples/ports/archives
85
89
  key: examples-${{ hashFiles('examples/Rakefile') }}
86
90
  - run: bundle install
87
- - run: bundle exec rake test:unit
88
- - run: bundle exec rake test:examples
91
+ - run: bundle exec rake ${{ matrix.task }}
92
+
93
+ freebsd:
94
+ strategy:
95
+ fail-fast: false
96
+ matrix:
97
+ task: ["test:unit", "test:examples"]
98
+ runs-on: ubuntu-latest
99
+ env:
100
+ MAKE: gmake
101
+ steps:
102
+ - uses: actions/checkout@v4
103
+ - uses: actions/cache@v4
104
+ with:
105
+ path: examples/ports/archives
106
+ key: examples-${{ hashFiles('examples/Rakefile') }}
107
+ - uses: vmactions/freebsd-vm@v1
108
+ with:
109
+ envs: MAKE
110
+ usesh: true
111
+ copyback: false
112
+ prepare: pkg install -y ruby devel/ruby-gems pkgconf git cmake devel/gmake textproc/libyaml security/gnupg
113
+ run: |
114
+ git config --global --add safe.directory /home/runner/work/mini_portile/mini_portile
115
+ gem install bundler
116
+ bundle install
117
+ bundle exec rake ${{ matrix.task }}
data/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  ## mini_portile changelog
2
2
 
3
+ ### 2.8.6 / 2024-04-14
4
+
5
+ #### Added
6
+
7
+ - When using CMake on FreeBSD, default to clang's "cc" and "c++" compilers. (#139 by @mudge)
8
+
9
+
3
10
  ### 2.8.5 / 2023-10-22
4
11
 
5
12
  #### Added
data/lib/mini_portile2/mini_portile_cmake.rb CHANGED
@@ -94,6 +94,9 @@ class MiniPortileCMake < MiniPortile
94
94
  if MiniPortile.darwin?
95
95
  c_compiler ||= 'clang'
96
96
  cxx_compiler ||='clang++'
97
+ elsif MiniPortile.freebsd?
98
+ c_compiler ||= 'cc'
99
+ cxx_compiler ||= 'c++'
97
100
  else
98
101
  c_compiler ||= 'gcc'
99
102
  cxx_compiler ||= 'g++'
data/lib/mini_portile2/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class MiniPortile
2
- VERSION = "2.8.5"
2
+ VERSION = "2.8.6"
3
3
  end
data/test/test_cmake.rb CHANGED
@@ -107,6 +107,29 @@ class TestCMakeConfig < TestCMake
107
107
  end
108
108
  end
109
109
 
110
+ def test_configure_defaults_with_freebsd
111
+ recipe = init_recipe
112
+ recipe.host = 'some-host'
113
+
114
+ with_env({ "CC" => nil, "CXX" => nil }) do
115
+ with_stubbed_target(os: 'freebsd14') do
116
+ with_compilers(recipe, c_compiler: 'cc', cxx_compiler: 'c++') do
117
+ Open3.stub(:capture2, cmake_help_mock('Unix')) do
118
+ assert_equal(
119
+ [
120
+ "-DCMAKE_SYSTEM_NAME=FreeBSD",
121
+ "-DCMAKE_SYSTEM_PROCESSOR=x86_64",
122
+ "-DCMAKE_C_COMPILER=cc",
123
+ "-DCMAKE_CXX_COMPILER=c++",
124
+ "-DCMAKE_BUILD_TYPE=Release"
125
+ ],
126
+ recipe.configure_defaults)
127
+ end
128
+ end
129
+ end
130
+ end
131
+ end
132
+
110
133
  def test_configure_defaults_with_manual_system_name
111
134
  recipe = init_recipe
112
135
  recipe.system_name = 'Custom'
metadata CHANGED
@@ -1,16 +1,16 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mini_portile2
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.8.5
4
+ version: 2.8.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Luis Lavena
8
8
  - Mike Dalessio
9
9
  - Lars Kanis
10
- autorequire:
10
+ autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2023-10-22 00:00:00.000000000 Z
13
+ date: 2024-04-14 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler
@@ -145,7 +145,7 @@ homepage: https://github.com/flavorjones/mini_portile
145
145
  licenses:
146
146
  - MIT
147
147
  metadata: {}
148
- post_install_message:
148
+ post_install_message:
149
149
  rdoc_options: []
150
150
  require_paths:
151
151
  - lib
@@ -160,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
160
160
  - !ruby/object:Gem::Version
161
161
  version: '0'
162
162
  requirements: []
163
- rubygems_version: 3.4.19
164
- signing_key:
163
+ rubygems_version: 3.5.3
164
+ signing_key:
165
165
  specification_version: 4
166
166
  summary: Simple autoconf and cmake builder for developers
167
167
  test_files: