import subprocess
import sys
import shutil
+import glob
import src
def __init__(self,
config,
logger,
+ product_name,
product_info,
options = src.options.OptResult(),
check_src=True):
self.config = config
self.logger = logger
self.options = options
+ self.product_name = product_name
self.product_info = product_info
self.build_dir = src.Path(self.product_info.build_dir)
self.source_dir = src.Path(self.product_info.source_dir)
##
# Prepares the environment.
# Build two environment: one for building and one for testing (launch).
- def prepare(self):
+ def prepare(self, add_env_launch=False):
if not self.build_dir.exists():
# create build dir
# add products in depend and opt_depend list recursively
environ_info = src.product.get_product_dependencies(self.config,
+ self.product_name,
self.product_info)
#environ_info.append(self.product_info.name)
self.build_environ.silent = (self.config.USER.output_verbose_level < 5)
self.build_environ.set_full_environ(self.logger, environ_info)
+ if add_env_launch:
# create runtime environment
- self.launch_environ = src.environment.SalomeEnviron(self.config,
+ self.launch_environ = src.environment.SalomeEnviron(self.config,
src.environment.Environ(dict(os.environ)),
False)
- self.launch_environ.silent = True # no need to show here
- self.launch_environ.set_full_environ(self.logger, environ_info)
+ self.launch_environ.silent = True # no need to show here
+ self.launch_environ.set_full_environ(self.logger, environ_info)
for ee in C_COMPILE_ENV_LIST:
vv = self.build_environ.get(ee)
# In case CMAKE_GENERATOR is defined in environment,
# use it in spite of automatically detect it
if 'cmake_generator' in self.config.APPLICATION:
- cmake_option += " -DCMAKE_GENERATOR=%s" \
+ cmake_option += " -DCMAKE_GENERATOR=\"%s\"" \
% self.config.APPLICATION.cmake_generator
-
command = ("cmake %s -DCMAKE_INSTALL_PREFIX=%s %s" %
(cmake_option, self.install_dir, self.source_dir))
command = 'msbuild'
command = command + " /maxcpucount:" + str(nb_proc)
if self.debug_mode:
- command = command + " /p:Configuration=Debug"
+ command = command + " /p:Configuration=Debug /p:Platform=x64 "
else:
- command = command + " /p:Configuration=Release"
+ command = command + " /p:Configuration=Release /p:Platform=x64 "
command = command + " ALL_BUILD.vcxproj"
self.log_command(command)
##
# Runs 'make install'.
def install(self):
- if self.config.VARS.dist_name=="Win":
+ if src.architecture.is_windows():
command = 'msbuild INSTALL.vcxproj'
if self.debug_mode:
- command = command + " /p:Configuration=Debug"
+ command = command + " /p:Configuration=Debug /p:Platform=x64 "
else:
- command = command + " /p:Configuration=Release"
+ command = command + " /p:Configuration=Release /p:Platform=x64 "
else :
command = 'make install'
-
self.log_command(command)
res = subprocess.call(command,
else:
return 1
+ # this function checks wether a list of file patterns (specified by check_install keyword)
+ # exixts after the make install. The objective is to ensure the installation is complete.
+ # patterns are given relatively to the install dir of the product
def check_install(self):
res=0
if "check_install" in self.product_info:
self.log_command("Check installation of files")
- for f in self.product_info.check_install:
- complete_path=os.path.join(self.product_info.install_dir, f)
- self.log_command(" -> check %s" % complete_path)
- if os.path.isfile(complete_path) == False :
+ for pattern in self.product_info.check_install:
+ # pattern is given relatively to the install dir
+ complete_pattern=os.path.join(self.product_info.install_dir, pattern)
+ self.log_command(" -> check %s" % complete_pattern)
+ # expansion of pattern : takes into account environment variables and unix shell rules
+ list_of_path=glob.glob(os.path.expandvars(complete_pattern))
+ if not list_of_path:
+ # we expect to find at least one entry, if not we consider the test failed
res+=1
- self.logger.write("Error, sat check install failed for file %s\n" % complete_path, 1)
- self.log_command("Error, sat check install failed for file %s" % complete_path)
+ self.logger.write("Error, sat check install failed for file pattern %s\n" % complete_pattern, 1)
+ self.log_command("Error, sat check install failed for file pattern %s" % complete_pattern)
return res
##
# Runs 'make_check'.
def check(self, command=""):
if src.architecture.is_windows():
- cmd = 'msbuild RUN_TESTS.vcxproj'
+ cmd = 'msbuild RUN_TESTS.vcxproj /p:Configuration=Release /p:Platform=x64 '
else :
if self.product_info.build_source=="autotools" :
cmd = 'make check'
assert self.build_environ is not None
# pass additional variables to environment
# (may be used by the build script)
+ self.build_environ.set("APPLICATION_NAME", self.config.APPLICATION.name)
self.build_environ.set("SOURCE_DIR", str(self.source_dir))
self.build_environ.set("INSTALL_DIR", str(self.install_dir))
self.build_environ.set("PRODUCT_INSTALL", str(self.install_dir))
# in order for the compilation script to take it into account
if src.product.product_is_hpc(self.product_info):
self.build_environ.set("SAT_HPC", "1")
+ if self.debug_mode:
+ self.build_environ.set("SAT_DEBUG", "1")
+ if self.verbose_mode:
+ self.build_environ.set("SAT_VERBOSE", "1")
+
def do_batch_script_build(self, script, nb_proc):