SSL mode integration : switch back SALOME modules on master branches - patch HOMARD...

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 29c866298a717a261a4f3dcf05aca4d6ae0d8f06..e1e869e8c1a66802f7aebb9838e3d415faf3f924 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -123,15 +123,15 @@ APPLICATION :
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
-        'SHAPER' : {tag : 'agy/arch2_ic0'}
-        'SHAPERSTUDY' : {tag : 'agy/arch2_ic0'}
+        'SHAPER'
+        'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag :'V2_4_4'}
-        'KERNEL' : {tag : 'agy/arch2_ic0'}
+        'KERNEL'
         'MEDCOUPLING'
         'GUI'
-        'GEOM' : {tag : 'agy/arch2_ic0'}
-        'SMESH' : {tag : 'agy/arch2_ic0'}
+        'GEOM'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 9f4553618ff019751198a81ace6fcafc2a8f5124..a00547eef2fbc0ba357609fd724c2b7b630cd871 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -107,15 +107,15 @@ APPLICATION :
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
-        'SHAPER': {tag : 'agy/arch2_ic0'}
-        'SHAPERSTUDY': {tag : 'agy/arch2_ic0'}
+        'SHAPER'
+        'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_4'}
-        'KERNEL' : {tag : 'agy/arch2_ic0'}
+        'KERNEL'
         'MEDCOUPLING'
         'GUI'
-        'GEOM' : {tag : 'agy/arch2_ic0'}
-        'SMESH': {tag : 'agy/arch2_ic0'}
+        'GEOM'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'

diff --git a/products/HOMARD.pyconf b/products/HOMARD.pyconf
index 3ff8dc03cce8f726681ef03fedbac054345f14f0..a00df635553d12232bd7ec7ea9fcfe979f57f2bb 100644 (file)
--- a/products/HOMARD.pyconf
+++ b/products/HOMARD.pyconf
@@ -18,6 +18,7 @@ default :
     depend : [ "SMESH"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    patches : ['HOMARD_SMESH_SSL_support.patch']
     properties:
     {
         has_salome_gui : "yes"

diff --git a/products/patches/HOMARD_SMESH_SSL_support.patch b/products/patches/HOMARD_SMESH_SSL_support.patch
new file mode 100644 (file)
index 0000000..0cc1da1
--- /dev/null
+++ b/products/patches/HOMARD_SMESH_SSL_support.patch
@@ -0,0 +1,49 @@
+diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx
+index 63e6cc8..bdca7a6 100644
+--- a/src/HOMARD_I/HOMARD_Gen_i.cxx
++++ b/src/HOMARD_I/HOMARD_Gen_i.cxx
+@@ -104,7 +104,7 @@ Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
+   ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting());
+   _NS->init_orb(_orb);
+ 
+-  myStudy = SALOMEDS::Study::_duplicate( SMESH_Gen_i::getStudyServant() );
++  myStudy = SALOMEDS::Study::_duplicate( SMESH_Gen_i::GetSMESHGen()->getStudyServant() );
+ 
+   _tag_gene = 0 ;
+   _tag_boun = 0 ;
+@@ -4580,7 +4580,7 @@ SALOMEDS::TMPFile* HOMARD_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
+   // HOMARD data file name
+   std::string aFileName = "";
+   if (isMultiFile)
+-    aFileName = SALOMEDS_Tool::GetNameFromPath(Kernel_Utils::encode(SMESH_Gen_i::getStudyServant()->URL()));
++    aFileName = SALOMEDS_Tool::GetNameFromPath(Kernel_Utils::encode(SMESH_Gen_i::GetSMESHGen()->getStudyServant()->URL()));
+   aFileName += "_HOMARD.dat";
+ 
+   // initialize sequence of file names
+@@ -4704,7 +4704,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
+   // HOMARD data file name
+   std::string aFileName = "";
+   if (isMultiFile)
+-    aFileName = SALOMEDS_Tool::GetNameFromPath(Kernel_Utils::encode(SMESH_Gen_i::getStudyServant()->URL()));
++    aFileName = SALOMEDS_Tool::GetNameFromPath(Kernel_Utils::encode(SMESH_Gen_i::GetSMESHGen()->getStudyServant()->URL()));
+   aFileName = tmpDir + aFileName + "_HOMARD.dat";
+ 
+   StudyContext& context = myStudyContext;
+@@ -4966,7 +4966,7 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished,
+    MESSAGE ("Entree dans DumpPython");
+    isValidScript=1;
+ 
+-   SALOMEDS::SObject_var aSO = SMESH_Gen_i::getStudyServant()->FindComponent("HOMARD");
++   SALOMEDS::SObject_var aSO = SMESH_Gen_i::GetSMESHGen()->getStudyServant()->FindComponent("HOMARD");
+    if(CORBA::is_nil(aSO))
+       return new Engines::TMPFile(0);
+ 
+@@ -5135,7 +5135,7 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished,
+ void HOMARD_Gen_i::IsValidStudy( )
+ {
+ //   MESSAGE( "IsValidStudy" );
+-  if (CORBA::is_nil(SMESH_Gen_i::getStudyServant()))
++  if (CORBA::is_nil(SMESH_Gen_i::GetSMESHGen()->getStudyServant()))
+   {
+     SALOME::ExceptionStruct es;
+     es.type = SALOME::BAD_PARAM;