4f31bd9340
This commit beefs up the Makefile to do the build, instead of the Rakefile. It also removes from the Rakefile the dependency on rake_utils, which should mean it's ok to build in a schroot. The files are reorganised to make the Makefile rules more tractable, although the reorganisation reveals a problem with our current code organisation. The problem is that the proxy-specific code transitively depends on the server code via flexnbd.h, which has a circular dependency on the server and client structs. This should be broken in a future commit by separating the flexnbd struct into a shared config struct and server-specific parts, so that the server code can be moved into src/server to more accurately show the functional dependencies.
53 lines
1.0 KiB
Ruby
53 lines
1.0 KiB
Ruby
# encoding: utf-8
|
|
|
|
def make(*targets)
|
|
sh "make #{targets.map{|t| t.to_s}.join(" ")}"
|
|
end
|
|
|
|
def maketask( opts )
|
|
case opts
|
|
when Symbol
|
|
maketask opts => opts
|
|
else
|
|
opts.each do |name, targets|
|
|
task( name ){make *[*targets]}
|
|
end
|
|
end
|
|
end
|
|
|
|
|
|
desc "Build the binary and man page"
|
|
maketask :build => [:all, :doc]
|
|
|
|
desc "Build just the flexnbd binary"
|
|
maketask :flexnbd => [:server]
|
|
file "build/flexnbd" => :flexnbd
|
|
|
|
desc "Build just the flexnbd-proxy binary"
|
|
maketask :flexnbd_proxy => [:proxy]
|
|
file "build/flexnbd-proxy" => :flexnbd_proxy
|
|
|
|
desc "Build just the man page"
|
|
maketask :man => :doc
|
|
|
|
|
|
namespace "test" do
|
|
desc "Run all tests"
|
|
task 'run' => ["unit", "scenarios"]
|
|
|
|
desc "Build C tests"
|
|
maketask :build => :check_bins
|
|
|
|
desc "Run C tests"
|
|
maketask :unit => :check
|
|
|
|
desc "Run NBD test scenarios"
|
|
task 'scenarios' => ["build/flexnbd", "build/flexnbd-proxy"] do
|
|
sh "cd tests/acceptance && RUBYOPT='-I.' ruby nbd_scenarios -v"
|
|
end
|
|
end
|
|
|
|
|
|
desc "Remove all build targets, binaries and temporary files"
|
|
maketask :clean
|