Salome HOME
projects
/
tools
/
sat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d828b7d
)
sat #8581 : ajout pour chaque produit d'une information sur le tag du projet et de...
author
crouzet
<nicolas.crouzet@cea.fr>
Wed, 6 Feb 2019 15:51:19 +0000
(16:51 +0100)
committer
crouzet
<nicolas.crouzet@cea.fr>
Wed, 6 Feb 2019 15:51:19 +0000
(16:51 +0100)
src/product.py
patch
|
blob
|
history
diff --git
a/src/product.py
b/src/product.py
index f2fe8dd2548f2a88991c0e25f7888dac29904b88..f18fc81e37718c46c1717c35010f1a6d8800b5e4 100644
(file)
--- a/
src/product.py
+++ b/
src/product.py
@@
-168,6
+168,16
@@
def get_product_config(config, product_name, with_install_dir=True):
# Search for the product description in the configuration
prod_info = get_product_section(config, product_name, vv, section)
# Search for the product description in the configuration
prod_info = get_product_section(config, product_name, vv, section)
+ # get salomeTool version
+ prod_info.sat_version = src.get_salometool_version(config)
+
+ # get the product project git tag, if any
+ product_project_git_tag = src.system.git_describe(os.path.dirname(prod_info.from_file))
+ if product_project_git_tag:
+ prod_info.sat_project_tag = product_project_git_tag
+ else:
+ prod_info.sat_project_tag = "unknown"
+
# merge opt_depend in depend
if prod_info is not None and 'opt_depend' in prod_info:
for depend in prod_info.opt_depend:
# merge opt_depend in depend
if prod_info is not None and 'opt_depend' in prod_info:
for depend in prod_info.opt_depend: