spns #40779: implement git multiserver approach: tuleap, github, gitpub

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index dd35873893e09818af41302e92566170cff37876..9dddd8562c6898871f796e964990a77e9185ae07 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -201,7 +201,7 @@ APPLICATION :
     properties :
     {
         mesa_launcher_in_package : "yes"
-        repo_dev : "yes"
+        git_server : 'tuleap'
         pip : 'yes'
         pip_install_dir : 'python'
         single_install_dir : "no"

diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index 24b17354c0cd812595ffd454a2753e4b792f4db4..15bca53c637990babfbb0b9050708f7ace264b8c 100644 (file)
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -200,7 +200,7 @@ APPLICATION :
     properties :
     {
         mesa_launcher_in_package : "yes"
-        repo_dev : "yes"
+        git_server : 'tuleap'
         pip : 'yes'
         pip_install_dir : 'python'
         single_install_dir : "no"

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 61a6d7ef7ee3cd29f9d78bab5707538c8f831aac..d46ad61ed048176abe595e5035b07742275f8f19 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -205,7 +205,7 @@ APPLICATION :
     properties :
     {
         mesa_launcher_in_package : "yes"
-        repo_dev : "yes"
+        git_server : 'tuleap'
         pip : 'yes'
         pip_install_dir : 'python'
         single_install_dir : "no"

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 70f851da997dbea645ee8cb60f9d0eeac8155a9d..59360662051821815cb72b6d5806fdcd85b44abe 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -209,7 +209,7 @@ APPLICATION :
     properties :
     {
         mesa_launcher_in_package : "no"
-        repo_dev : "yes"
+        git_server : 'tuleap'
         pip : 'yes'
         pip_install_dir : 'python'
         single_install_dir : "yes"

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 062f75619568372313d48ddac0d28596f4b874d3..d2cb721373813320df3aff1aea6c89e102f6ee19 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -224,7 +224,7 @@ APPLICATION :
     properties :
     {
         mesa_launcher_in_package : "yes"
-        repo_dev : "yes"
+        git_server : 'tuleap'
         pip : 'yes'
         pip_install_dir : 'python'
         single_install_dir : "no"

diff --git a/products/ADAO.pyconf b/products/ADAO.pyconf
index a42feb10deb65105381a80392fc7e29642ca7801..44fa60ae172931de67675f585a3be511ea34c16f 100644 (file)
--- 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"
+      repositories :
+      {
+        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 df0aba029787c5a907a9e0a598764ad00c8b6fe6..cccec3fa98960ac1a6cbe97318e4d385d5350340 100644 (file)
--- 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"
+      repositories :
+      {
+        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 a03071d64b710e6bee577e3c8c5142a5f3fe85c3..fb1164acfd8e3af46c2cb2180bc35c69a6ef09f1 100644 (file)
--- 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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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 c0c103e7613810c56384c04e80df543e3ef9d237..def32b30c397a47e56699529bd78c5e70b2ef75d 100644 (file)
--- 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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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 ab16b24511dcdd7ce7d6dab4186e686e4e366736..cc533fbd54773cbee19f36f42ae11a05c8ad284f 100755 (executable)
--- a/products/CAS.pyconf
+++ b/products/CAS.pyconf
@@ -130,9 +130,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 7f631bf05d9e10bcc9755b6bcaddfe7d0ea26492..84a4e3b03240c19c04f28b7adb2761bff13d5763 100644 (file)
--- 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
+      repositories :
+      {
+        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 56428b4d9dd9f56ca47d5f6e95139b2ac3cff14e..b689829badf238d282462ad79177ebb9fe9a8df4 100644 (file)
--- 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"
+      repositories :
+      {
+        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 a5242c1ac0c402b34f2a4177bd3a54d520492a89..b7fa6c6239991847968c1d2dcc6974f683605820 100755 (executable)
--- 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"
+      repositories :
+      {
+        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/DOCUMENTATION.pyconf b/products/DOCUMENTATION.pyconf
index 9e8aa361db56266776a8274787eb4a1bea1cb29f..d181118ea6bceb24284e4d236bd041c773be8862 100644 (file)
--- 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"
+      repositories :
+      {
+        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 affd6855c75674c2ff2764f72e0ef3d3d1a8fce8..f3f78720353a1ec263921b96063e1b5f4e7121c3 100644 (file)
--- 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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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 b0483f23678c91e566b1fe008d5aef2d4b96ebd3..71ce63d2bccf53a32eb0983687f0c14ae88a533b 100644 (file)
--- 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"
+      repositories :
+      {
+        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 4e0ee6c094b2a2dbc1af08e25561a072b6eefac7..25e9dcfbe12659cf5ed5051cb5cb37ad62c09295 100755 (executable)
--- 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"
+      repositories :
+      {
+        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 57174d96c36655fa4b3d7c6f7594519ce705b4c9..cbc9fc12f7564ddb8c3ac4f50040a6a0853c95e3 100644 (file)
--- 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"
+      repositories :
+      {
+        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 310d01f44c8d8a7d8c003c3c5b0d8e5334034cae..0d2e8ea5a221dcdd6a0c92b95c2b1c4a1b880637 100644 (file)
--- 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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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 af95bfac0c8f8d81a4d11c6ff63e5c8c2f63a802..a5f8f08baf676f862cda13b661a1311331adbed6 100644 (file)
--- 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"
+      repositories :
+      {
+        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 fa36b529b39767ac42dc147d016454dc87b02aae..a5b23bb11a694df93e18b3a518034de7cbf6c328 100644 (file)
--- 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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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 9f804e0849caef70e9e11f351872ee939cdf6069..726816d90c9ea7cc0d8f27b4803140287fae08da 100644 (file)
--- 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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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 b39d6f73cca6159c8f1557db78cf867ff575aa0e..221d3faafb9e5c714e7149a75b3de2d2567bce41 100644 (file)
--- 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"
+      repositories :
+      {
+        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 fa306794d7251ae04482710fb5b41ca89313dac9..55b8117da376673a38117d96f005d4247c74a5d1 100644 (file)
--- 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"
+      repositories :
+      {
+        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 1e6e563ce9de8b144d221c7c97f43c9b7da41182..628ef0adc095815c5adab853c383b2ba40d95bee 100644 (file)
--- 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"
+      repositories :
+      {
+        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 b8f43678236958a6a96e71469e0b71b2db2dbb26..b6cac650039eaabf02f1bf80ff8d474baf3d9c2e 100644 (file)
--- 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"
+      repositories :
+      {
+        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 a321a3a639d22bd77f04012fa3ac86a332769d93..0ac939cc2af47c9ca042518e7d89483f1c09398f 100644 (file)
--- 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"
+      repositories :
+      {
+        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 b0c4c061f900c0abaa29fb03eee7f9fcbd225d7b..7431e2a4c8a2e653797d9db81d83c7688b38869a 100644 (file)
--- 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"
+      repositories :
+      {
+        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 96c7e40c401293f4a4ee6988fce95730b9c14eeb..036aaf6f1204ab4b43ef41c5a7154ab5330cb8e5 100644 (file)
--- 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"
+      repositories :
+      {
+        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 610f197597ccb0726ffd5531ad643e680e42486a..f4f635c5ee75900600bcdececa4084dd9006e7b0 100644 (file)
--- 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"
+      repositories :
+      {
+        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 :
     {          
@@ -233,8 +237,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"
+      repositories :
+      {
+        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 :
     {          
@@ -293,8 +301,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"
+      repositories :
+      {
+        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 :
     {
@@ -310,8 +322,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"
+      repositories :
+      {
+        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 :
     {          
@@ -348,8 +364,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"
+      repositories :
+      {
+        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 70be92410246d794ae92f54a120c8d8a7e2ac328..d3f8259f3b8cd1c4802d6938104f76adb28b8ff6 100755 (executable)
--- 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"
+      repositories :
+      {
+        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 5be0146abe6df2c545c042d658a636f4a12a45db..d53c8034ce5fc18056ecc39e8fb6901f271fa4d1 100755 (executable)
--- 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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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"
+      repositories :
+      {
+        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 ad2eb2d615b3220b65325a4965d9ca3472ee0e90..56fa79bfb1096d2fa3639a2296c26965073d23a1 100644 (file)
--- 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"
+      repositories :
+      {
+        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 e2b33fd2e637b9c0970dad283d26e73c32e3cb92..8169518d70b23b00710f93c2590dc3a0a0d942e6 100755 (executable)
--- 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 "
+      repositories :
+      {
+        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 2eca4e4040b2f70f67b271347b0faf440a85ab5b..12684ff43c1575e07630d5da35b769223b54a40d 100644 (file)
--- 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"
+      repositories :
+      {
+        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 8fd9adbd804e744964b4de47737abd7ff664616e..f4f9711e780cf2516ddce11d9fe91b57f6c79878 100644 (file)
--- 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"
+      repositories :
+      {
+        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 d192044ffaa44a064759a228e902df02965bb359..eceb5d94808cf44170653db907ad350d29ebb7d6 100644 (file)
--- 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'
+      repositories :
+      {
+        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 3ac054bff23e13e76da880ce090bd1d59a2cec86..c166178226c7e02952d9dbce27997c7a3a5d8947 100644 (file)
--- 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"
+      repositories :
+      {
+        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 4c18ce7d732148cd4f37bda0b1e6bfcf2aac8b9f..819b0f5b138e8b19dfaa91d01ca0d4fcdc62430d 100644 (file)
--- 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"
+      repositories :
+      {
+        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 2df58fd3880ba8fcd33bf2d2c778267cf2315a9c..9020611f16fa672c32fb8c8c371e6ab933f59f20 100644 (file)
--- 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"
+      repositories :
+      {
+        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 a260985f48bdbef0371a2e27725ac820d575fd68..1924df1c919e1ce262c6371b58851f0181666900 100644 (file)
--- 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"
+      repositories :
+      {
+        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 e911b50e9ecebfb74968a6a65a8d061dc4a53912..da81294eb0cf77c03b4a2ac6121751b49fdf5f6e 100644 (file)
--- 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
+      repositories :
+      {
+        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 1e6ca4e04164d644e503b7dd54cd7b9b6c00f535..30b1b86cd9c5f3fb0db6c625e953addd6986f07b 100644 (file)
--- 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
+      repositories :
+      {
+        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 8d31398eb5e8cfb2b13288ec236eacc839068a90..9d5421144fc34fd48f146a7cec051f3229d322d2 100644 (file)
--- 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"
+      repositories :
+      {
+        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 072d9dbdd47ba7a9cf116c9b00539622c629ed06..da5088cde1553b95ea61aac75f65980eff74dfdf 100644 (file)
--- 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"
+      repositories :
+      {
+        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 3612804c970a6e449121d0a16e3b828970c6dbc8..f155a890303fb6c11c151cff4592f396bf52476d 100644 (file)
--- 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"
+      repositories :
+      {
+        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 7f54eb76ab8e4233aa40013bbb0068995fda7424..de886af682db5004cf485f755f4e088641bc4a55 100644 (file)
--- 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"
+      repositories :
+      {
+        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 5a90b2f8115c771b96f50a4948973d572168a11c..642f0981fe67b5ff3251a9039392f8ea91dc43dc 100644 (file)
--- 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"
+      repositories :
+      {
+        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 51c21b2d39ad5e7adbbd12aaf584ce036695777c..7be7c0843964bb1e5dda746e266cbe7fd0511e78 100644 (file)
--- 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
+      repositories :
+      {
+        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 b45dc31ed7cb7cafd3570f22da77a4399d50015f..fe3b6d37eab4421b5f560d9eafe6d65866525ea7 100644 (file)
--- 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"
+      repositories :
+      {
+        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 cacfe9febff024c367d9aac189c3fc6667ec5ee9..1a6b5d68b64ceaa747abc01949be23179987b743 100644 (file)
--- 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"
+      repositories :
+      {
+        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 ec59266ffb6b36e068b02c54b21f69ec739ab380..1f5c0fcf33a5bc3af45214e3bd99f0e2fd35cf28 100644 (file)
--- 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 87fdc7cc3c0a26342af74bf38536a70c1033b067..c76f0c487775116d20abfbdda8b04f760bfcebb2 100644 (file)
--- 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"
+      repositories :
+      {
+        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 8415b09d84644e586c518f10f86b18d04b29ef01..187991a2b7bfe963d7661a2d351db22ec3a8079b 100644 (file)
--- 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 "
+      repositories :
+      {
+        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 6d5560da7ce3b356454bec8ecb26e8036cc82bb0..364c6f8e4a29667912d24fc574f64ac4ed0c6221 100644 (file)
--- 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"
+      repositories :
+      {
+        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/pmml.pyconf b/products/pmml.pyconf
index 56de69b53805173ad0c92c1fa7522e1d41e1fd13..104a49e78ad1563f0f75f2475b50be1b938cb328 100644 (file)
--- 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
+      repositories :
+      {
+        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 7cdb7b51107b9bbd494bad3392cbd9654db15457..e220908bfa274e4506f96ed294345109d8955460 100644 (file)
--- 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
+      repositories :
+      {
+        github : "https://github.com/root-project/root.git"
+      }
     }
     environ :
     {

diff --git a/salome-W10.pyconf b/salome-W10.pyconf
index a4d1f887f31c4bb4377b2fc9b7c91163e472877e..3159a3d11c4069e25827a368391164aed5581ea6 100644 (file)
--- a/salome-W10.pyconf
+++ b/salome-W10.pyconf
@@ -17,6 +17,14 @@ LICENCEPATH : "\\\\titania\\home_projet08\\salome-public\\prerequis\\LICENCE"
 
 git_info : 
 {
+  git_server :
+  {
+      tuleap : {url : "https://codev-tuleap.cea.fr/plugins/git/", opensource_only: 'no' }
+      github : {url : "git@github.com:SalomePlatform/",           opensource_only: 'yes'}
+      gitpub : {url : "https://git.salome-platform.org/gitpub/",  opensource_only: 'yes'}
+  }
+    # these two keys are deprecated - they are kept for backward compatibility only and
+    # will be removed in a future SAT release.
     default_git_server : "https://git.salome-platform.org/gitpub/"
     default_git_server_dev : "https://codev-tuleap.cea.fr/plugins/git/salome/"
 }

diff --git a/salome.pyconf b/salome.pyconf
index 958c19189c7e000b8c2530fa8d4da411e0355907..e5a467583b073a075280ad0a827092c7afdf5bed 100644 (file)
--- a/salome.pyconf
+++ b/salome.pyconf
@@ -17,8 +17,16 @@ 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/", opensource_only: 'no' }
+      github : {url : "git@github.com:SalomePlatform/",           opensource_only: 'yes'}
+      gitpub : {url : "https://git.salome-platform.org/gitpub/",  opensource_only: 'yes'}
+  }
+  # these two keys are deprecated - they are kept for backward compatibility only and
+  # will be removed in a future SAT release.
+  default_git_server : "https://git.salome-platform.org/gitpub/"
+  default_git_server_dev : "https://codev-tuleap.cea.fr/plugins/git/salome/"
 }
 
 test_bases :