From: Nabil Ghodbane Date: Sat, 4 May 2024 12:52:09 +0000 (+0200) Subject: spns #40779: support multi repositories X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e723ae3c1390260ab31bc34798647dfab4678c99;p=tools%2Fsat_salome.git spns #40779: support multi repositories --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index e229573..533c6b1 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -198,6 +198,7 @@ APPLICATION : properties : { mesa_launcher_in_package : "yes" + git_server : 'tuleap' repo_dev : "yes" pip : 'yes' pip_install_dir : 'python' diff --git a/products/ADAO.pyconf b/products/ADAO.pyconf index a42feb1..e0cb1b5 100644 --- a/products/ADAO.pyconf +++ b/products/ADAO.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "adao.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "adao.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/adao.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "adao.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/adao.git" + } } environ : { diff --git a/products/ADAO_INTERFACE.pyconf b/products/ADAO_INTERFACE.pyconf index df0aba0..025c62c 100644 --- a/products/ADAO_INTERFACE.pyconf +++ b/products/ADAO_INTERFACE.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "adao_interface.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "adao_interface.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/adao_interface.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "adao_interface.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/adao_interface.git" + } } environ : { diff --git a/products/BLSURFPLUGIN.pyconf b/products/BLSURFPLUGIN.pyconf index a03071d..9884230 100644 --- a/products/BLSURFPLUGIN.pyconf +++ b/products/BLSURFPLUGIN.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/blsurfplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "blsurfplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/blsurfplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "blsurfplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/blsurfplugin.git" + } } environ : { @@ -44,8 +48,12 @@ version_V8_4_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/blsurfplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "blsurfplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/blsurfplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "blsurfplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/blsurfplugin.git" + } } environ : { @@ -82,8 +90,12 @@ version_V6_6_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/blsurfplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "blsurfplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/blsurfplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "blsurfplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/blsurfplugin.git" + } } environ : { diff --git a/products/CALCULATOR.pyconf b/products/CALCULATOR.pyconf index c0c103e..bc9e45f 100644 --- a/products/CALCULATOR.pyconf +++ b/products/CALCULATOR.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "samples/calculator.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "calculator.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/calculator.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "calculator.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "samples/calculator.git" + } } environ : { @@ -41,8 +45,12 @@ version_6_6_0_to_9_1_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "samples/calculator.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "calculator.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/calculator.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "calculator.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "samples/calculator.git" + } } environ : { diff --git a/products/CAS.pyconf b/products/CAS.pyconf index db79cf9..cf541ac 100755 --- a/products/CAS.pyconf +++ b/products/CAS.pyconf @@ -42,9 +42,9 @@ version_CR753_SALOME_PATCH : name : "CAS" build_source : "cmake" cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" - #get_source : "git" + get_source : "git" #FIXME - get_source : "archive" + #get_source : "archive" archive_info : { archive_name : "CAS-V7_5_3p5.tar.gz" diff --git a/products/CEATESTBASE.pyconf b/products/CEATESTBASE.pyconf index 7f631bf..92bc30c 100644 --- a/products/CEATESTBASE.pyconf +++ b/products/CEATESTBASE.pyconf @@ -5,8 +5,10 @@ default : get_source : "git" git_info: { - repo : "https://codev-tuleap.cea.fr/plugins/git/spns/CEATESTBASE.git" - repo_dev : $repo + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "spns/CEATESTBASE.git" + } } environ : { @@ -19,5 +21,6 @@ default : properties: { not_in_package : "yes" + is_opensource : "no" } } diff --git a/products/COMPONENT.pyconf b/products/COMPONENT.pyconf index 56428b4..70169e5 100644 --- a/products/COMPONENT.pyconf +++ b/products/COMPONENT.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "samples/component.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "component.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/component.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "component.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "samples/component.git" + } } environ : { diff --git a/products/CONFIGURATION.pyconf b/products/CONFIGURATION.pyconf index a5242c1..9a7d42c 100755 --- a/products/CONFIGURATION.pyconf +++ b/products/CONFIGURATION.pyconf @@ -4,8 +4,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "tools/configuration.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "configuration.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/configuration.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "configuration.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/configuration.git" + } } depend : [ ] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name diff --git a/products/COREFLOWS_PROFILE.pyconf b/products/COREFLOWS_PROFILE.pyconf index 33c7e5a..3bd68b2 100644 --- a/products/COREFLOWS_PROFILE.pyconf +++ b/products/COREFLOWS_PROFILE.pyconf @@ -1,12 +1,14 @@ default : -{ +x{ name : "COREFLOWS_PROFILE" build_source : "cmake" get_source : "git" git_info: { - repo : "/home/salome/GitRepo/" + $name + ".git" - repo_dev : $repo + repo_name : + { + default : "/home/salome/GitRepo/" + $name + ".git" + } } environ : { diff --git a/products/DOCUMENTATION.pyconf b/products/DOCUMENTATION.pyconf index 9e8aa36..ee4e5c9 100644 --- a/products/DOCUMENTATION.pyconf +++ b/products/DOCUMENTATION.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "tools/documentation.git " - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "documentation.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/documentation.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "documentation.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/documentation.git" + } } environ : { diff --git a/products/EFICAS.pyconf b/products/EFICAS.pyconf index affd685..f10e7a5 100644 --- a/products/EFICAS.pyconf +++ b/products/EFICAS.pyconf @@ -7,8 +7,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "eficas.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "eficas.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/eficas.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "eficas.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/eficas.git" + } } environ : { @@ -41,8 +45,12 @@ version_7_2_0 : get_source : "archive" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "eficas_tools.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "eficas.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/eficas.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "eficas.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/eficas.git" + } } environ : { diff --git a/products/EFICAS_TOOLS.pyconf b/products/EFICAS_TOOLS.pyconf index b0483f2..abd20bf 100644 --- a/products/EFICAS_TOOLS.pyconf +++ b/products/EFICAS_TOOLS.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "eficas_tools.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "eficas_tools.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/eficas_tools.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "eficas_tools.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/eficas_tools.git" + } } environ : { diff --git a/products/FIELDS.pyconf b/products/FIELDS.pyconf index 4e0ee6c..a4b0592 100755 --- a/products/FIELDS.pyconf +++ b/products/FIELDS.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/med.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "med.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/med.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "med.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/med.git" + } } environ : { diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf index 57174d9..2c71613 100644 --- a/products/GEOM.pyconf +++ b/products/GEOM.pyconf @@ -7,8 +7,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/geom.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "geom.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/geom.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "geom.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/geom.git" + } } environ : { diff --git a/products/GHS3DPLUGIN.pyconf b/products/GHS3DPLUGIN.pyconf index 310d01f..7eea3c7 100644 --- a/products/GHS3DPLUGIN.pyconf +++ b/products/GHS3DPLUGIN.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/ghs3dplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "ghs3dplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/ghs3dplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "ghs3dplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/ghs3dplugin.git" + } } environ : { @@ -45,8 +49,12 @@ version_V6_6_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/ghs3dplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "ghs3dplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/ghs3dplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "ghs3dplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/ghs3dplugin.git" + } } environ : { diff --git a/products/GHS3DPRLPLUGIN.pyconf b/products/GHS3DPRLPLUGIN.pyconf index af95bfa..5265463 100644 --- a/products/GHS3DPRLPLUGIN.pyconf +++ b/products/GHS3DPRLPLUGIN.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/ghs3dprlplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "ghs3dprlplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/ghs3dprlplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "ghs3dprlplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/ghs3dprlplugin.git" + } } environ : { diff --git a/products/GMSHPLUGIN.pyconf b/products/GMSHPLUGIN.pyconf index fa36b52..075ddfa 100644 --- a/products/GMSHPLUGIN.pyconf +++ b/products/GMSHPLUGIN.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/gmshplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "gmshplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/gmshplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "gmshplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/gmshplugin.git" + } } environ : { @@ -39,8 +43,12 @@ version_8_1_0_to_9_1_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/gmshplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "gmshplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/gmshplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "gmshplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/gmshplugin.git" + } } environ : { @@ -71,8 +79,12 @@ version_V7_8_0 : nb_proc : 4 git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/gmshplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "gmshplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/gmshplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "gmshplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/gmshplugin.git" + } } environ : { diff --git a/products/GUI.pyconf b/products/GUI.pyconf index 9f804e0..efd1a64 100644 --- a/products/GUI.pyconf +++ b/products/GUI.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/gui.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "gui.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/gui.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "gui.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/gui.git" + } } environ : { @@ -172,8 +176,12 @@ version_7_8_0_to_8_4_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/gui.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "gui.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/gui.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "gui.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/gui.git" + } } environ : { @@ -212,8 +220,12 @@ version_python_async : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/gui.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "gui.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/gui.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "gui.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/gui.git" + } } environ : { @@ -256,8 +268,12 @@ version_oscar : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/gui.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "gui.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/gui.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "gui.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/gui.git" + } } environ : { @@ -295,8 +311,12 @@ version_V6_6_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/gui.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "gui.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/gui.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "gui.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/gui.git" + } } environ : { diff --git a/products/HELLO.pyconf b/products/HELLO.pyconf index b39d6f7..c01895f 100644 --- a/products/HELLO.pyconf +++ b/products/HELLO.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "samples/hello.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "hello.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/hello.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "hello.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "samples/hello.git" + } } environ : { diff --git a/products/HEXABLOCK.pyconf b/products/HEXABLOCK.pyconf index fa30679..cfe06e9 100644 --- a/products/HEXABLOCK.pyconf +++ b/products/HEXABLOCK.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/hexablock.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "hexablock.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/hexablock.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "hexablock.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/hexablock.git" + } } environ : { diff --git a/products/HEXABLOCKPLUGIN.pyconf b/products/HEXABLOCKPLUGIN.pyconf index 1e6e563..167fa31 100644 --- a/products/HEXABLOCKPLUGIN.pyconf +++ b/products/HEXABLOCKPLUGIN.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/hexablockplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "hexablockplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/hexablockplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "hexablockplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/hexablockplugin.git" + } } environ : { diff --git a/products/HOMARD.pyconf b/products/HOMARD.pyconf index b8f4367..fd9554f 100644 --- a/products/HOMARD.pyconf +++ b/products/HOMARD.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/homard.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "homard.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/homard.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "homard.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/homard.git" + } } environ : { diff --git a/products/HYBRIDPLUGIN.pyconf b/products/HYBRIDPLUGIN.pyconf index a321a3a..7f34d22 100644 --- a/products/HYBRIDPLUGIN.pyconf +++ b/products/HYBRIDPLUGIN.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/hybridplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "hybridplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/hybridplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "hybridplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/hybridplugin.git" + } } environ : { diff --git a/products/HexoticPLUGIN.pyconf b/products/HexoticPLUGIN.pyconf index b0c4c06..0ea7d74 100644 --- a/products/HexoticPLUGIN.pyconf +++ b/products/HexoticPLUGIN.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/hexoticplugin.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "hexoticplugin.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/hexoticplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "hexoticplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/hexoticplugin.git" + } } environ : { diff --git a/products/JOBMANAGER.pyconf b/products/JOBMANAGER.pyconf index 96c7e40..1bf90a6 100644 --- a/products/JOBMANAGER.pyconf +++ b/products/JOBMANAGER.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/jobmanager.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "jobmanager.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/jobmanager.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "jobmanager.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/jobmanager.git" + } } environ : { diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf index 637a8d8..9d8cbb9 100644 --- a/products/KERNEL.pyconf +++ b/products/KERNEL.pyconf @@ -7,8 +7,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/kernel.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "kernel.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/kernel.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "kernel.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/kernel.git" + } } environ : { @@ -231,8 +235,12 @@ ALAMOS_SALOME_9 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/kernel.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "kernel.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/kernel.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "kernel.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/kernel.git" + } } environ : { @@ -291,8 +299,12 @@ ALAMOS_SALOME_9_win : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/kernel.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "kernel.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/kernel.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "kernel.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/kernel.git" + } } environ : { @@ -308,8 +320,12 @@ ALAMOS : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/kernel.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "kernel.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/kernel.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "kernel.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/kernel.git" + } } environ : { @@ -346,8 +362,12 @@ version_V6_6_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/kernel.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "kernel.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/kernel.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "kernel.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/kernel.git" + } } environ : { diff --git a/products/LIBBATCH.pyconf b/products/LIBBATCH.pyconf index 70be924..6096094 100755 --- a/products/LIBBATCH.pyconf +++ b/products/LIBBATCH.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "tools/libbatch.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "libbatch.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/libbatch.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "libbatch.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/libbatch.git" + } } environ : { diff --git a/products/MED.pyconf b/products/MED.pyconf index 5be0146..8a88e7d 100755 --- a/products/MED.pyconf +++ b/products/MED.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/med.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "med.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/med.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "med.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/med.git" + } } environ : { @@ -34,8 +38,12 @@ default_MPI : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/med.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "med.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/med.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "med.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/med.git" + } } environ : { @@ -63,8 +71,12 @@ version_V6_6_0 : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/med.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "med.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/med.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "med.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/med.git" + } } environ : { diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index ad2eb2d..f5b9be9 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "tools/medcoupling.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "medcoupling.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/medcoupling.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "medcoupling.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/medcoupling.git" + } } depend : [ "boost", diff --git a/products/NETGENPLUGIN.pyconf b/products/NETGENPLUGIN.pyconf index e2b33fd..9d15888 100755 --- a/products/NETGENPLUGIN.pyconf +++ b/products/NETGENPLUGIN.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "plugins/netgenplugin.git " - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "netgenplugin.git " + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/netgenplugin.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "netgenplugin.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "plugins/netgenplugin.git" + } } environ : { diff --git a/products/OPENTURNS_SALOME.pyconf b/products/OPENTURNS_SALOME.pyconf index 2eca4e4..106f72f 100644 --- a/products/OPENTURNS_SALOME.pyconf +++ b/products/OPENTURNS_SALOME.pyconf @@ -7,8 +7,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/openturns_salome.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "openturns_salome.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/openturns_salome.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "openturns_salome.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/openturns_salome.git" + } } archive_info : { diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf index 8fd9adb..5aba5c1 100644 --- a/products/PARAVIS.pyconf +++ b/products/PARAVIS.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/paravis.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "paravis.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/paravis.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "paravis.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/paravis.git" + } } environ : { diff --git a/products/PARAVISADDONS.pyconf b/products/PARAVISADDONS.pyconf index d192044..cb53b35 100644 --- a/products/PARAVISADDONS.pyconf +++ b/products/PARAVISADDONS.pyconf @@ -9,8 +9,12 @@ default : get_source : "git" git_info : { - repo : $PROJECTS.projects.salome.git_info.default_git_server + 'modules/paravisaddons_common.git' - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + 'paravisaddons_common.git' + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/paravisaddons_common.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "paravisaddons_common.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/paravisaddons_common.git" + } } environ : { diff --git a/products/PY2CPP.pyconf b/products/PY2CPP.pyconf index 3ac054b..3459900 100644 --- a/products/PY2CPP.pyconf +++ b/products/PY2CPP.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "py2cpp.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "py2cpp.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/py2cpp.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "py2cpp.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/py2cpp.git" + } } environ : { diff --git a/products/PYCALCULATOR.pyconf b/products/PYCALCULATOR.pyconf index 4c18ce7..f887d13 100644 --- a/products/PYCALCULATOR.pyconf +++ b/products/PYCALCULATOR.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "samples/pycalculator.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "pycalculator.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/pycalculator.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "pycalculator.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "samples/pycalculator.git" + } } environ : { diff --git a/products/PYHELLO.pyconf b/products/PYHELLO.pyconf index 2df58fd..c44fe91 100644 --- a/products/PYHELLO.pyconf +++ b/products/PYHELLO.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "samples/pyhello.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "pyhello.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/pyhello.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "pyhello.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "samples/pyhello.git" + } } environ : { diff --git a/products/RESTRICTED.pyconf b/products/RESTRICTED.pyconf index a260985..110d26b 100644 --- a/products/RESTRICTED.pyconf +++ b/products/RESTRICTED.pyconf @@ -4,8 +4,10 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "restricted.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "restricted.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/restricted.git" + } } environ : { @@ -17,6 +19,7 @@ default : { compilation : "no" not_in_package : "yes" - } + is_opensource : "no" + } patches : [] } diff --git a/products/SALOME.pyconf b/products/SALOME.pyconf index e911b50..da9f249 100644 --- a/products/SALOME.pyconf +++ b/products/SALOME.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : "https://codev-tuleap.cea.fr/plugins/git/salome/" + $name + ".git" - repo_dev : $repo + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/SALOME.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "SALOME.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/SALOME.git" + } } environ : { diff --git a/products/SALOMEBOOTSTRAP.pyconf b/products/SALOMEBOOTSTRAP.pyconf index 1e6ca4e..ff1c8a4 100644 --- a/products/SALOMEBOOTSTRAP.pyconf +++ b/products/SALOMEBOOTSTRAP.pyconf @@ -6,8 +6,11 @@ default : get_source : "git" git_info: { - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "salome_bootstrap.git" - repo : $repo_dev + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/salome_bootstrap.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "salome_bootstrap.git" + } } environ : { diff --git a/products/SAMPLES.pyconf b/products/SAMPLES.pyconf index 8d31398..7cbf716 100644 --- a/products/SAMPLES.pyconf +++ b/products/SAMPLES.pyconf @@ -4,8 +4,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "samples/datafiles.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "datafiles.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/datafiles.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "datafiles.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "samples/datafiles.git" + } } depend : [] patches : [] diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf index 6eaab03..5b3a815 100644 --- a/products/SHAPER.pyconf +++ b/products/SHAPER.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/shaper.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "shaper.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/shaper.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "shaper.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/shaper.git" + } } environ : { diff --git a/products/SHAPERSTUDY.pyconf b/products/SHAPERSTUDY.pyconf index 3612804..d8c4b19 100644 --- a/products/SHAPERSTUDY.pyconf +++ b/products/SHAPERSTUDY.pyconf @@ -5,8 +5,12 @@ default : get_source : "git" git_info : { - repo : $PROJECTS.projects.salome.git_info.default_git_server_dev + "shaper_study.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "shaper_study.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/shaper_study.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "shaper_study.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/shaper_study.git" + } } environ : { diff --git a/products/SMESH.pyconf b/products/SMESH.pyconf index 7f54eb7..d22de6f 100644 --- a/products/SMESH.pyconf +++ b/products/SMESH.pyconf @@ -7,8 +7,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/smesh.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "smesh.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/smesh.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "smesh.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/smesh.git" + } } environ : { diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf index 5a90b2f..fb3812e 100644 --- a/products/SOLVERLAB.pyconf +++ b/products/SOLVERLAB.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/solverlab.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "solverlab.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/solverlab.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "solverlab.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/solverlab.git" + } } environ : { diff --git a/products/TESTBASE.pyconf b/products/TESTBASE.pyconf index 51c21b2..eeb1bb6 100644 --- a/products/TESTBASE.pyconf +++ b/products/TESTBASE.pyconf @@ -5,8 +5,10 @@ default : get_source : "git" git_info: { - repo : "https://codev-tuleap.cea.fr/plugins/git/salome/testbase.git" - repo_dev : $repo + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/testbase.git" + } } environ : { @@ -20,5 +22,6 @@ default : { compilation : "no" not_in_package : "yes" + is_opensource : "no" } } diff --git a/products/TopIIVolMesh.pyconf b/products/TopIIVolMesh.pyconf index b45dc31..b889f3e 100644 --- a/products/TopIIVolMesh.pyconf +++ b/products/TopIIVolMesh.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/top_ii_vol.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "top_ii_vol.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/top_ii_vol.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "top_ii_vol.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/top_ii_vol.git" + } } system_info : { diff --git a/products/VISU.pyconf b/products/VISU.pyconf index cacfe9f..d3092de 100644 --- a/products/VISU.pyconf +++ b/products/VISU.pyconf @@ -5,8 +5,11 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/visu.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "visu.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/visu.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/visu.git" + } } environ : { diff --git a/products/XDATA.pyconf b/products/XDATA.pyconf index ec59266..1f5c0fc 100644 --- a/products/XDATA.pyconf +++ b/products/XDATA.pyconf @@ -5,9 +5,7 @@ default : get_source : "git" git_info: { - repo : "https://codev-tuleap.cea.fr/plugins/git/oscar/xdata.git" - repo_dev : "https://codev-tuleap.cea.fr/plugins/git/oscar/xdata.git" - + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "oscar/xdata.git" } environ : { diff --git a/products/YACS.pyconf b/products/YACS.pyconf index 87fdc7c..5e9195e 100644 --- a/products/YACS.pyconf +++ b/products/YACS.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/yacs.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "yacs.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/yacs.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "yacs.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "modules/yacs.git" + } } environ : { diff --git a/products/YACSGEN.pyconf b/products/YACSGEN.pyconf index 8415b09..e2e6210 100644 --- a/products/YACSGEN.pyconf +++ b/products/YACSGEN.pyconf @@ -6,8 +6,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "tools/yacsgen.git " - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "yacsgen.git " + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/yacsgen.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "yacsgen.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/yacsgen.git" + } } environ : { diff --git a/products/YDEFX.pyconf b/products/YDEFX.pyconf index 6d5560d..53dc68d 100644 --- a/products/YDEFX.pyconf +++ b/products/YDEFX.pyconf @@ -7,8 +7,12 @@ default : get_source : "git" git_info: { - repo : $PROJECTS.projects.salome.git_info.default_git_server + "tools/ydefx.git" - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "ydefx.git" + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/ydefx.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "ydefx.git" + gitpub : $PROJECTS.projects.salome.git_info.git_server.gitpub.url + "tools/ydefx.git" + } } environ : { diff --git a/products/dill.pyconf b/products/dill.pyconf index 5845d2e..8ccdde3 100644 --- a/products/dill.pyconf +++ b/products/dill.pyconf @@ -8,8 +8,8 @@ default : { env_script : $name + ".py" } - depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen'] - opt_depend: [] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'libxml2'] + opt_depend: ['nlopt', 'eigen'] patches : [] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name @@ -31,5 +31,6 @@ default_win : incremental : "yes" pip : "yes" } - depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'pthreads'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'libxml2', 'pthreads'] + opt_depend : ['nlopt', 'eigen'] } diff --git a/products/pmml.pyconf b/products/pmml.pyconf index 56de69b..e5723ea 100644 --- a/products/pmml.pyconf +++ b/products/pmml.pyconf @@ -5,8 +5,11 @@ default : get_source : "git" git_info : { - repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "pmml.git" - repo : $repo_dev + repo_name : + { + tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "salome/pmml.git" + github : $PROJECTS.projects.salome.git_info.git_server.github.url + "pmml.git" + } } environ : { diff --git a/products/root.pyconf b/products/root.pyconf index 7cdb7b5..ca78830 100644 --- a/products/root.pyconf +++ b/products/root.pyconf @@ -6,8 +6,10 @@ default : get_source : "git" git_info: { - repo : "https://github.com/root-project/root.git" - repo_dev : $repo + repo_name : + { + github : "https://github.com/root-project/root.git" + } } environ : { diff --git a/salome.pyconf b/salome.pyconf index 958c191..9f91cdc 100644 --- a/salome.pyconf +++ b/salome.pyconf @@ -17,8 +17,12 @@ LICENCEPATH : "/home/salome-public/prerequis/LICENCE:/nfs/home/salome-public/pre git_info : { - default_git_server : "https://git.salome-platform.org/gitpub/" - default_git_server_dev : "https://codev-tuleap.cea.fr/plugins/git/salome/" + git_server : + { + tuleap : {url : "https://codev-tuleap.cea.fr/plugins/git/"} + github : {url : "git@github.com:SalomePlatform/", } + gitpub : {url : "https://git.salome-platform.org/gitpub/" } + } } test_bases :