motion.h 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce7667a186a28ed1a3117b631bbe7527d077d51
-  data.tar.gz: a480f3d51bb53ff0998d9a50880845db6215bd95
+  metadata.gz: 511528c649ad4a3843b64b4a92f5a8f4894d6210
+  data.tar.gz: 3ea00c01f5388e197681382011cf57f5413a358d
 SHA512:
-  metadata.gz: 22c558eec476622b3fa2c996a9e9f764e41cfa6fb315fc4e3663ad805236b523c8b71abdb6c3166f2b6f61525c53aff29934b7d5d4e738e638a017dd98b7abef
-  data.tar.gz: d79ba2638bc0241361967aaca59ee2126e05418e919f9df6954abe03bad7a4130c42ee4602b538c57c958cfa4888a8c346ad710001de6560745828741bb31108
+  metadata.gz: 1d4bc836006f18b002eb46f4879b8f9361ac3f8f202cc3797f7492242cbb6d0f716d8937259450c9225b3c15748359128b3005d6841042af9ca3a3542cacb3ac
+  data.tar.gz: d28c3f961aa804f253b4dd143b3c3f2e1bff62e0bb0cfa8f3fa8ec8be49a2dda7a233c48e1f1cdbe7336c3d62d997721edc20b76d5d9714eea685a41b7980c6c

data/Rakefile

@@ -3,5 +3,5 @@ require "bundler/gem_tasks"
 task :default do
   system 'gem uninstall -ax motion.h'
   system 'gem build motion.h.gemspec'
-  system 'gem install ./motion.h-0.0.6.gem'
+  system 'gem install ./motion.h-0.0.7.gem'
 end

data/lib/motion.h.rb

@@ -60,19 +60,26 @@ class MotionHeader
   def generate_bridgesupport_file
     return if File.exist?(bridgesupport_file)
     Dir.mkdir(@bridgesupport_dir) unless Dir.exist?(@bridgesupport_dir)
-    flag = begin
-      case platform
-      when :ios
-        "--no-64-bit"
-      when :osx
-        "--64-bit"
-      end
+    cflags = [
+      "-I#{include_path}",
+      "-F#{frameworks_path}"
+    ]
+    if product_version >= catalina_version
+      cflags << "--isysroot #{isysroot_dir}"
     end
-    Bundler.with_clean_env do
-      `/Library/RubyMotion/bin/gen_bridge_metadata --format complete #{flag} --cflags '-I#{include_path} -F#{frameworks_path}' #{@header_file} > #{bridgesupport_file}`
+    Bundler.with_unbundled_env do
+      `/Library/RubyMotion/bin/gen_bridge_metadata --format complete --64-bit --cflags '#{cflags.join(' ')}' #{@header_file} > #{bridgesupport_file}`
     end
   end
 
+  def catalina_version
+    Gem::Version.new('10.15')
+  end
+
+  def product_version
+    Gem::Version.new(`sw_vers -productVersion`)
+  end
+
   def include_path
     sdk_dir = sdk_dir(@config.sdk_version)
     path_components = [@config.xcode_dir, *sdk_dir, 'usr', 'include', @prefix].compact
@@ -85,6 +92,13 @@ class MotionHeader
     File.join(*path_components)
   end
 
+  def isysroot_dir
+    case platform
+    when :ios then 'iPhoneOS'
+    when :osx then 'MacOSX'
+    end
+  end
+
   def sdk_dir(sdk_version)
     case platform
     when :ios

data/motion.h.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "motion.h"
-  spec.version       = '0.0.6'
+  spec.version       = '0.0.7'
   spec.authors       = ["Dave Lee"]
   spec.email         = ['dave@kastiglione.com']
   spec.description   = 'Expose iOS system C libraries in RubyMotion.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion.h
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dave Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +56,7 @@ homepage: https://github.com/kastiglione/motion.h
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,9 +71,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.2.3
+signing_key:
 specification_version: 4
 summary: Expose iOS system C libraries in RubyMotion.
 test_files: []