Skip to content
Snippets Groups Projects
Commit 11426d0a authored by Lars Kanis's avatar Lars Kanis
Browse files

Avoid use of chdir in Rakefile, to allow parallel execution with drake

parent afb8d661
No related branches found
No related tags found
No related merge requests found
...@@ -92,10 +92,6 @@ end ...@@ -92,10 +92,6 @@ end
# c:/ruby-1.8.6-p383-preview2/devkit/msys/1.0.11/usr/local/share/swig/1.3.22 # c:/ruby-1.8.6-p383-preview2/devkit/msys/1.0.11/usr/local/share/swig/1.3.22
# before running swig on MinGW. # before running swig on MinGW.
namespace :swig do namespace :swig do
def wrapper_src_file_path(wrapper_src_file_name)
File.join("..", "ext", "fox16", wrapper_src_file_name)
end
def sed(wrapper_src_file_name) def sed(wrapper_src_file_name)
results = [] results = []
IO.readlines(wrapper_src_file_name).each do |line| IO.readlines(wrapper_src_file_name).each do |line|
...@@ -114,20 +110,21 @@ namespace :swig do ...@@ -114,20 +110,21 @@ namespace :swig do
end end
def swig(swig_interface_file_name, wrapper_src_file_name) def swig(swig_interface_file_name, wrapper_src_file_name)
system "#{SWIG} #{SWIGFLAGS} -o #{wrapper_src_file_path(wrapper_src_file_name)} #{swig_interface_file_name}" cmd = "#{SWIG} #{SWIGFLAGS} -o #{wrapper_src_file_name} #{swig_interface_file_name}"
sed wrapper_src_file_path(wrapper_src_file_name) puts cmd
system cmd
sed wrapper_src_file_name
end end
task :swig_librb => ["ext/fox16/librb.c"] task :swig_librb => ["ext/fox16/librb.c"]
file "ext/fox16/librb.c" do file "ext/fox16/librb.c" do |task|
Dir.chdir "swig-interfaces" do puts "generate #{task.name}"
File.open(wrapper_src_file_path("librb.c"), "w") do |io| File.open(task.name, "w") do |io|
io.puts "#define SWIG_GLOBAL 1" io.puts "#define SWIG_GLOBAL 1"
io.write(IO.read(File.join(SWIG_LIB, "ruby", "precommon.swg"))) io.write(IO.read(File.join(SWIG_LIB, "ruby", "precommon.swg")))
io.write(IO.read(File.join(SWIG_LIB, "common.swg"))) io.write(IO.read(File.join(SWIG_LIB, "common.swg")))
io.write(IO.read(File.join(SWIG_LIB, "ruby", "rubyhead.swg"))) io.write(IO.read(File.join(SWIG_LIB, "ruby", "rubyhead.swg")))
io.write(IO.read(File.join(SWIG_LIB, "ruby", "rubydef.swg"))) io.write(IO.read(File.join(SWIG_LIB, "ruby", "rubydef.swg")))
end
end end
end end
...@@ -140,10 +137,8 @@ namespace :swig do ...@@ -140,10 +137,8 @@ namespace :swig do
file cppfile_path => [ifile, 'macros.i', 'common.i', 'fxdefs.i', 'ruby-typemaps.i', file cppfile_path => [ifile, 'macros.i', 'common.i', 'fxdefs.i', 'ruby-typemaps.i',
'markfuncs.i', 'exceptions.i', 'freefuncs.i', 'macros.i', 'handlers.i' 'markfuncs.i', 'exceptions.i', 'freefuncs.i', 'macros.i', 'handlers.i'
].map{|f| File.join("swig-interfaces", f) } do ].map{|f| File.join("swig-interfaces", f) } do |task|
Dir.chdir "swig-interfaces" do swig(File.join("swig-interfaces", ifile), cppfile_path)
swig(ifile, cppfile)
end
end end
end end
end end
...@@ -181,9 +176,7 @@ namespace :fxruby do ...@@ -181,9 +176,7 @@ namespace :fxruby do
end end
def make_impl def make_impl
Dir.chdir "ext/fox16" do ruby '-Cext/fox16', "make_impl.rb"
ruby "make_impl.rb"
end
end end
task :configure => [:scintilla, :setversions, :generate_kwargs_lib] task :configure => [:scintilla, :setversions, :generate_kwargs_lib]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment