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.

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

Fixed Makefile. Removing commented lines from test_build.rb. #41

Merged
merged 1 commit into from
May 31, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
BUILD_SCRIPT = ./test_build.rb

.PHONY : test
test:
ruby ./run_test.rb test
ruby ${BUILD_SCRIPT} test

.PHONY : all
all:
echo "NOOP"

.PHONY : clean
clean:
ruby ./run_test.rb clean
ruby ${BUILD_SCRIPT} clean
33 changes: 2 additions & 31 deletions test_build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
system "git clone --depth 1 https://github.com/mruby/mruby.git #{BUILD_DIR}"
end
system(%Q[cd #{BUILD_DIR}; MRUBY_CONFIG=#{File.expand_path __FILE__} ./minirake #{ARGV.join(' ')}])
system "ln -s #{BUILD_DIR}/build/host/bin bin"
system "ln -fs #{BUILD_DIR}/build/host/bin bin"
exit
end

Expand All @@ -20,33 +20,4 @@
conf.linker.libraries << ['pthread']
conf.gembox 'default'
conf.gem File.dirname(__FILE__)
# conf.gem "#{BUILD_DIR}/mrbgems/mruby-time"
# conf.gem "#{BUILD_DIR}/mrbgems/mruby-hash-ext"
# conf.gem "#{BUILD_DIR}/mrbgems/mruby-eval"
# conf.gem "#{BUILD_DIR}/mrbgems/mruby-exit" # for exiting from within a script
# conf.gem "#{BUILD_DIR}/mrbgems/mruby-string-ext"
#
# conf.gem :github => 'pbosetti/mruby-io', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-dir', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-tempfile', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-pcre-regexp', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-yaml', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-merb', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-complex', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-serialport', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-shell', :branch => 'master'
# conf.gem :github => 'pbosetti/mruby-sinatic', :branch => 'master'
# conf.gem :github => 'iij/mruby-pack', :branch => 'master'
# conf.gem :github => 'iij/mruby-socket', :branch => 'master'
# conf.gem :github => 'iij/mruby-errno', :branch => 'master'
# conf.gem :github => 'iij/mruby-process', :branch => 'master'
# conf.gem :github => 'iij/mruby-iijson', :branch => 'master'
# conf.gem :github => 'ksss/mruby-signal', :branch => 'master'
#
# conf.gem File.dirname(__FILE__)
# conf.gem :github => 'pbosetti/mruby-emb-require', :branch => "master"
# if g = conf.gems.find {|e| e.name.match /mruby-require/} then
# g.build.cc.flags << "-DMRBGEMS_ROOT=\\\"#{MRBGEMS_ROOT}\\\""
# g.build.linker.flags << "-ldl"
# end
end
end