From aeb1e18268f64b0c28bc56b1afcfae924138b439 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 3 Jul 2012 13:57:05 +0000 Subject: [PATCH] passing of multiple make options possible now --- code/setup/setup_code.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/setup/setup_code.py b/code/setup/setup_code.py index 587b1b017..d11196778 100755 --- a/code/setup/setup_code.py +++ b/code/setup/setup_code.py @@ -28,11 +28,12 @@ Writes version specific files for different MARC releases, adjustes the make fil ) parser.add_option('-c', '--compile', dest='spectralCompile', action='store_true', \ - help='compiles sthe spectral solver [%default]') -parser.add_option('-m', '--make', dest='makeOptions', type='string', \ - help='options parsed to make file when compiling spectral code [%default]') + help='compiles the spectral solver [%default]') +parser.add_option('-m', '--make', dest='makeOptions', action='extend', type='string', \ + metavar="KEY=VALUE", \ + help='comma-separated list of options passed to Makefile when compiling spectral code %default') parser.set_defaults(spectralCompile = False) -parser.set_defaults(makeOptions = 'F90=ifort') +parser.set_defaults(makeOptions = ['F90=ifort']) (options, args) = parser.parse_args() @@ -88,7 +89,7 @@ makefile.close() # compiling spectral code if (options.spectralCompile): os.system('make --directory %s clean'%(baseDir)) - os.system('make --directory %s %s'%(baseDir,options.makeOptions)) + os.system('make --directory %s %s'%(baseDir,' '.join(options.makeOptions))) for dir in bin_link: for file in bin_link[dir]: