Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add apple m1/arm64 support #177

Merged
merged 4 commits into from
Jun 3, 2021
Merged

Add apple m1/arm64 support #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b96da64
Remove the rest of the <= 2.3 support in Gemfile
zenspider Jun 2, 2021
2e7a963
Fix indentation of ensure
zenspider Jun 2, 2021
9632a73
Fix missing pathing in a test that fails out of the box if you don't …
zenspider Jun 2, 2021
9b2cef1
Add tentative ARM64-macos support
zenspider Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 1 addition & 13 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,4 @@ gemspec
# Used for local development/testing only
gem 'rake'

if RUBY_VERSION =~ /^1\./
gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version

# ffi gem for Windows requires Ruby 2.x on/after this version
gem 'ffi', '< 1.9.15' if ENV['CHILDPROCESS_POSIX_SPAWN'] == 'true' || Gem.win_platform?
elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2')
# Ruby 2.0/2.1 support only ffi before 1.10
gem 'ffi', '~> 1.9.0' if ENV['CHILDPROCESS_POSIX_SPAWN'] == 'true' || Gem.win_platform?
else
gem 'ffi' if ENV['CHILDPROCESS_POSIX_SPAWN'] == 'true' || Gem.win_platform?
end
gem 'ffi' if ENV['CHILDPROCESS_POSIX_SPAWN'] == 'true' || Gem.win_platform?
11 changes: 11 additions & 0 deletions lib/childprocess/unix/platform/arm64-macosx.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module ChildProcess::Unix::Platform
SIZEOF = {
:posix_spawn_file_actions_t => 8,
:posix_spawnattr_t => 8,
:sigset_t => 4
}
POSIX_SPAWN_RESETIDS = 1
POSIX_SPAWN_SETPGROUP = 2
POSIX_SPAWN_SETSIGDEF = 4
POSIX_SPAWN_SETSIGMASK = 8
end
2 changes: 1 addition & 1 deletion spec/childprocess_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@

Tempfile.open('grandparent_out') do |gp_file|
# Create a parent and detached child process that will spit out their PID. Make sure that the child process lasts longer than the parent.
p_process = ruby("require 'childprocess' ; c_process = ChildProcess.build('ruby', '-e', 'puts \\\"Child PID: \#{Process.pid}\\\" ; sleep 5') ; c_process.io.inherit! ; c_process.detach = true ; c_process.start ; puts \"Child PID: \#{c_process.pid}\" ; puts \"Parent PID: \#{Process.pid}\"")
p_process = ruby("$: << 'lib'; require 'childprocess' ; c_process = ChildProcess.build('ruby', '-e', 'puts \\\"Child PID: \#{Process.pid}\\\" ; sleep 5') ; c_process.io.inherit! ; c_process.detach = true ; c_process.start ; puts \"Child PID: \#{c_process.pid}\" ; puts \"Parent PID: \#{Process.pid}\"")
p_process.io.stdout = p_process.io.stderr = gp_file

# Let the parent process die
Expand Down
2 changes: 1 addition & 1 deletion spec/io_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@

stdin.close
process.poll_for_exit(exit_timeout)
ensure
ensure
out_receiver.close
out.close
end
Expand Down