From 42390a2d84225668c1217fc55d5deac3c88baedd Mon Sep 17 00:00:00 2001 From: crouzet Date: Fri, 6 Sep 2019 14:40:45 +0200 Subject: [PATCH] =?utf8?q?parametrisation=20dans=20INTERNAL.config.binary?= =?utf8?q?=5Fdir=20de=20la=20chaine=20BINARIES=20pour=20r=C3=A9duction=20e?= =?utf8?q?ventuelle=20sous=20windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- commands/package.py | 13 ++++++++----- src/internal_config/salomeTools.pyconf | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/commands/package.py b/commands/package.py index c9a033c..1f9c8bc 100644 --- a/commands/package.py +++ b/commands/package.py @@ -393,7 +393,7 @@ def produce_install_bin_file(config, "INSTALL_BIN.template") # build the name of the directory that will contain the binaries - binaries_dir_name = "BINARIES-" + config.VARS.dist + binaries_dir_name = config.INTERNAL.config.binary_dir + config.VARS.dist # build the substitution loop loop_cmd = "for f in $(grep -RIl" for key in d_sub: @@ -558,7 +558,9 @@ def binary_package(config, logger, options, tmp_working_dir): # check the name of the directory that (could) contains the binaries # from previous detar - binaries_from_detar = os.path.join(config.APPLICATION.workdir, "BINARIES-" + config.VARS.dist) + binaries_from_detar = os.path.join( + config.APPLICATION.workdir, + config.INTERNAL.config.binary_dir + config.VARS.dist) if os.path.exists(binaries_from_detar): logger.write(""" WARNING: existing binaries directory from previous detar installation: @@ -606,7 +608,7 @@ WARNING: existing binaries directory from previous detar installation: 1) # construct the name of the directory that will contain the binaries - binaries_dir_name = "BINARIES-" + config.VARS.dist + binaries_dir_name = config.INTERNAL.config.binary_dir + config.VARS.dist # construct the correlation table between the product names, there # actual install directories and there install directory in archive @@ -1536,8 +1538,9 @@ Please add it in file: for key in d_bin_files_to_add: if key.endswith("(bin)"): source_dir = d_bin_files_to_add[key][0] - path_in_archive = d_bin_files_to_add[key][1].replace("BINARIES-" +\ - runner.cfg.VARS.dist,runner.cfg.INTERNAL.config.install_dir) + path_in_archive = d_bin_files_to_add[key][1].replace( + config.INTERNAL.config.binary_dir + runner.cfg.VARS.dist, + runner.cfg.INTERNAL.config.install_dir) if os.path.basename(source_dir)==os.path.basename(path_in_archive): # if basename is the same we will just substitute the dirname d_paths_to_substitute[os.path.dirname(source_dir)]=\ diff --git a/src/internal_config/salomeTools.pyconf b/src/internal_config/salomeTools.pyconf index 4e9a8d5..b8bef1b 100644 --- a/src/internal_config/salomeTools.pyconf +++ b/src/internal_config/salomeTools.pyconf @@ -8,6 +8,7 @@ INTERNAL : { copy_prefix : "LOCAL_" install_dir : "INSTALL" + binary_dir : "BINARIES-" single_install_dir : "PRODUCTS" } log : -- 2.39.2