Fixed compilation on Windows

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index d996341103275edc6e1991b273fe934ca42ed582..3aeea22e86119db98bea72d6e0f0fc3d76f774b1 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -40,7 +40,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.67.0'
-        CAS : {tag : 'V7_5_3p5', section: 'version_CR753_SALOME_PATCH_win', base: 'no'}
+        CAS : 'CR780-SALOME-PATCH'
         certifi : '2019.6.16'
         cgns : '4.2.0'
         chardet : '3.0.4'
@@ -63,7 +63,7 @@ APPLICATION :
         FMILibrary : '2.0.3'
         freeimage : '3.18.0'
         freetype : '2.9.1'
-        gmsh : '4.10.3'
+        gmsh : '4.10.3_with_CAS_7.8'
         graphviz : '2.44.1'
         hdf5 : '1.10.3'
         idna : '2.8'
@@ -83,7 +83,7 @@ APPLICATION :
         MeshGems : '2.15-1'
         metis : '5.1.0'
         msvc : '2017'
-        netgen : '5.3.1_with_CAS_7.2'
+        netgen : '5.3.1_with_CAS_7.8'
         # comment out line above and uncomment the line below to use Netgen 6.
         #netgen : '6.2.2101'
         nlopt : '2.5.0'
@@ -141,19 +141,19 @@ APPLICATION :
         zlib : '1.2.5'
 
         # SALOME MODULES :
-        'CONFIGURATION'
+        'CONFIGURATION' : 'jfa/Porting_OCCT_780'
         'SALOME'
-        'SHAPER'
+        'SHAPER' : 'jfa/Porting_OCCT_780'
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag :'V2_5_0'}
-        'KERNEL'
+        'KERNEL' : 'jfa/Porting_OCCT_780'
         'MEDCOUPLING' : 'master'
-        'GUI'
-        'GEOM'
-        'SMESH'
-        'NETGENPLUGIN'
-        'BLSURFPLUGIN'
+        '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'
         'GHS3DPLUGIN'
         'HYBRIDPLUGIN'
         'HexoticPLUGIN'
@@ -162,13 +162,13 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         #'HOMARD'
         'FIELDS'
-        'PARAVIS'
+        'PARAVIS' : 'jfa/Porting_OCCT_780'
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
         'DOCUMENTATION'
         'SALOMEBOOTSTRAP'
-        'SAMPLES'
+        'SAMPLES' : 'jfa/Porting_OCCT_770'
         'COMPONENT'
         'PYCALCULATOR'
         'CALCULATOR'
@@ -182,8 +182,8 @@ APPLICATION :
         'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
-        #'TESTBASE'
-        'CEATESTBASE' : 'SalomeV9'
+        'TESTBASE' : 'jfa/Porting_OCCT_770_1'
+        #'CEATESTBASE' : 'SalomeV9'
     }
     profile :
     {

diff --git a/products/SALOME.pyconf b/products/SALOME.pyconf
index e911b50e9ecebfb74968a6a65a8d061dc4a53912..2204f2c9e8b515defad67f67cfcce501330323e6 100644 (file)
--- a/products/SALOME.pyconf
+++ b/products/SALOME.pyconf
@@ -5,7 +5,7 @@ default :
     get_source : "git"
     git_info:
     {
-        repo : "https://codev-tuleap.cea.fr/plugins/git/salome/" + $name + ".git"
+        repo : $PROJECTS.projects.salome.git_info.default_git_server_dev + $name + ".git"
         repo_dev : $repo
     }
     environ :

diff --git a/products/TESTBASE.pyconf b/products/TESTBASE.pyconf
index 51c21b2d39ad5e7adbbd12aaf584ce036695777c..ba882894c3bd8d8fb1ff660d65e916dd3c36f733 100644 (file)
--- a/products/TESTBASE.pyconf
+++ b/products/TESTBASE.pyconf
@@ -5,7 +5,7 @@ default :
     get_source : "git"
     git_info:
     {
-        repo : "https://codev-tuleap.cea.fr/plugins/git/salome/testbase.git"
+        repo : $PROJECTS.projects.salome.git_info.default_git_server_dev + "testbase.git"
         repo_dev : $repo
     }
     environ :

diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf
index fc2aac7eaf02d7ace76ebab76c5150b2d04386e7..847bbb9931a756950a99950e6de6ec7692e34550 100644 (file)
--- a/products/gmsh.pyconf
+++ b/products/gmsh.pyconf
@@ -42,7 +42,7 @@ version_4_10_3_with_CAS_7_8:
 version_4_10_3_with_CAS_7_8_win:
 {
   archive_info : {archive_name : "gmsh-4.10.3.tar.gz"}
-  compil_script : "gmsh-4.10.3.sh"
+  compil_script : "gmsh-4.10.3.bat"
   depend : ["CAS","lapack","hdf5","medfile", "cgns"]
   patches : ['gmsh-4.10.3-occt780-win.patch']
 }