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

[develop] avoid autoreconf to speedup builds/tests

add new task :reconf for local re-generation of the building scripts
parent 687b4b9c
No related branches found
No related tags found
No related merge requests found
......@@ -137,12 +137,16 @@ def doSync(builder)
rsyncOpts = "--delete-excluded --delete"
# * keep old stuff on the remote site
rsyncOpts = "-L"
# exclude generate files by make
rsyncOpts << " --exclude='**/*.*o' --exclude='**/*.la' --exclude='**/.deps/*' --exclude=config.status --exclude=config.log"
# collect the source files
file = Tempfile.new("rsyncCdoTempfiles2Transfer")
begin
file.write(`git ls-files`)
file.write(`git ls-files --others`)
file.write(`git submodule foreach 'git ls-files | sed "s|^|$path/|"'`)
file.write(`git submodule foreach 'git ls-files --others| sed "s|^|$path/|"'`)
file.close
......@@ -179,15 +183,21 @@ def builder2task(builder,useHostAsName=false,syncSource=true)
@_help[:conf]= \
"run configure on host: ./config/default with user settings activated" unless @_help.has_key?(:conf)
task toDo[:conf] => (syncSource ? toDo[:reconf] : nil) do |t|
task toDo[:conf] => (syncSource ? toDo[:sync] : nil) do |t|
dbg("call #{builder.configureCall}")
execute("#{builder.configureCall}",builder)
end
@_help[:make] = \
"run 'make'" unless @_help.has_key?(:make)
"run 'make -j' with a reasonable number of procs" unless @_help.has_key?(:make)
task toDo[:make].to_sym do |t|
execute("make -j4",builder)
execute("make -j$(cat /proc/cpuinfo | grep processor | wc -l)",builder)
end
@_help[:makeSerial] = \
"run 'make' (single process build)" unless @_help.has_key?(:makeSerial)
task toDo[:makeSerial].to_sym do |t|
execute("make",builder)
end
@_help[:check] = \
......@@ -342,6 +352,12 @@ task :par do |t|
Parallel.map(taskList) {|t| sh "xterm -hold -e 'rake #{t}' " }
end
desc "re-run autotools"
task :reconf do
cmd = "test -f autogen.sh && ./autogen.sh || (cd libcdi; test -f autogen.sh && ./autogen.sh) && autoreconf -vfi --no-recursive"
sh cmd
end
desc "show help on all hidden tasks"
task :help do
@_help.each {|t,help|
......
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