OCCT780 porting branch name for all modules

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 4a1fe995ad9334ed9eeaa8dd98fb6c6f26fefad3..dc89d30f28b3b924986842cb479d6a3370b675dc 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -4,9 +4,8 @@
 APPLICATION :
 {
     name : 'SALOME-master-native'
-    #workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    workdir : $LOCAL.workdir
-    tag : 'jfa/Porting_OCCT_780'
+    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
+    tag : 'master'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -140,33 +139,33 @@ APPLICATION :
         URANIE : '4.7.0'
 
         # SALOME MODULES :
-        'CONFIGURATION'
+        'CONFIGURATION' : {tag: 'OCCT780'}
         'SALOME'
-        'SHAPER' : {tag:'cce/jfa_Porting_OCCT_780_MasterRebased'}
-        'SHAPERSTUDY' : {tag: 'master'} 
+        'SHAPER' : {tag:'OCCT780'}
+        'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : 'V2_5_0'
-        'KERNEL'
+        'KERNEL' : {tag:'OCCT780'}
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
-        'GUI'
-        'GEOM'
-        'SMESH' : {tag:'cce/jfa_Porting_OCCT_780_MasterRebased'}
-        'NETGENPLUGIN': {tag:'cce/jfa_Porting_OCCT_780_MasterRebased'}
-        'BLSURFPLUGIN'
-        'GHS3DPLUGIN' : {tag:'master'}
-        'HYBRIDPLUGIN' : {tag: 'master'}
-        'HexoticPLUGIN' : {tag: 'master'}
-        'GMSHPLUGIN' : {tag: 'master'}
-        'HEXABLOCK' : {tag: 'master'}
-        'HEXABLOCKPLUGIN' : {tag: 'master'}
-        'HOMARD' : {tag: 'master'}
+        'GUI' : {tag:'OCCT780'}
+        'GEOM' : {tag:'OCCT780'}
+        'SMESH' : {tag:'OCCT780'}
+        'NETGENPLUGIN': {tag:'OCCT780'}
+        'BLSURFPLUGIN': {tag:'OCCT780'}
+        'GHS3DPLUGIN'
+        'HYBRIDPLUGIN'
+        'HexoticPLUGIN'
+        'GMSHPLUGIN'
+        'HEXABLOCK'
+        'HEXABLOCKPLUGIN'
+        'HOMARD'
         'FIELDS'
-        'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS': {tag:'OCCT780', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'DOCUMENTATION' : {tag: 'master'}
-        'SAMPLES'
+        'DOCUMENTATION'
+        'SAMPLES': {tag:'OCCT780'}
         'COMPONENT'
         'PYCALCULATOR'
         'CALCULATOR'
@@ -177,7 +176,7 @@ APPLICATION :
         'PY2CPP'
         'ADAO'
         'ADAO_INTERFACE'
-        'PARAVISADDONS' : {tag: 'master'}
+        'PARAVISADDONS'
         'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
@@ -185,8 +184,8 @@ APPLICATION :
         'SOLVERLAB'
         'SOLVERLABGUI'
         'TopIIVolMesh'
-        #'TESTBASE'
-        'CEATESTBASE' : 'SalomeV9'
+        'TESTBASE': {tag:'OCCT780'}
+        #'CEATESTBASE' : 'SalomeV9'
     }
     profile :
     {

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 75b977e474e9434473c9f77580599a90d9490ce7..e5155160e6c2252c8e7f2b615cf6d14dbe5c65e5 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -145,19 +145,19 @@ APPLICATION :
         zlib : '1.2.5'
 
         # SALOME MODULES :
-        'CONFIGURATION' : 'jfa/Porting_OCCT_780'
+        'CONFIGURATION' : 'OCCT780'
         'SALOME'
-        'SHAPER' : 'jfa/Porting_OCCT_780'
+        'SHAPER' : 'OCCT780'
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag :'V2_5_0'}
-        'KERNEL' : 'jfa/Porting_OCCT_780'
+        'KERNEL' : 'OCCT780'
         'MEDCOUPLING' : 'master'
-        'GUI' : 'jfa/Porting_OCCT_780'
-        'GEOM' : 'jfa/Porting_OCCT_780'
-        'SMESH' : 'jfa/Porting_OCCT_780'
-        'NETGENPLUGIN' : 'jfa/Porting_OCCT_780'
-        'BLSURFPLUGIN' : 'jfa/Porting_OCCT_780'
+        'GUI' : 'OCCT780'
+        'GEOM' : 'OCCT780'
+        'SMESH' : 'OCCT780'
+        'NETGENPLUGIN' : 'OCCT780'
+        'BLSURFPLUGIN' : 'OCCT780'
         'GHS3DPLUGIN'
         'HYBRIDPLUGIN'
         'HexoticPLUGIN'
@@ -166,13 +166,13 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         #'HOMARD'
         'FIELDS'
-        'PARAVIS' : 'jfa/Porting_OCCT_780'
+        'PARAVIS' : 'OCCT780'
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
         'DOCUMENTATION'
         'SALOMEBOOTSTRAP'
-        'SAMPLES' : 'jfa/Porting_OCCT_770'
+        'SAMPLES' : 'OCCT780'
         'COMPONENT'
         'PYCALCULATOR'
         'CALCULATOR'
@@ -186,7 +186,7 @@ APPLICATION :
         'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
-        'TESTBASE' : 'jfa/Porting_OCCT_770_1'
+        'TESTBASE' : 'OCCT780'
         #'CEATESTBASE' : 'SalomeV9'
     }
     profile :