update to OCCT 7.4.0

Author: erossignon

.gitignore

@@ -1,4 +1,5 @@
 build/
 occt-7*
 occt7.*
+occt*.
 dist/

.travis.yml

@@ -21,7 +21,7 @@ deploy:
   provider: releases
   api_key:
     secure: oMjULOCmhN8PoB6ES7LgRpfIXHW5JNaWun/6+zowLCoZEjtXgXqVJfqxtSSRCIo5Mj0f+UKx1mLfRe4T93KpcFCelP5aUy6KnLl1d6CJsRq4EESWEQFwm/QfG9nyGKHpZatARlT3k/hsZFB6G4Bi58/E4lcrv0DFSQe7QVNM00Vylr2HKpsPRwgdJcbjcWDax0htXwF6GXUp5nJbGNwaG/ZGZldgMGPnprbPTKX64MxYzllldxZ6EU8D70O3+CnQsMG6zUwrcB6FplDaqwRSKd2toJLohKztBoK6eA6Eq+8Wwzd4W1xAwZ6Rt/14ks+kNm1U8Eshe9YgqnQdTz8W90s1BgdDzkssOzVqu9lRQWGO+HTMVDajBx2t4X/xdtilNPf51ynUVV5i6MBEA9ESpLY6BTdFvV4Z9dRc8eUPBszTi4AHOni8VVEG3c75i67s7W2LHghrGsiOcJPOgoGj1OkQgiN4cdIE3QeL7ZtOnpz/mVFO6TcfbgZT3YKBcEbkxJu0LA1C6dJZdVdpGD8fxgx9bghYMnp+lBCb/E4jtP/UYFPWLlNh09jamzF08rZjA6bLHIPOCzlp19rfDcodLyK9+iLzBmvfXgYD0slNZat6bje4PweEq7BdQflO0xbUi+Cvz/fIi5BvITJqI5huuAy+LFdv3Ld5x46zod2ha/M=
-  file: dist/occt-7.2.0-${TRAVIS_OS_NAME}.tgz
+  file: dist/occt-7.4.0-${TRAVIS_OS_NAME}.tgz
   skip_cleanup: true
   overwrite: true
   on:

Makefile

@@ -5,5 +5,5 @@ make:
 install: 
 	cd build_linux && make install -j4 > /dev/null
 package: install 
-	cd dist && tar -cf occt-7.2.0-${TRAVIS_OS_NAME}.tgz occt-7.2.0
+	cd dist && tar -cf occt-7.4.0-${TRAVIS_OS_NAME}.tgz occt-7.4.0
 .PHONY: prebuild make install package

add_cotire_to_7.4.0.patch

