minor changes

limbo.py

@@ -18,12 +18,19 @@ def create_variants(bld, source, uselib_local,
    #   tgt.uselib_local = uselib_local
    #   tgt.uselib = uselib
    # the variants
+   # we create a basic file
+   tmp = source.replace('.cpp', '')
+   tgt = bld.program(features = 'cxx',
+                     source = source,
+                     target = tmp,
+                     includes = includes,
+                     uselib = uselib,
+                     use = uselib_local)
    c_src = bld.path.abspath() + '/'
    for v in variants:
       # create file
       suff = ''
       for d in v.split(' '): suff += d.lower() + '_'
-      tmp = source.replace('.cpp', '')
       src_fname = tmp + '_' + suff[0:len(suff) - 1] + '.cpp'
       bin_fname = tmp + '_' + suff[0:len(suff) - 1]
       f = open(c_src + src_fname, 'w')
@@ -41,7 +48,7 @@ def create_variants(bld, source, uselib_local,
                         includes = includes,
                         uselib = uselib,
                         use = uselib_local)
-   
+
 def qsub(conf_file):
    tpl = """
 #! /bin/sh

src/benchmarks/multi.cpp

@@ -178,7 +178,7 @@ int main() {
 #elif defined MOP2
   typedef mop2 func_t;
 #else
-# error "unknown function to optimize"
+  typedef mop2 func_t;
 #endif
 
   typedef stat::ParetoBenchmark<func_t> stat_t;
@@ -186,7 +186,7 @@ int main() {
   Parego<Params, stat_fun<stat_t> > opt;
 #elif defined(NSBO)
   Nsbo<Params, stat_fun<stat_t> > opt;
-#elif defined(EHVI)
+#else
   Ehvi<Params, stat_fun<stat_t> > opt;
 #endif
 

wscript

@@ -19,6 +19,7 @@ def options(opt):
         opt.load('sferes')
 	opt.load('limbo')
         opt.add_option('--exp', type='string', help='exp(s) to build, separate by comma', dest='exp')
+        opt.load('xcode')
         for i in glob.glob('exp/*'):
                 opt.recurse(i)
 
@@ -28,6 +29,7 @@ def configure(conf):
         conf.load('eigen')
         conf.load('tbb')
         conf.load('sferes')
+        conf.load('xcode')
 
 	common_flags = "-Wall -std=c++11 "
 

xcode.py

@@ -162,9 +162,9 @@ class PBXLegacyTarget(XCodeNode):
 		XCodeNode.__init__(self)
 		self.buildConfigurationList = XCConfigurationList([XCBuildConfiguration('waf', {})])
 		if not target:
-			self.buildArgumentsString = "%s %s" % ("waf_xcode.sh", action)
+			self.buildArgumentsString = "%s %s" % ("waf_xcode.sh")
 		else:
-			self.buildArgumentsString = "%s %s --targets=%s" % ("waf_xcode.sh", action, target)
+			self.buildArgumentsString = "%s --targets=%s" % ("waf_xcode.sh", target)
 		self.buildPhases = []
 		self.buildToolPath = "/bin/bash" #sys.executable
 		self.buildWorkingDirectory = ""