spns #41606: add SHAPER patch

diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf
index 6eaab03605927fe25b38872a03d030eae0b5e9eb..2f62806527b0b7b0556ca0602f5dd00137912c9e 100644 (file)
--- a/products/SHAPER.pyconf
+++ b/products/SHAPER.pyconf
@@ -63,6 +63,15 @@ version_V9_10_0_FD37:
   patches : ['SPNS-32377-SHAPER-V9_10_0-FD37.patch']
 }
 
+version_V9_10_0:
+{
+}
+
+version_V9_10_0_win:
+{
+  patches: ['SHAPER-9.10.0-visual-2019.patch']
+}
+
 version_V9_9_0_UB22_04:
 {
   patches : ['SPNS-29880-SHAPER-V9_9_0.patch']

diff --git a/products/compil_scripts/root-6.30.bat b/products/compil_scripts/root-6.30.bat
index 2604a37f7375b4b51c9dc42c475ae74a5ed95ed9..32cb52ab7aa16005426fd29257e1d871d60aee47 100755 (executable)
--- a/products/compil_scripts/root-6.30.bat
+++ b/products/compil_scripts/root-6.30.bat
@@ -29,7 +29,8 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY_DIRS=%PYTHON_ROOT_DIR%\libs
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dpyroot=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dpyroot_legacy=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dminuit2=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dasimage=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dasimage=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dcocoa=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_clang=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_llvm=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_openui5=ON

diff --git a/products/env_scripts/opencv.py b/products/env_scripts/opencv.py
index 2492802fcf2d516eb57ba341397937394e5aa4b3..b14183dc077bf17755b45822a8851a78783abfa5 100755 (executable)
--- a/products/env_scripts/opencv.py
+++ b/products/env_scripts/opencv.py
@@ -16,10 +16,10 @@ def set_env(env, prereq_dir, version):
     env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
   else:
     env.prepend('PATH', os.path.join(prereq_dir, 'x64','vc15','bin'))
-    env.prepend('PATH', os.path.join(prereq_dir, 'x64','vc15','lib'))
     env.set('OpenCV_INCLUDE_DIRS', os.path.join(prereq_dir, 'include'))
     env.append('OpenCV_INCLUDE_DIRS',os.path.join(prereq_dir, 'include','opencv'))
     env.append('OpenCV_INCLUDE_DIRS',os.path.join(prereq_dir, 'include','opencv2'))
+    env.set('OpenCV_INCLUDE_DIR', os.path.join(prereq_dir, 'include'))
 
 def set_nativ_env(env):
   env.set('OPENCV_ROOT_DIR', '/usr')

diff --git a/products/patches/SHAPER-9.10.0-visual-2019.patch b/products/patches/SHAPER-9.10.0-visual-2019.patch
new file mode 100755 (executable)
index 0000000..4747f0a
--- /dev/null
+++ b/products/patches/SHAPER-9.10.0-visual-2019.patch
@@ -0,0 +1,69 @@
+diff --git a/src/Config/Config_PropManager.cpp b/src/Config/Config_PropManager.cpp
+index ba5d65b34..c57654d3e 100644
+--- a/src/Config/Config_PropManager.cpp
++++ b/src/Config/Config_PropManager.cpp
+@@ -18,7 +18,9 @@
+ //
+ 
+ #include "Config_PropManager.h"
+-
++#if defined(WIN32)
++  #include <locale.h>
++#endif
+ bool Config_PropManager::autoColorStatus = false;
+ 
+ std::vector<int> stringToRGB(const std::string& theColor);
+diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
+index 2997fd602..a76d4c61f 100644
+--- a/src/GeomAPI/GeomAPI_Shape.h
++++ b/src/GeomAPI/GeomAPI_Shape.h
+@@ -25,6 +25,7 @@
+ #include <GeomAPI_Interface.h>
+ #include <memory>
+ #include <list>
++#include<string>
+ 
+ class GeomAPI_Pnt;
+ class GeomAPI_Vertex;
+diff --git a/src/InitializationPlugin/InitializationPlugin_EvalListener.h b/src/InitializationPlugin/InitializationPlugin_EvalListener.h
+index f9c160656..d01406b99 100644
+--- a/src/InitializationPlugin/InitializationPlugin_EvalListener.h
++++ b/src/InitializationPlugin/InitializationPlugin_EvalListener.h
+@@ -22,7 +22,7 @@
+ 
+ #include <InitializationPlugin.h>
+ #include <Events_Loop.h>
+-
++#include <string>
+ class ModelAPI_Attribute;
+ class ModelAPI_Document;
+ class ModelAPI_Feature;
+diff --git a/src/ModelAPI/ModelAPI_IReentrant.h b/src/ModelAPI/ModelAPI_IReentrant.h
+index a71da9bbe..ae936c948 100644
+--- a/src/ModelAPI/ModelAPI_IReentrant.h
++++ b/src/ModelAPI/ModelAPI_IReentrant.h
+@@ -22,9 +22,11 @@
+ 
+ #include "ModelAPI.h"
+ 
++#include <string>
+ #include <vector>
+ #include <memory>
+ 
++
+ class Events_Message;
+ 
+ /** \class ModelAPI_IReentrant
+diff --git a/src/ParametersPlugin/ParametersPlugin_EvalListener.h b/src/ParametersPlugin/ParametersPlugin_EvalListener.h
+index ba1c4faca..e904e7cc4 100644
+--- a/src/ParametersPlugin/ParametersPlugin_EvalListener.h
++++ b/src/ParametersPlugin/ParametersPlugin_EvalListener.h
+@@ -19,7 +19,7 @@
+ 
+ #ifndef SRC_PARAMETERSPLUGIN_EVALLISTENER_H_
+ #define SRC_PARAMETERSPLUGIN_EVALLISTENER_H_
+-
++#include <string>
+ #include <ParametersPlugin.h>
+ #include <Events_Loop.h>
+