@@ -0,0 +1,82 @@
+diff -ur occt-fd47711/adm/MODULES occt-7.4.0_modified/adm/MODULES
+--- occt-fd47711/adm/MODULES	2019-09-29 11:12:58.000000000 +0200
++++ occt-7.4.0_modified/adm/MODULES	2019-12-20 13:20:41.810477040 +0100
+@@ -1,7 +1,7 @@
+ FoundationClasses TKernel TKMath
+ ModelingData TKG2d TKG3d TKGeomBase TKBRep
+-ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
+-Visualization TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost
++ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKShHealing
++Visualization TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost
+ ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
+-DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh
++DataExchange TKXSBase TKService TKXCAF TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKSTL TKVRML TKRWMesh
+ Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
+Les fichiers binaires occt-fd47711/dox/user_guides/foundation_classes/images/foundation_classes_image007.png et occt-7.4.0_modified/dox/user_guides/foundation_classes/images/foundation_classes_image007.png sont différents
+diff -ur occt-fd47711/src/Aspect/Aspect_DisplayConnection.cxx occt-7.4.0_modified/src/Aspect/Aspect_DisplayConnection.cxx
+--- occt-fd47711/src/Aspect/Aspect_DisplayConnection.cxx	2019-09-29 11:12:58.000000000 +0200
++++ occt-7.4.0_modified/src/Aspect/Aspect_DisplayConnection.cxx	2019-12-20 13:07:45.585064846 +0100
+@@ -25,7 +25,8 @@
+ // =======================================================================
+ Aspect_DisplayConnection::Aspect_DisplayConnection()
+ {
+-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
++#if defined(USE_GRAPHICS)
++//#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
+   myDisplay = NULL;
+   myIsOwnDisplay = false;
+   OSD_Environment anEnv ("DISPLAY");
+@@ -40,7 +41,8 @@
+ // =======================================================================
+ Aspect_DisplayConnection::~Aspect_DisplayConnection()
+ {
+-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
++#if defined(USE_GRAPHICS)
++//#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
+   if (myDisplay != NULL
+    && myIsOwnDisplay)
+   {
+@@ -49,7 +51,7 @@
+ #endif
+ }
+ 
+-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
++#if defined(USE_GRAPHICS)
+ // =======================================================================
+ // function : Aspect_DisplayConnection
+ // purpose  :
+diff -ur occt-fd47711/src/Aspect/Aspect_DisplayConnection.hxx occt-7.4.0_modified/src/Aspect/Aspect_DisplayConnection.hxx
+--- occt-fd47711/src/Aspect/Aspect_DisplayConnection.hxx	2019-09-29 11:12:58.000000000 +0200
++++ occt-7.4.0_modified/src/Aspect/Aspect_DisplayConnection.hxx	2019-12-20 13:06:36.927947393 +0100
+@@ -20,7 +20,8 @@
+ #include <TCollection_AsciiString.hxx>
+ #include <NCollection_DataMap.hxx>
+ 
+-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
++// #define USE_GRAPHICS FALSE
++#if defined(USE_GRAPHICS)
+   #include <InterfaceGraphic.hxx>
+ #endif
+ 
+@@ -39,7 +40,7 @@
+   //! Destructor. Close opened connection.
+   Standard_EXPORT ~Aspect_DisplayConnection();
+ 
+-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
++#if defined(USE_GRAPHICS)
+   //! Constructor. Creates connection with display specified in theDisplayName.
+   //! Display name should be in format "hostname:number" or "hostname:number.screen_number", where:
+   //! hostname      - Specifies the name of the host machine on which the display is physically attached.
+diff -ur occt-fd47711/src/TKService/PACKAGES occt-7.4.0_modified/src/TKService/PACKAGES
+--- occt-fd47711/src/TKService/PACKAGES	2019-09-29 11:12:58.000000000 +0200
++++ occt-7.4.0_modified/src/TKService/PACKAGES	2019-12-20 13:40:05.940134362 +0100
+@@ -1,9 +1,7 @@
+ Aspect
+ InterfaceGraphic
+-Xw
+ Image
+ Media
+ WNT
+ Cocoa
+ TColQuantity
+-Font

appveyor.yml

@@ -2,7 +2,7 @@ image: Visual Studio 2017
 init:
   - git config --global core.autocrlf input
 
-version: '7.2.{build}'
+version: '7.4.{build}'
 
 clone_depth: 5
 

build_occt.bat

@@ -1,6 +1,6 @@
 ECHO ON
 
-SET OCCT_VER=occt-7.2.0
+SET OCCT_VER=occt-7.4.0
 SET PLATFORM=win64
 SET ROOTFOLDER=%~dp0
 SET ARCHIVE_FOLDER=%ROOTFOLDER%dist\%PLATFORM%

build_occt.sh

@@ -1,18 +1,18 @@
-if [ ! -f occt7.2.0.tgz ]
+if [ ! -d occt-7.4.0 ]
 then 
-  curl  -L -o occt7.2.0.tgz "http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=8662560e2c9c83de9ed97b522bebcad2cfc87b92;sf=tgz"
-  tar -xf occt7.2.0.tgz
-  mv occt-8662560 occt-7.2.0
+  curl  -L -o occt7.4.0.tgz "http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=fd47711d682be943f0e0a13d1fb54911b0499c31;sf=tgz"
+  tar -xf occt7.4.0.tgz
+  mv occt-fd47711 occt-7.4.0
 
   echo -----------------------------------------------------------------
-  echo          PATCHING 7.2.0 TO SPEEDUP BUILD
+  echo          PATCHING 7.4.0 TO SPEEDUP BUILD
   echo -----------------------------------------------------------------
-  cd occt-7.2.0
-  patch -p1 < ../add_cotire_to_7.2.0.patch
+  cd occt-7.4.0
+  patch -p1 < ../add_cotire_to_7.4.0.patch
   cd ..
 fi
 
-export INSTALL_DIR=`pwd`/dist/occt-7.2.0
+export INSTALL_DIR=`pwd`/dist/occt-7.4.0
 
 mkdir -p build_linux
 cd build_linux
@@ -22,6 +22,8 @@ cmake -DINSTALL_DIR:STRING="${INSTALL_DIR}" \
           -DCMAKE_SUPPRESS_REGENERATION:BOOL=ON  \
           -DBUILD_USE_PCH:BOOLEAN=ON \
           -DUSE_TBB:BOOLEAN=ON \
+          -DUSE_VTK:BOOLEAN=OFF \
+          -DUSE_FREEIMAGE:BOOLEAN=OFF \
           -DBUILD_SHARED_LIBS:BOOL=OFF \
           -DBUILD_TESTING:BOOLEAN=OFF \
           -DBUILD_MODULE_ApplicationFramework:BOOLEAN=OFF \
@@ -33,7 +35,7 @@ cmake -DINSTALL_DIR:STRING="${INSTALL_DIR}" \
           -DBUILD_MODULE_ModelingAlgorithms:BOOLEAN=ON \
           -DBUILD_MODULE_ModelingData:BOOLEAN=ON \
           -DBUILD_MODULE_Visualization:BOOLEAN=OFF \
-          ../occt-7.2.0
+          ../occt-7.4.0
 
 make -j 5  | grep -v "Building CXX"