@@ -3,11 +3,21 @@ benchmark/runall.sh build site/index.html src/Makefile -src/ebb.o src/ebb_ffi.bundle src/ebb_ffi.so src/ebb_ffi.o src/mkmf.log +src/*.o + +src/ebb.c +src/ebb.h + +src/rbtree.c +src/rbtree.h + src/ebb_request_parser.c -src/ebb_request_parser.o -test/parser_test +src/ebb_request_parser.rl +src/ebb_request_parser.h + +libev* +.libebb .gitignore @@ -3,38 +3,71 @@ require 'rake/testtask' require 'rake/gempackagetask' require 'rake/clean' -def dir(path) - File.expand_path File.join(File.dirname(__FILE__), path) +class String + def /(other) + File.join(self, other) + end end -require dir('lib/ebb') +require 'lib/ebb' -DISTFILES = FileList.new('lib/**/*.rb', 'src/**/*.{rb,rl,c,h}', 'bin/*', 'README', 'Rakefile') +libev_dist = "http://dist.schmorp.de/libev/" +libev_release = "libev-3.43.tar.gz" +libev_url = File.join(libev_dist, libev_release) -CLEAN.add ["**/*.{o,bundle,so,obj,pdb,lib,def,exp}", "benchmark/*.dump", 'site/index.html', ] +LIBEBBFILES = ['ebb.c', 'ebb.h', + 'ebb_request_parser.rl', 'ebb_request_parser.c', 'ebb_request_parser.h', + 'rbtree.c', 'rbtree.h'] +SRCEBBFILES = LIBEBBFILES.map { |f| "src" / f } -CLOBBER.add ['src/Makefile', 'src/ebb_request_parser.c', 'src/mkmf.log'] +DISTFILES = FileList.new('libev', 'lib/**/*.rb', 'src/*.{rb,rl,c,h}', 'bin/*', 'README', 'Rakefile') + SRCEBBFILES +CLEAN.add ["**/*.{o,bundle,so,obj,pdb,lib,def,exp}", "benchmark/*.dump", 'site/index.html'] +CLOBBER.add ['src/Makefile', 'libev', 'src/mkmf.log', libev_release, '.libebb'] + SRCEBBFILES Rake::TestTask.new do |t| t.test_files = FileList.new("test/*.rb") t.verbose = true end +LIBEBBFILES.each do |f| + file(".libebb"/f => ".libebb") + file("src"/f => ".libebb"/f) do |t| + sh "cp .libebb/#{f} src/#{f}" + end +end + task(:default => [:compile]) -task(:compile => ['src/Makefile','src/ebb_request_parser.c'] + DISTFILES) do - sh "cd #{dir('src')} && make" +task(:compile => ['src/Makefile','libev'] + SRCEBBFILES) do + sh "cd src && make" end -file('src/Makefile' => 'src/extconf.rb') do - sh "cd #{dir('src')} && ruby extconf.rb" +file libev_release do + puts "downloading libev" + sh "wget #{libev_url}" do |ok, res| + if ! ok + puts "Couldn't download libev. Please put #{libev_url} in here and try again" + exit 1 + end + end end -file('src/ebb_request_parser.c' => 'src/ebb_request_parser.rl') do - sh 'ragel -s -G2 src/ebb_request_parser.rl' +file "libev" => libev_release do + sh "tar -zxf #{libev_release}" + sh "mv #{libev_release.sub('.tar.gz', '')} libev" end -task(:wc) { sh "wc -l ruby_lib/*.rb src/ebb*.{c,h}" } +file ".libebb" do + sh "git clone git://github.com/ry/libebb.git .libebb" +end + +file('src/Makefile' => 'src/extconf.rb') do + sh "cd src && ruby extconf.rb" +end + +file_create(".libebb/ebb_request_parser.c" => '.libebb/ebb_request_parser.rl') do + sh 'ragel -s -G2 .libebb/ebb_request_parser.rl' +end task(:test => DISTFILES) Rake::TestTask.new do |t| Rakefile @@ -31,14 +31,13 @@ if have_header('sys/inotify.h') end dir = File.dirname(__FILE__) -libev_dir = File.expand_path(dir + '/libev') +libev_dir = File.expand_path(dir + '/../libev') -$LDFLAGS << " -lefence " +#$LDFLAGS << " -lefence " $CFLAGS << " -I#{libev_dir} " << flags.join(' ') $defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}" - -$srcs = ['ebb_ffi.c', 'ebb.c', "ebb_request_parser.c", "rbtree.c"] +$srcs = ['ebb_ffi.c', "ebb.c", "ebb_request_parser.c", "rbtree.c"] $objs = ['ebb_ffi.o', "ebb.o", "ebb_request_parser.o", "rbtree.o"] dir_config('ebb_ffi') src/extconf.rb libev/ev.c libev/ev.h libev/ev_epoll.c libev/ev_kqueue.c libev/ev_poll.c libev/ev_port.c libev/ev_select.c libev/ev_vars.h libev/ev_win32.c libev/ev_wrap.h src/ebb.c src/ebb.h src/ebb_request_parser.h src/ebb_request_parser.rl src/libev/ev.c src/libev/ev.h src/libev/ev_epoll.c src/libev/ev_kqueue.c src/libev/ev_poll.c src/libev/ev_port.c src/libev/ev_select.c src/libev/ev_vars.h src/libev/ev_win32.c src/libev/ev_wrap.h src/rbtree.c src/rbtree.h b59e58fc78e335e26755b93011397bdf8e8cefe7 Ryan ry@tinyclouds.org http://github.com/ry/ebb/commit/05a68d1c4ce186145adc8ee46e93a4c6f3b11af8 05a68d1c4ce186145adc8ee46e93a4c6f3b11af8 2008-08-03T06:20:11-07:00 2008-08-03T06:20:11-07:00 make build system download externals b33eea946dd2c6bb05906525ad853c06590d635b Ryan ry@tinyclouds.org