Commit 9156b649 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Merge branch 'develop' of git.mpimet.mpg.de:cdo into develop

parents 3e67e6f4 cab6233f
......@@ -69,12 +69,24 @@
"makeCall": "make -j 12",
"sync": false
},
"localGCC_stackFail": {
"hostname": "luthien",
"configureCall": "/home/ram/src/cdo/configure --enable-hirlam-extensions --with-eccodes --with-netcdf --with-magics --with-udunits2 CFLAGS='-std=gnu99 -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fopenmp' CXXFLAGS='-std=gnu++11 -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fopenmp' CPPFLAGS='-I/usr/include/magics'",
"makeCall": "make -j 12",
"sync": false
},
"mpipcCLANG": {
"hostname": "breeze",
"configureCall": "./configure --with-netcdf=/sw/squeeze-x64/netcdf-4.2-static --disable-openmp CC=clang CFLAGS='-g -O2'",
"makeCall": "make -j 12",
"sync": true
},
"breezeGCC_stackFail": {
"hostname": "breeze",
"configureCall": "./configure CFLAGS='-std=gnu99 -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fopenmp' CXXFLAGS='-std=gnu++11 -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fopenmp'",
"makeCall": "make -j 12",
"sync": true
},
"cyg": {
"hostname": "cygwin",
"configureCall": "autoreconf -v -i ; ./config/default CC=gcc",
......
......@@ -91,7 +91,8 @@ def executeRemote(command, builder)
ssh.loop
end
end
def executeRemoteSimple
def executeRemoteSimple(command,builder)
sh "ssh #{builder.username}@#{builder.hostname} '#{command}'"
end
#
# execution wrapper
......@@ -108,7 +109,11 @@ def execute(command, builder)
if builder.isLocal? then
executeLocal(commands)
else
executeRemote(commands,builder)
if ENV.include?('SIMPLE')
executeRemoteSimple(commands,builder)
else
executeRemote(commands,builder)
end
end
end
#
......@@ -206,9 +211,10 @@ def builder2task(builder,useHostAsName=false,syncSource=true)
end
@_help[:cmd] = "execute command within the target build dir, e.g. rake localGCC_cmd['pwd']" unless @_help.has_key?(:cmd)
task toDo[:cmd] ,:cmd do |t, args|
task toDo[:cmd] ,:cmd,:a,:b,:c,:d do |t, args|
warn "No command given!!" && exit(1) if args.cmd.nil?
execute(args.cmd,builder)
cmd = args.to_hash.values.join(',')
execute(cmd,builder)
end
@_help[:mods] = "get the auto loaded modules on the target machine"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment