kotovalexarian-likes-github/libv8
1
0
Fork 0
mirror of https://github.com/rubyjs/libv8 synced 2023-03-27 23:21:48 -04:00
Code Releases Activity

Escape the library and include paths

Browse source 
The library and include flags were not escaped until now and this caused
issues when there were spaces in them. This fixes #164.
This commit is contained in:
Petko Bordjukov 2015-04-09 13:33:03 +03:00
parent 4f4113222e
commit 23b3a53c07
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/libv8/paths.rb
View file

@ -1,4 +1,5 @@
require 'rbconfig' require 'rbconfig'
require 'shellwords'
require File.expand_path '../arch', __FILE__ require File.expand_path '../arch', __FILE__
module Libv8 module Libv8
@ -6,11 +7,13 @@ module Libv8
module_function module_function
def include_paths def include_paths
["#{vendored_source_path}/include"] [Shellwords.escape("#{vendored_source_path}/include")]
end end
def object_paths def object_paths
[libv8_object(:base), libv8_object(:snapshot)] [libv8_object(:base), libv8_object(:snapshot)].map do |path|
Shellwords.escape path
end
end end
def config def config

8
spec/location_spec.rb
View file

@ -54,17 +54,17 @@ describe "libv8 locations" do
@context.stub(:incflags) {@incflags ||= "-I/usr/include -I/usr/local/include"} @context.stub(:incflags) {@incflags ||= "-I/usr/include -I/usr/local/include"}
@context.stub(:ldflags) {@ldflags ||= "-lobjc -lpthread"} @context.stub(:ldflags) {@ldflags ||= "-lobjc -lpthread"}
Libv8::Paths.stub(:include_paths) {["/frp/v8/include"]} Libv8::Paths.stub(:vendored_source_path) {"/foo bar/v8"}
Libv8::Paths.stub(:object_paths) {["/frp/v8/obj/libv8_base.a", "/frp/v8/obj/libv8_snapshot.a"]} Libv8::Arch.stub(:libv8_arch) {'x64'}
@location.configure @context @location.configure @context
end end
it "prepends its own incflags before any pre-existing ones" do it "prepends its own incflags before any pre-existing ones" do
@context.incflags.should eql "-I/frp/v8/include -I/usr/include -I/usr/local/include" @context.incflags.should eql "-I/foo\\ bar/v8/include -I/usr/include -I/usr/local/include"
end end
it "prepends the locations of any libv8 objects on the the ldflags" do it "prepends the locations of any libv8 objects on the the ldflags" do
@context.ldflags.should eql "/frp/v8/obj/libv8_base.a /frp/v8/obj/libv8_snapshot.a -lobjc -lpthread" @context.ldflags.should eql "/foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_base.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_snapshot.a -lobjc -lpthread"
end end
end end
end end