Commit 7f8ba8ea authored by Ralf Mueller's avatar Ralf Mueller
Browse files

remove defaultCompilers; always use CC from ~/.rake.json

parent 5622c202
{ "hosts": {
"thunder": {
"hostname": "thunder5.zmaw.de",
"dir": "/scratch/mpi/CC/mh0287/users/m300064/builds/remote"
"dir": "/scratch/mpi/CC/mh0287/users/m300064/builds/remote",
"CC": ["icpc", "icc", "clang", "clang++", "gcc", "g++"]
},
"luthien": {
"hostname": "localhost",
......@@ -37,22 +38,25 @@
"builders": {
"localCLANG_3.8_Debug": {
"hostname": "luthien",
"CC": "clang",
"configureCall": "/home/ram/src/cdo/configure --with-netcdf CC=clang CFLAGS='-g -O0'",
"configureCall": "/home/ram/src/cdo/configure --with-netcdf --disable-openmp CC=clang CXX=clang++ CFLAGS='-g -O0'",
"makeCall": "make -j 12",
"sync": false
},
"localCLANG++_3.8_Debug": {
"hostname": "luthien",
"CC": "clang",
"configureCall": "/home/ram/src/cdo/configure --with-netcdf --enable-cxx CC=clang CXX=clang++ CFLAGS='-g -O0'",
"configureCall": "/home/ram/src/cdo/configure --with-netcdf --disable-openmp --enable-cxx CC=clang CXX=clang++ CFLAGS='-g -O0'",
"makeCall": "make -j 12",
"sync": false
},
"mpipcCLANG": {
"hostname": "mpipc",
"CC": "clang",
"configureCall": "./configure --with-netcdf=--with-netcdf=/sw/squeeze-x64/netcdf-4.2-static --disable-openmp CC=clang CFLAGS='-g -O2'",
"configureCall": "./configure --with-netcdf=/sw/squeeze-x64/netcdf-4.2-static --disable-openmp CC=clang CFLAGS='-g -O2'",
"makeCall": "make -j 12",
"sync": true
},
"localGCCInSourceNoOpenmp": {
"hostname": "luthien",
"configureCall": "./configure --disable-openmp CC=gcc CFLAGS='-g -O2'",
"makeCall": "make -j 12",
"sync": true
}
......
......@@ -17,8 +17,6 @@ end
# get setup from the environment
@debug = true # == Rake.verbose ? true : false
@user = ENV['USER']
# basic compilers handled by the default configuration: ./config/default
@defaultCompilers = %w[icpc icc clang clang++ gcc g++]
# default configure call
@defautConfigureCall = lambda {|cc| "./config/default CC=#{cc}"}
# }}}
......@@ -205,9 +203,9 @@ end
# constuct builders out of user configuration {{{ ==============================
Builder = Struct.new(:host,:hostname,:username,:compiler,:targetDir,:configureCall,:isLocal?)
# 1) construct builders from host configuration
# this is what config/default should be able to handle
@userConfig["hosts"].each {|host,config|
compilers = config.has_key?('CC') ? config['CC'] : @defaultCompilers
compilers.each {|cc|
config['CC'].each {|cc|
builder = Builder.new(host,
config["hostname"],
('localhost' == config['hostname']) \
......@@ -217,7 +215,7 @@ Builder = Struct.new(:host,:hostname,:username,:compiler,:targetDir,:configureCa
: @userConfig["remoteUser"]),
cc,
[config["dir"],cc,getBranchName].join(File::SEPARATOR),
@defautConfigureCall[cc],
"./config/default CC=#{cc}",
config["hostname"] == 'localhost')
builder2task(builder)
}
......@@ -232,7 +230,7 @@ Builder = Struct.new(:host,:hostname,:username,:compiler,:targetDir,:configureCa
: ( config.has_key?('username') \
? config['username'] \
: @userConfig["remoteUser"]),
config["CC"],
'', # CC can be empty here, because it should be set by the given configureCall
[@userConfig['hosts'][config['hostname']]['dir'],builderName,getBranchName].join(File::SEPARATOR),
config['configureCall'],
( 'localhost' == config['hostname'] \
......
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