Skip to content
Snippets Groups Projects
Commit 68b4c6bd authored by Ralf Mueller's avatar Ralf Mueller
Browse files

Rakefile cleanup; call autoreconf non-recursive

because existing libcdi/autogen.sh
parent 6a8b0916
No related branches found
No related tags found
No related merge requests found
......@@ -65,7 +65,6 @@ def executeRemote(command, builder)
puts "Connected to #{remoteHostname}".colorize(:green)
ssh.loop
stdout_data = ""
stderr_data = ""
exit_code = nil
......@@ -165,24 +164,22 @@ def builder2task(builder,useHostAsName=false,syncSource=true)
baseTaskName = useHostAsName ? builder.host : "#{builder.host}#{builder.compiler.upcase}"
toDo = lambda {|what| "#{baseTaskName}_#{what}".to_sym}
if syncSource then
@_help[:sync] = "sync source files " unless @_help.has_key?(:sync)
task toDo[:sync] do |t|
dbg("sync source code for branch:" + getBranchName)
doSync(builder)
end
@_help[:sync] = "sync source files " unless @_help.has_key?(:sync)
task toDo[:sync] do |t|
dbg("sync source code for branch:" + getBranchName)
doSync(builder)
end
@_help[:reconf] = "create configure script on host" unless @_help.has_key?(:reconf)
task toDo[:reconf] do |t|
cmd = "[[ -f autogen.sh ]] && ./autogen.sh || autoreconf -vfi"
cmd = "[[ -f autogen.sh ]] && ./autogen.sh || (cd libcdi; [[ -f autogen.sh ]] && ./autogen.sh) && autoreconf -vfi --no-recursive"
dbg(cmd)
execute(cmd,builder)
end
@_help[:conf]= \
"run configure on host: ./config/default with user settings activated" unless @_help.has_key?(:conf)
task toDo[:conf] => toDo[:reconf] do |t|
task toDo[:conf] => (syncSource ? toDo[:reconf] : nil) do |t|
dbg("call #{builder.configureCall}")
execute("#{builder.configureCall}",builder)
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment