Commit 52a03800 authored by Yuji Yamano's avatar Yuji Yamano Committed by Yuji Yamano

Add --libmruby-path support to mruby-bin-mruby-config.

parent c900fff9
...@@ -23,7 +23,7 @@ MRuby.each_target do ...@@ -23,7 +23,7 @@ MRuby.each_target do
FileUtils.copy "#{File.dirname(__FILE__)}/#{mruby_config}", t.name FileUtils.copy "#{File.dirname(__FILE__)}/#{mruby_config}", t.name
config = Hash[open("#{build_dir}/lib/libmruby.flags.mak").read.split("\n").map {|x| a = x.split(/\s*=\s*/, 2); [a[0], a[1].gsub('\\"', '"') ]}] config = Hash[open("#{build_dir}/lib/libmruby.flags.mak").read.split("\n").map {|x| a = x.split(/\s*=\s*/, 2); [a[0], a[1].gsub('\\"', '"') ]}]
IO.write(t.name, File.open(t.name) {|f| IO.write(t.name, File.open(t.name) {|f|
f.read.gsub (/echo (MRUBY_CFLAGS|MRUBY_LIBS|MRUBY_LDFLAGS_BEFORE_LIBS|MRUBY_LDFLAGS)/) {|x| config[$1].empty? ? '' : "echo #{config[$1]}"} f.read.gsub (/echo (MRUBY_CFLAGS|MRUBY_LIBS|MRUBY_LDFLAGS_BEFORE_LIBS|MRUBY_LDFLAGS|MRUBY_LIBMRUBY_PATH)/) {|x| config[$1].empty? ? '' : "echo #{config[$1]}"}
}) })
FileUtils.chmod(0755, t.name) FileUtils.chmod(0755, t.name)
end end
......
...@@ -6,12 +6,14 @@ while [ $# -gt 0 ]; do ...@@ -6,12 +6,14 @@ while [ $# -gt 0 ]; do
--ldflags) echo MRUBY_LDFLAGS;; --ldflags) echo MRUBY_LDFLAGS;;
--ldflags-before-libs) echo MRUBY_LDFLAGS_BEFORE_LIBS;; --ldflags-before-libs) echo MRUBY_LDFLAGS_BEFORE_LIBS;;
--libs) echo MRUBY_LIBS;; --libs) echo MRUBY_LIBS;;
--libmruby-path) echo MRUBY_LIBMRUBY_PATH;;
--help) echo "Usage: mruby-config [switches]" --help) echo "Usage: mruby-config [switches]"
echo " switches:" echo " switches:"
echo " --cflags print flags passed to compiler" echo " --cflags print flags passed to compiler"
echo " --ldflags print flags passed to linker" echo " --ldflags print flags passed to linker"
echo " --ldflags-before-libs print flags passed to linker before linked libraries" echo " --ldflags-before-libs print flags passed to linker before linked libraries"
echo " --libs print linked libraries" echo " --libs print linked libraries"
echo " --libmruby-path print libmruby path"
exit 0;; exit 0;;
esac esac
shift shift
......
...@@ -7,6 +7,7 @@ if "%0" equ "--cflags" goto cflags ...@@ -7,6 +7,7 @@ if "%0" equ "--cflags" goto cflags
if "%0" equ "--ldflags" goto ldflags if "%0" equ "--ldflags" goto ldflags
if "%0" equ "--ldflags-before-libs" goto ldflagsbeforelibs if "%0" equ "--ldflags-before-libs" goto ldflagsbeforelibs
if "%0" equ "--libs" goto libs if "%0" equ "--libs" goto libs
if "%0" equ "--libmruby-path" goto libmrubypath
if "%0" equ "--help" goto showhelp if "%0" equ "--help" goto showhelp
echo Invalid Option echo Invalid Option
goto :eof goto :eof
...@@ -27,6 +28,10 @@ goto top ...@@ -27,6 +28,10 @@ goto top
echo MRUBY_LDFLAGS_BEFORE_LIBS echo MRUBY_LDFLAGS_BEFORE_LIBS
goto top goto top
:libmrubypath
echo MRUBY_LIBMRUBY_PATH
goto top
:showhelp :showhelp
echo Usage: mruby-config [switches] echo Usage: mruby-config [switches]
echo switches: echo switches:
...@@ -34,3 +39,4 @@ echo --cflags print flags passed to compiler ...@@ -34,3 +39,4 @@ echo --cflags print flags passed to compiler
echo --ldflags print flags passed to linker echo --ldflags print flags passed to linker
echo --ldflags-before-libs print flags passed to linker before linked libraries echo --ldflags-before-libs print flags passed to linker before linked libraries
echo --libs print linked libraries echo --libs print linked libraries
echo --libmruby-path print libmruby path
...@@ -16,6 +16,8 @@ MRuby.each_target do ...@@ -16,6 +16,8 @@ MRuby.each_target do
gem_libraries = gems.map { |g| g.linker.libraries } gem_libraries = gems.map { |g| g.linker.libraries }
f.puts "MRUBY_LIBS = #{linker.option_library % 'mruby'} #{linker.library_flags(gem_libraries)}" f.puts "MRUBY_LIBS = #{linker.option_library % 'mruby'} #{linker.library_flags(gem_libraries)}"
f.puts "MRUBY_LIBMRUBY_PATH = #{libfile("#{build_dir}/lib/libmruby")}"
end end
end end
task :all => "#{build_dir}/lib/libmruby.flags.mak" task :all => "#{build_dir}/lib/libmruby.flags.mak"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment