[WINDOWS] Implement omniORB 4.2.6

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 607066af62ab8dc0197a5a665871ae9b473a4967..a903d6066582862cfe8410cafa49de7eae0805c3 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -110,8 +110,8 @@ APPLICATION :
         netgen : {tag:'5.3.1', base: 'no',  section: 'version_5_3_1_with_CAS_7_8_win'}
         nlopt : '2.7.1'
         numpy : '1.21.6'
-        omniORB : '4.2.3'
-        omniORBpy : '4.2.3'
+        omniORB : '4.2.6'
+        omniORBpy : '4.2.6'
         openblas : '0.3.23'
         opencv : '3.2.0'
         openssl: '1.1.1n'

diff --git a/products/compil_scripts/omniORB-4.2.6.bat b/products/compil_scripts/omniORB-4.2.6.bat
new file mode 100644 (file)
index 0000000..68a56d3
--- /dev/null
+++ b/products/compil_scripts/omniORB-4.2.6.bat
@@ -0,0 +1,73 @@
+@echo off
+
+echo ##########################################################################
+echo omniORB %VERSION%
+echo ##########################################################################
+
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+
+if NOT defined CYGWIN_ROOT_DIR (
+  echo ERROR: Please set the environment variable: CYGWIN_ROOT_DIR
+  exit 1
+) else (
+  echo INFO: Cygwin suite environment variable is set to: %CYGWIN_ROOT_DIR%
+)
+
+if exist "%BUILD_DIR%" rmdir /Q /S "%BUILD_DIR%"
+mkdir %BUILD_DIR%
+
+cd %SOURCE_DIR%
+xcopy * %BUILD_DIR% /E /I /Q
+if NOT %ERRORLEVEL% == 0 (
+  echo ERROR on xcopy
+  exit 2
+)
+
+REM select the correct platform
+set CONFIG_MK=%BUILD_DIR%\config\config.mk
+set CONFIG_REF=%BUILD_DIR%\config\config.mk.ref
+set CONFIG_DBG=%BUILD_DIR%\config\config.mk.dbg
+copy %CONFIG_MK% %CONFIG_REF%
+if %SAT_DEBUG% == 0 (
+  echo INFO: activating platform target: x86_win32_vs_15
+  sed "s/#platform = x86_win32_vs_15/platform = x86_win32_vs_15/g" < %CONFIG_REF% >  %CONFIG_MK%
+)
+
+REM target our Python in the configuration file
+set PLATFORM_MK=%BUILD_DIR%\mk\platforms\x86_win32_vs_15.mk
+set PLATFORM_REF=%BUILD_DIR%\mk\platforms\x86_win32_vs_15.mk.ref
+copy %PLATFORM_MK% %PLATFORM_REF%
+
+set CYGWIN_PYTHON_ROOT_DIR=%PYTHON_ROOT_DIR:\=\/%
+set CYGWIN_PYTHON_ROOT_DIR=%CYGWIN_PYTHON_ROOT_DIR::=%
+echo Setting path to Python binary...
+sed "s/#PYTHON = \/cygdrive\/c\/Python36\/python/PYTHON = \/cygdrive\/%CYGWIN_PYTHON_ROOT_DIR%\/python/g" < %PLATFORM_REF% >  %PLATFORM_MK%.1
+
+echo Setting path to openssl binary (don't use /cygwin path approach since it's buggy use path a la windows...
+set CYGWIN_OPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR:\=\/%
+sed "s/#OPEN_SSL_ROOT = \/cygdrive\/c\/openssl/OPEN_SSL_ROOT = %CYGWIN_OPENSSL_ROOT_DIR%/g" < %PLATFORM_MK%.1 >  %PLATFORM_MK%
+cd %BUILD_DIR%\src
+echo INFO: compilation starts now...
+set PATH=%PATH%;%CYGWIN_ROOT_DIR%\bin;%PYTHON_ROOT_DIR%
+make export
+if NOT %ERRORLEVEL% == 0 (
+   echo ERROR on make export
+   exit 3
+)
+
+cd %BUILD_DIR%
+xcopy * %INSTALL_DIR% /E /I /Q
+if NOT %ERRORLEVEL% == 0 (
+   echo ERROR on xcopy
+   exit 4
+)
+
+echo.
+echo ########## END

diff --git a/products/omniORB.pyconf b/products/omniORB.pyconf
index 19726189493a904c9ff0412950b8bfdb53f2b573..f43e7ebe47ad615d4b474c4f05b8befc75c9ffce 100644 (file)
--- a/products/omniORB.pyconf
+++ b/products/omniORB.pyconf
@@ -18,6 +18,12 @@ default :
     }
     patches : []
     post_script: "fix_permissions.sh"
+    opt_depend : []
+}
+
+default_win:
+{
+    opt_depend : ['openssl']
 }
 
 version_4_2_3_win_dbg:
@@ -39,3 +45,13 @@ version_4_2_5:
 {
   patches: ['omniORB-4.2.5.p1.patch']
 }
+
+version_4_2_6 :
+{
+}
+
+version_4_2_6_win:
+{
+  compil_script :  'omniORB-4.2.6.bat'
+  opt_depend : ['openssl']
+}