.gitmodules deps/eunit @@ -2,7 +2,7 @@ require 'rubygems' require 'rake' -ERLC_TEST_FLAGS = "-pa ../ebin/eunit -I .. -I ../etest -I ../include/eunit -DTEST" +ERLC_TEST_FLAGS = "-pa ../deps/eunit/ebin -I ../deps/eunit/include -I .. -I ../etest -DTEST" ERLC_FLAGS = "+debug_info -W2 -I ../include -I ../include/yaws -o ../ebin" FUZED_VERSION = "0.4.13" @@ -17,7 +17,7 @@ task :build_dist do end task :econsole do - sh "erl +Bc +K true -smp enable -pz ./etest -pz ./ebin/yaws -pz ./ebin/ -pz ./ebin/eunit -sname local_console_#{$$} -kernel start_boot_server true" + sh "erl +Bc +K true -smp enable -pz ./etest -pz ./ebin/yaws -pz ./ebin/ -pz ./deps/eunit/ebin -sname local_console_#{$$} -kernel start_boot_server true" end task :console do @@ -26,7 +26,7 @@ end task :distel do puts "Starting distel editing session emacs@localhost" - sh "erl +Bc +K true -smp enable -pz ./etest -pz ./ebin/yaws -pz ./ebin/ -pz ./ebin/eunit -name emacs@chisai.local -detached" + sh "erl +Bc +K true -smp enable -pz ./etest -pz ./ebin/yaws -pz ./ebin/ -pz ./deps/eunit/ebin -name emacs@chisai.local -detached" end task :test => [:default] do @@ -40,7 +40,7 @@ task :test => [:default] do end mod_directives = mods.map {|m| "-run #{m} test"}.join(" ") # -run #{ENV['MOD']} test - sh %Q{erl +K true -smp enable -pz ./etest -pz ./ebin/yaws -pz ./ebin/ -pa ./ebin/eunit -sname local_console_#{$$} -noshell #{mod_directives} -run erlang halt} + sh %Q{erl +K true -smp enable -pz ./etest -pz ./ebin/yaws -pz ./ebin/ -pa ./deps/eunit/ebin -sname local_console_#{$$} -noshell #{mod_directives} -run erlang halt} end task :docs do @@ -49,3 +49,7 @@ task :docs do files = Dir["elibs/*.erl"].map { |x| "'../" + x + "'"}.join " " sh %|cd doc && erl -noshell -s init stop -run edoc files #{files}| end + +task :build_eunit do + sh %[cd deps/eunit && make clean && make all] +end \ No newline at end of file Rakefile @@ -13,7 +13,7 @@ $:.unshift(CMD_LINE_PATH) DEFAULT_NODE_NAME = `hostname -s`.chomp + "-#{rand(9999)}" DEFAULT_MASTER_NODE = "master@fuzed-dev.powerset.com" -DEFAULT_ERLANG_CODEPATHS = %w[ebin/yaws ebin/mochiweb ebin/eunit etest ebin] +DEFAULT_ERLANG_CODEPATHS = %w[ebin/yaws ebin/mochiweb deps/eunit/ebin etest ebin] DEFAULT_BOOT_DIR = "/p/conf/fuzed/" DEFAULT_HTTP_SERVER = "yaws" bin/fuzed ebin/eunit/autoload.beam ebin/eunit/code_monitor.beam ebin/eunit/eunit.beam ebin/eunit/eunit_autoexport.beam ebin/eunit/eunit_data.beam ebin/eunit/eunit_lib.beam ebin/eunit/eunit_proc.beam ebin/eunit/eunit_serial.beam ebin/eunit/eunit_server.beam ebin/eunit/eunit_striptests.beam ebin/eunit/eunit_test.beam ebin/eunit/eunit_tests.beam ebin/eunit/eunit_tty.beam ebin/eunit/file_monitor.beam df00cba8f4b2f828f3eee9a7b9441756a5a6cf5e Abhay Kumar abhay+git@opensynapse.net http://github.com/KirinDave/fuzed/commit/b789942cfd67fa4552aeedc7233b513f718b51e9 b789942cfd67fa4552aeedc7233b513f718b51e9 2008-06-20T18:25:45-07:00 2008-06-20T18:25:45-07:00 eunit as a submodule aded804674a44a7aa60e7d929f1d0aee21a48511 Abhay Kumar abhay+git@opensynapse.net