Test vselect\bugs\bug544

USE_D3D, USE_OPENGL and USE_GLES2 options declarations have been reordered.

.gitignore

@@ -12,12 +12,6 @@
 win32
 win64
 
-# standard names of directories for objects and binaries for samples
-bin
-obj
-Debug
-Release
-
 # project files and artifacts
 /adm/msvc
 /adm/wnt

CMakeLists.txt

@@ -219,7 +219,7 @@ if (NOT DEFINED INSTALL_DIR_BIN)
   endif()
 endif()
 
-# define folder contaning all shell/batch scripts
+# define folder containing all shell/batch scripts
 if (NOT DEFINED INSTALL_DIR_SCRIPT)
   if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
     set (INSTALL_DIR_SCRIPT "${INSTALL_DIR_BIN}" CACHE PATH "${INSTALL_DIR_SCRIPT_DESCR}")
@@ -311,7 +311,7 @@ if (NOT DEFINED INSTALL_DIR_DOC)
   endif()
 endif()
 
-# define folder contaning CMake configuration files
+# define folder containing CMake configuration files
 if (NOT DEFINED INSTALL_DIR_CMAKE)
   if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
     if (INSTALL_DIR_WITH_VERSION)
@@ -366,10 +366,14 @@ endif()
 # whether use optional 3rdparty or not
 if (APPLE)
   set (USE_GLX OFF CACHE BOOL "${USE_GLX_DESCR}")
+else()
+  set (USE_GLX OFF)
 endif()
 
 if (WIN32)
   set (USE_D3D OFF CACHE BOOL "${USE_D3D_DESCR}")
+else()
+  set (USE_D3D OFF)
 endif()
 
 # Enable/Disable the floating point exceptions (FPE) during runtime.
@@ -383,6 +387,15 @@ else()
   set (BUILD_ENABLE_FPE_SIGNAL_HANDLER 0)
 endif()
 
+# OpenGL
+if (ANDROID OR IOS OR EMSCRIPTEN OR "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+  set (USE_OPENGL OFF)
+  set (USE_GLES2 ON)
+else()
+  set (USE_OPENGL ON CACHE BOOL "${USE_OPENGL_DESCR}")
+  set (USE_GLES2 OFF CACHE BOOL "${USE_GLES2_DESCR}")
+endif()
+
 # include the patched or original list of modules
 # list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits
 # list <OCCT_MODULES> will contain all modules
@@ -414,10 +427,6 @@ if (NOT DEFINED BUILD_DOC_Overview)
   set (BUILD_DOC_Overview ${CAN_DOXYGEN_BE_USED} CACHE BOOL "${BUILD_DOC_Overview_DESCR}")
 endif()
 
-if (NOT USE_D3D)
-  list (REMOVE_ITEM Visualization_TOOLKITS TKD3DHost)
-endif()
-
 # accumulate used toolkits (first level) in BUILD_TOOLKITS variable
 list (APPEND BUILD_TOOLKITS ${BUILD_ADDITIONAL_TOOLKITS})
 
@@ -485,7 +494,8 @@ endif()
 OCCT_IS_PRODUCT_REQUIRED (CSF_FreeImagePlus CAN_USE_FREEIMAGE)
 OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
 OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
-OCCT_IS_PRODUCT_REQUIRED (CSF_OpenGlLibs CAN_USE_GLES2)
+OCCT_IS_PRODUCT_REQUIRED (CSF_OpenGlLibs CAN_USE_OPENGL)
+OCCT_IS_PRODUCT_REQUIRED (CSF_OpenGlesLibs CAN_USE_GLES2)
 OCCT_IS_PRODUCT_REQUIRED (CSF_TBB CAN_USE_TBB)
 OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)
 
@@ -532,14 +542,6 @@ else()
   endif()
 endif()
 
-# D3D
-if (USE_D3D)
-  add_definitions (-DHAVE_D3D)
-  #if(MSVC_VERSION LESS 1700)
-  #OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/d3d")
-  #endif()
-endif()
-
 # GLX
 if (USE_GLX)
   add_definitions (-DMACOSX_USE_GLX)
@@ -547,7 +549,6 @@ if (USE_GLX)
 endif()
 
 # FREEIMAGE
-
 if (CAN_USE_FREEIMAGE)
   set (USE_FREEIMAGE OFF CACHE BOOL "${USE_FREEIMAGE_DESCR}")
 
@@ -565,6 +566,26 @@ else()
   OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE")
 endif()
 
+# OpenVR
+# search for CSF_OpenVR variable in EXTERNLIB of each being used toolkit
+OCCT_IS_PRODUCT_REQUIRED (CSF_OpenVR CAN_USE_OPENVR)
+if (CAN_USE_OPENVR)
+  set (USE_OPENVR OFF CACHE BOOL "${USE_OPENVR_DESCR}")
+
+  if (USE_OPENVR)
+    add_definitions (-DHAVE_OPENVR)
+    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/openvr")
+  else()
+    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENVR")
+    OCCT_CHECK_AND_UNSET ("INSTALL_OPENVR")
+  endif()
+else()
+  OCCT_CHECK_AND_UNSET ("USE_OPENVR")
+
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENVR")
+  OCCT_CHECK_AND_UNSET ("INSTALL_OPENVR")
+endif()
+
 # FFmpeg
 # search for CSF_FFmpeg variable in EXTERNLIB of each being used toolkit
 OCCT_IS_PRODUCT_REQUIRED (CSF_FFmpeg CAN_USE_FFMPEG)
@@ -586,23 +607,31 @@ else()
   OCCT_CHECK_AND_UNSET ("INSTALL_FFMPEG")
 endif()
 
+# OpenGL
+if (CAN_USE_OPENGL)
+  if (USE_OPENGL)
+    add_definitions (-DHAVE_OPENGL_EXT)
+  else()
+    list (REMOVE_ITEM BUILD_TOOLKITS TKOpenGl)
+    list (REMOVE_ITEM BUILD_TOOLKITS TKOpenGlTest)
+  endif()
+else()
+  OCCT_CHECK_AND_UNSET ("USE_OPENGL")
+endif()
+
 # OpenGL ES 2.0
 if (CAN_USE_GLES2)
-  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
-    set (USE_GLES2 ON)
-  else()
-    set (USE_GLES2 OFF CACHE BOOL "${USE_GLES2_DESCR}")
-  endif()
-
   if (USE_GLES2)
-    add_definitions (-DHAVE_GLES2)
+    add_definitions (-DHAVE_GLES2_EXT)
     OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/egl")
-	OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/gles2")
+    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/gles2")
   else()
     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_EGL")
     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GLES2")
     OCCT_CHECK_AND_UNSET ("INSTALL_EGL")
     OCCT_CHECK_AND_UNSET ("INSTALL_GLES2")
+    list (REMOVE_ITEM BUILD_TOOLKITS TKOpenGles)
+    list (REMOVE_ITEM BUILD_TOOLKITS TKOpenGlesTest)
   endif()
 else()
   OCCT_CHECK_AND_UNSET ("USE_GLES2")
@@ -613,6 +642,17 @@ else()
   OCCT_CHECK_AND_UNSET ("INSTALL_GLES2")
 endif()
 
+# D3D
+if (USE_D3D)
+  add_definitions (-DHAVE_D3D)
+  #if(MSVC_VERSION LESS 1700)
+  #OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/d3d")
+  #endif()
+else()
+  list (REMOVE_ITEM BUILD_TOOLKITS TKD3DHost)
+  list (REMOVE_ITEM BUILD_TOOLKITS TKD3DHostTest)
+endif()
+
 # TBB
 if (NOT DEFINED ANDROID AND CAN_USE_TBB)
   set (USE_TBB OFF CACHE BOOL "${USE_TBB_DESCR}")
@@ -849,9 +889,11 @@ if (INSTALL_SAMPLES)
   OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_DIR_SAMPLES}")
   OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_DIR_SAMPLES}")
   OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_DIR_SAMPLES}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code" "${INSTALL_DIR_SAMPLES}/OCCTOverview")
 
   install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/FuncDemo" RENAME "env.${SCRIPT_EXT}")
   install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/IESample" RENAME "env.${SCRIPT_EXT}")
+  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/OCCTOverview" RENAME "env.${SCRIPT_EXT}")
   install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/Tutorial" RENAME "env.${SCRIPT_EXT}")
 endif()
 
@@ -965,6 +1007,15 @@ if (BUILD_SAMPLES_QT)
     OCCT_INSTALL_FILE_OR_DIR ("samples/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/samples")
     #message("Copy Sample resources: samples/${RESOURCE} into ${INSTALL_DIR_RESOURCE}/samples")
   endforeach()
+
+  ## Copy sources of OCCTOverview for using in the sample
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/DataExchangeSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/OcafSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/GeometrySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/TopologySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/TriangulationSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer2dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer3dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
 endif()
 
 
@@ -1108,6 +1159,9 @@ foreach (OCCT_TOOLKIT ${BUILD_TOOLKITS})
 endforeach()
 list (REMOVE_DUPLICATES OCCT_MODULES_ENABLED)
 list (REMOVE_DUPLICATES OCCT_COMPILE_DEFINITIONS)
+# these macros are defined for specific tookits, not globalwise
+list (REMOVE_ITEM OCCT_COMPILE_DEFINITIONS HAVE_OPENGL)
+list (REMOVE_ITEM OCCT_COMPILE_DEFINITIONS HAVE_GLES2)
 
 # export compile definitions and C/C++ flags for each configuration to OpenCASCADE config files
 foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})

adm/MODULES

@@ -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
+Visualization TKService TKV3d TKOpenGl TKOpenGles 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
-Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
+Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE

adm/SAMPLES

@@ -1 +1 @@
-qt AndroidQt FuncDemo IESample Tutorial
+qt AndroidQt FuncDemo IESample Tutorial OCCTOverview

adm/SAMPLES_RESOURCES

@@ -1,2 +1,3 @@
 qt/Common/res/
 qt/Tutorial/res/
+qt/OCCTOverview/res/

adm/UDLIST

@@ -11,7 +11,6 @@ n Expr
 n ExprIntrp
 n FSD
 n GeomAbs
-n MMgt
 n Message
 n OSD
 n PLib
@@ -208,6 +207,7 @@ n Image
 n Media
 n MeshVS
 n OpenGl
+n OpenGles
 n D3DHost
 n Prs3d
 n PrsMgr
@@ -225,6 +225,7 @@ r Shaders
 r XRResources
 t TKMeshVS
 t TKOpenGl
+t TKOpenGles
 t TKD3DHost
 t TKService
 t TKV3d
@@ -403,6 +404,9 @@ n HLRTest
 n MeshTest
 n SWDRAW
 n TObjDRAW
+n OpenGlTest
+n OpenGlesTest
+n D3DHostTest
 n ViewerTest
 n XDEDRAW
 n XSDRAW
@@ -414,6 +418,9 @@ t TKDCAF
 t TKDraw
 t TKTObjDRAW
 t TKTopTest
+t TKOpenGlTest
+t TKOpenGlesTest
+t TKD3DHostTest
 t TKViewerTest
 t TKXDEDRAW
 t TKXSDRAW

adm/cmake/3rdparty_macro.cmake

@@ -97,12 +97,12 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
     if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
       find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
                                                       PATHS ${3RDPARTY_${PRODUCT_NAME}_DIR}
-                                                      PATH_SUFFIXES include inc
+                                                      PATH_SUFFIXES include inc headers
                                                       CMAKE_FIND_ROOT_PATH_BOTH
                                                       NO_DEFAULT_PATH)
     else()
       find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
-                                                      PATH_SUFFIXES include inc
+                                                      PATH_SUFFIXES include inc headers
                                                       CMAKE_FIND_ROOT_PATH_BOTH)
     endif()
   endif()
@@ -125,10 +125,14 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
         set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
         if (WIN32)
           set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} win${COMPILER_BITNESS}/${COMPILER}/lib)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/win${COMPILER_BITNESS})
         endif()
         if (ANDROID)
           set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
         endif()
+        if(UNIX AND NOT APPLE AND NOT ANDROID)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/linux${COMPILER_BITNESS})
+        endif()
 
         # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
         set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
@@ -184,7 +188,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
           if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
             find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                                               PATH_SUFFIXES bin  win${COMPILER_BITNESS}/${COMPILER}/bin
+                                                                               PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin bin/win${COMPILER_BITNESS}
                                                                                NO_DEFAULT_PATH)
             if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
               # find directory recursive
@@ -238,6 +242,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
       if (INSTALL_${PRODUCT_NAME})
         OCCT_MAKE_OS_WITH_BITNESS()
         OCCT_MAKE_COMPILER_SHORT_NAME()
+        set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
 
         if (WIN32)
           if (SINGLE_GENERATOR)
@@ -280,14 +285,17 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
         endif()
       else()
         # the library directory for using by the executable
-      foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-        string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+        foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+          string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
           if (WIN32)
             set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
           else()
             set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
           endif()
         endforeach()
+        if (WIN32)
+          set (USED_3RDPARTY_${PRODUCT_NAME}_DIR ${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}})
+        endif()
       endif()
 
       mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})

adm/cmake/bison.cmake

@@ -7,7 +7,7 @@ unset (3RDPARTY_BISON_EXECUTABLE CACHE)
 
 # delete BISON_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
 # without reasonable diagnostic
-if (NOT BISON_EXECUTABLE)
+if (NOT BISON_EXECUTABLE OR NOT EXISTS "${BISON_EXECUTABLE}")
   unset (BISON_EXECUTABLE CACHE)
 endif()
 
@@ -22,8 +22,6 @@ if (3RDPARTY_DIR)
   endforeach()
 endif()
  
-find_package (BISON 2.7)
-
-if (NOT BISON_FOUND OR NOT BISON_EXECUTABLE OR NOT EXISTS "${BISON_EXECUTABLE}")
-  list (APPEND 3RDPARTY_NOT_INCLUDED BISON_EXECUTABLE)
-endif()
+# bison 3.2 is required because it provides options to avoid generation of redundant header
+# files and embedding of local paths in the generated code
+find_package (BISON 3.2)

adm/cmake/cotire.cmake

@@ -2402,7 +2402,7 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
 			message (STATUS "add_custom_command: TARGET ${_target} PRE_BUILD ${_cmds}")
 		endif()
 		# because CMake PRE_BUILD command does not support dependencies,
-		# we check dependencies explicity in cotire script mode when the pre-build action is run
+		# we check dependencies explicitly in cotire script mode when the pre-build action is run
 		add_custom_command(
 			TARGET "${_target}"
 			PRE_BUILD ${_cmds}
@@ -3017,7 +3017,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		endif()
 	else()
 		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
-			# depend on the original target's implicity generated <targetname>_automoc target
+			# depend on the original target's implicitly generated <targetname>_automoc target
 			if (CMAKE_VERSION VERSION_LESS "3.8.0")
 				add_dependencies(${_unityTargetName} ${_target}_automoc)
 			else()

adm/cmake/egl.cmake

@@ -1,3 +1,3 @@
 # EGL
 
-THIRDPARTY_PRODUCT("EGL" "EGL/egl.h" "CSF_OpenGlLibs" "")
+THIRDPARTY_PRODUCT("EGL" "EGL/egl.h" "CSF_OpenGlesLibs" "")

adm/cmake/flex.cmake

@@ -7,23 +7,29 @@ unset (3RDPARTY_FLEX_EXECUTABLE CACHE)
 
 # delete FLEX_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
 # without reasonable diagnostic
-if (NOT FLEX_EXECUTABLE)
+if (NOT FLEX_EXECUTABLE OR NOT EXISTS "${FLEX_EXECUTABLE}")
   unset (FLEX_EXECUTABLE CACHE)
 endif()
+if (NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}")
+  unset (FLEX_INCLUDE_DIR CACHE)
+endif()
 
-# Add paths to 3rdparty subfolders containing name "flex" to CMAKE_PROGRAM_PATH variable to make
-# these paths searhed by find_package
+# Add paths to 3rdparty subfolders containing name "flex" to CMAKE_PROGRAM_PATH and 
+# CMAKE_INCLUDE_PATH variables to make these paths searhed by find_package
 if (3RDPARTY_DIR)
   file (GLOB FLEX_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*flex*")
   foreach (candidate_path ${FLEX_PATHS})
     if (IS_DIRECTORY ${candidate_path})
       list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
+      list (APPEND CMAKE_INCLUDE_PATH ${candidate_path})
     endif()
   endforeach()
 endif()
  
-find_package (FLEX 2.5.3)
+# flex 2.5.37 is required because closest known lower version, 2.5.3 from WOK 6.8.0,
+# generates code which is unusable on Windows (includes unistd.h without any way to avoid this)
+find_package (FLEX 2.5.37)
 
-if (NOT FLEX_FOUND OR NOT FLEX_EXECUTABLE OR NOT EXISTS "${FLEX_EXECUTABLE}")
-  list (APPEND 3RDPARTY_NOT_INCLUDED FLEX_EXECUTABLE)
+if (NOT FLEX_FOUND OR NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+  list (APPEND 3RDPARTY_NOT_INCLUDED FLEX_INCLUDE_DIR)
 endif()

adm/cmake/gles2.cmake

@@ -1,3 +1,3 @@
 # OpenGL ES 2.0
 
-THIRDPARTY_PRODUCT("GLES2" "GLES2/gl2.h" "CSF_OpenGlLibs" "")
+THIRDPARTY_PRODUCT("GLES2" "GLES2/gl2.h" "CSF_OpenGlesLibs" "")

adm/cmake/occt_csf.cmake

@@ -42,6 +42,13 @@ else()
   endif()
 endif()
 
+# OpenVR
+if (USE_OPENVR)
+  set (CSF_OpenVR "openvr_api")
+else()
+  set (CSF_OpenVR)
+endif()
+
 # TCL/TK
 if (USE_TCL)
   if (WIN32)
@@ -67,12 +74,8 @@ if (WIN32)
   set (CSF_psapi         "psapi.lib")
   set (CSF_winmm         "winmm.lib")
   set (CSF_d3d9          "D3D9.lib")
-  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
-    set (CSF_OpenGlLibs  "libEGL libGLESv2")
-  else()
-    set (CSF_OpenGlLibs  "opengl32.lib")
-  endif()
-
+  set (CSF_OpenGlLibs    "opengl32.lib")
+  set (CSF_OpenGlesLibs  "libEGL libGLESv2")
 else()
 
   if (APPLE)
@@ -93,9 +96,9 @@ else()
     OCCT_CHECK_AND_UNSET (IOKit_LIB)
 
     if (IOS)
-      find_library (OpenGlLibs_LIB NAMES OpenGLES)
-      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
+      find_library (OpenGlesLibs_LIB NAMES OpenGLES)
+      set (CSF_OpenGlesLibs ${OpenGlesLibs_LIB})
+      OCCT_CHECK_AND_UNSET (OpenGlesLibs_LIB)
     elseif (USE_GLX)
       set (CSF_OpenGlLibs GL)
       set (CSF_XwLibs     "X11 Xext Xmu Xi")
@@ -107,15 +110,12 @@ else()
 
   elseif (ANDROID)
     set (CSF_ThreadLibs  "c")
-    set (CSF_OpenGlLibs  "EGL GLESv2")
+    set (CSF_OpenGlesLibs "EGL GLESv2")
     set (CSF_androidlog  "log")
   elseif (UNIX)
     set (CSF_ThreadLibs  "pthread rt stdc++")
-    if (USE_GLES2)
-      set (CSF_OpenGlLibs  "EGL GLESv2")
-    else()
-      set (CSF_OpenGlLibs  "GL")
-    endif()
+    set (CSF_OpenGlLibs   "GL")
+    set (CSF_OpenGlesLibs "EGL GLESv2")
     set (CSF_XwLibs      "X11 Xext Xmu Xi")
     set (CSF_dl          "dl")
     set (CSF_fontconfig  "fontconfig")

adm/cmake/occt_toolkit.cmake

@@ -91,10 +91,40 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
         string (COMPARE EQUAL ${CURRENT_FLEX_FILE_NAME} ${CURRENT_BISON_FILE_NAME} ARE_FILES_EQUAL)
 
         if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
-          set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
-          set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
-          BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME} -l")
-          FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME} -L")
+
+          # Note: files are generated in original source directory (not in patch!)
+          set (FLEX_BISON_TARGET_DIR "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}")
+
+          # choose appropriate extension for generated files: "cxx" if source file contains
+          # instruction to generate C++ code, "c" otherwise
+          set (BISON_OUTPUT_FILE_EXT "c")
+          set (FLEX_OUTPUT_FILE_EXT "c")
+          file (STRINGS "${CURRENT_BISON_FILE}" FILE_BISON_CONTENT)
+          foreach (FILE_BISON_CONTENT_LINE ${FILE_BISON_CONTENT})
+            string (REGEX MATCH "%language \"C\\+\\+\"" CXX_BISON_LANGUAGE_FOUND ${FILE_BISON_CONTENT_LINE})
+            if (CXX_BISON_LANGUAGE_FOUND)
+              set (BISON_OUTPUT_FILE_EXT "cxx")
+            endif()
+          endforeach()
+          file (STRINGS "${CURRENT_FLEX_FILE}" FILE_FLEX_CONTENT)
+          foreach (FILE_FLEX_CONTENT_LINE ${FILE_FLEX_CONTENT})
+            string (REGEX MATCH "%option c\\+\\+" CXX_FLEX_LANGUAGE_FOUND ${FILE_FLEX_CONTENT_LINE})
+            if (CXX_FLEX_LANGUAGE_FOUND)
+              set (FLEX_OUTPUT_FILE_EXT "cxx")
+
+              # install copy of FlexLexer.h locally to allow further building without flex
+              if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+                configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${FLEX_BISON_TARGET_DIR}/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
+              endif()
+            endif()
+          endforeach()
+          set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
+          set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.${FLEX_OUTPUT_FILE_EXT})
+
+          BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} "${FLEX_BISON_TARGET_DIR}/${BISON_OUTPUT_FILE}"
+                        COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME} -l -M ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/=")
+          FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} "${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE}"
+                        COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME} -L")
           ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
            
           list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
@@ -273,6 +303,13 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
       else() # get CSF_ value
         set (CURRENT_CSF ${${USED_ITEM}})
         if (NOT "x${CURRENT_CSF}" STREQUAL "x")
+          if ("${CURRENT_CSF}" STREQUAL "CSF_OpenGlLibs")
+            add_definitions (-DHAVE_OPENGL)
+          endif()
+          if ("${CURRENT_CSF}" STREQUAL "CSF_OpenGlesLibs")
+            add_definitions (-DHAVE_GLES2)
+          endif()
+
           set (LIBRARY_FROM_CACHE 0)
           separate_arguments (CURRENT_CSF)
           foreach (CSF_LIBRARY ${CURRENT_CSF})

adm/cmake/openvr.cmake

@@ -0,0 +1,5 @@
+# OpenVR SDK
+# OpenVR is an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
+# https://github.com/ValveSoftware/openvr
+
+THIRDPARTY_PRODUCT("OPENVR" "openvr.h" "CSF_OpenVR" "")

adm/cmake/tcl.cmake

@@ -245,7 +245,7 @@ if (BUILD_SHARED_LIBS)
       install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR_LIB}")
       install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR_LIB}")
     else()
-      message (STATUS "\nWarning: tclX.X subdir won't be copyied during the installation process.")
+      message (STATUS "\nWarning: tclX.X subdir won't be copied during the installation process.")
       message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
     endif()
 

adm/cmake/tk.cmake

@@ -250,7 +250,7 @@ if (BUILD_SHARED_LIBS)
       # tk is required to install in lib folder (without)
       install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR_LIB}")
     else()
-      message (STATUS "\nWarning: tkX.X subdir won't be copyied during the installation process.")
+      message (STATUS "\nWarning: tkX.X subdir won't be copied during the installation process.")
       message (STATUS "Try seeking tk within another folder by changing 3RDPARTY_TK_DIR variable.")
     endif()
 

adm/cmake/vardescr.cmake

@@ -89,6 +89,7 @@ INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
 INSTALL_MESSAGE (INSTALL_DOC_Overview     "OCCT overview documentation (HTML format)")
 INSTALL_MESSAGE (INSTALL_FFMPEG           "FFmpeg binaries")
 INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
+INSTALL_MESSAGE (INSTALL_OPENVR           "OpenVR binaries")
 INSTALL_MESSAGE (INSTALL_EIGEN            "EIGEN header files")
 INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
 INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
@@ -162,6 +163,9 @@ set (USE_FREEIMAGE_DESCR
 "Indicates whether Freeimage product should be used in OCCT visualization
 module for support of popular graphics image formats (PNG, BMP etc)")
 
+set (USE_OPENVR_DESCR
+"Indicates whether OpenVR should be used in OCCT visualization module for VR support")
+
 set (USE_RAPIDJSON_DESCR
 "Indicates whether RapidJSON product should be used in OCCT DataExchange
 module for support of JSON-based formats like glTF")
@@ -170,9 +174,10 @@ set (USE_EGL_DESCR
 "Indicates whether EGL should be used in OCCT visualization
 module instead of conventional OpenGL context creation APIs")
 
+set (USE_OPENGL_DESCR
+"Indicates whether OpenGL desktop should be used in OCCT visualization module")
 set (USE_GLES2_DESCR
-"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization
-module instead of desktop OpenGL")
+"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module")
 
 set (USE_TBB_DESCR
 "Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,

adm/genproj.tcl

@@ -759,7 +759,7 @@ proc osutils:tk:sort { tklm theSrcDir theSourceDirOther } {
   return $lret
 }
 
-#  close dependencies of ltk. (full wok pathes of toolkits)
+#  close dependencies of ltk. (full work paths of toolkits)
 # The CURRENT WOK LOCATION MUST contains ALL TOOLKITS required.
 # (locate not performed.)
 proc osutils:tk:close { ltk theSrcDir theSourceDirOther } {
@@ -906,7 +906,7 @@ proc osutils:collectinc {theModules theSrcDir theIncPath} {
     # relative anIncPath in connection with aCasRoot/$theSrcDir
     set aFromBuildIncToSrcPath [relativePath "$anIncPath" "$aCasRoot/$theSrcDir"]
 
-    # create and copy short-cut header files
+    # create and copy shortcut header files
     foreach anUnit $anUnits {
       osutils:checksrcfiles ${anUnit} $theSrcDir
 
@@ -1461,9 +1461,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} {
     set aLibsMap(CSF_netapi32)     "netapi32"
     set aLibsMap(CSF_winmm)        "winmm"
     set aLibsMap(CSF_OpenGlLibs)   "opengl32"
-    if { "$::HAVE_GLES2" == "true" } {
-      set aLibsMap(CSF_OpenGlLibs) "libEGL libGLESv2"
-    }
+    set aLibsMap(CSF_OpenGlesLibs) "libEGL libGLESv2"
     set aLibsMap(CSF_psapi)        "Psapi"
     set aLibsMap(CSF_d3d9)         "d3d9"
 
@@ -1484,14 +1482,18 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} {
     }
   } else {
     set aLibsMap(CSF_dl)           "dl"
+    set aLibsMap(CSF_OpenGlLibs)   "GL"
+    set aLibsMap(CSF_OpenGlesLibs) "EGL GLESv2"
     if { "$theOS" == "mac" || "$theOS" == "ios" } {
-      set aLibsMap(CSF_objc)       "objc"
+      set aLibsMap(CSF_objc)         "objc"
+      set aLibsMap(CSF_OpenGlLibs)   ""
+      set aLibsMap(CSF_OpenGlesLibs) ""
+      set aFrmsMap(CSF_OpenGlLibs)   "OpenGL"
+      set aFrmsMap(CSF_OpenGlesLibs) "OpenGLES"
       if { "$theOS" == "ios" } {
-        set aFrmsMap(CSF_Appkit)     "UIKit"
-        set aFrmsMap(CSF_OpenGlLibs) "OpenGLES"
+        set aFrmsMap(CSF_Appkit)   "UIKit"
       } else {
-        set aFrmsMap(CSF_Appkit)     "AppKit"
-        set aFrmsMap(CSF_OpenGlLibs) "OpenGL"
+        set aFrmsMap(CSF_Appkit)   "AppKit"
       }
       set aFrmsMap(CSF_IOKit)      "IOKit"
       set aFrmsMap(CSF_TclLibs)    "Tcl"
@@ -1500,24 +1502,17 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} {
       set aLibsMap(CSF_TclTkLibs)  ""
       set aLibsMap(CSF_QT)         "QtCore QtGui"
     } elseif { "$theOS" == "android" } {
-      set aLibsMap(CSF_OpenGlLibs) "EGL GLESv2"
       set aLibsMap(CSF_androidlog) "log"
     } else {
       set aLibsMap(CSF_fontconfig) "fontconfig"
       if { "$theOS" == "qnx" } {
         # CSF_ThreadLibs - pthread API is part of libc on QNX
-        set aLibsMap(CSF_OpenGlLibs) "EGL GLESv2"
       } else {
         set aLibsMap(CSF_ThreadLibs) "pthread rt"
-        set aLibsMap(CSF_OpenGlLibs) "GL"
         set aLibsMap(CSF_TclTkLibs)  "X11 tk8.6"
         set aLibsMap(CSF_XwLibs)     "X11 Xext Xmu Xi"
         set aLibsMap(CSF_MotifLibs)  "X11"
       }
-
-      if { "$::HAVE_GLES2" == "true" } {
-        set aLibsMap(CSF_OpenGlLibs) "EGL GLESv2"
-      }
     }
   }
 }
@@ -1671,7 +1666,7 @@ proc wokUtils:EASY:bs1 { s } {
     return $r
 }
 
-# Returs for a full path the liste of n last directory part
+# Returns for a full path the liste of n last directory part
 # n = 1 => tail
 # n = 2 => dir/file.c
 # n = 3 => sdir/dir/file.c
@@ -1785,9 +1780,14 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir
   global path
 
   set aHasQtDep "false"
+  set aTkDefines ""
   foreach aCsfElem [osutils:tk:csfInExternlib "$path/$theSrcDir/${theToolKit}/EXTERNLIB"] {
     if { "$aCsfElem" == "CSF_QT" } {
       set aHasQtDep "true"
+    } elseif { "$aCsfElem" == "CSF_OpenGlLibs" } {
+      set aTkDefines "$aTkDefines;HAVE_OPENGL"
+    } elseif { "$aCsfElem" == "CSF_OpenGlesLibs" } {
+      set aTkDefines "$aTkDefines;HAVE_GLES2"
     }
   }
   set theProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 0]
@@ -1822,9 +1822,9 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir
   # depending on VC version
   regsub -all -- {__TKDEP__} $theProjTmpl [osutils:depLibraries $aUsedLibs $anOsReleaseLibs $theVcVer] theProjTmpl
   regsub -all -- {__TKDEP_DEBUG__} $theProjTmpl [osutils:depLibraries $aUsedLibs $anOsDebugLibs $theVcVer] theProjTmpl
+  regsub -all -- {__TKDEFINES__} $theProjTmpl $aTkDefines theProjTmpl
 
   set anIncPaths "..\\..\\..\\inc"
-#  set aTKDefines ""
   set aFilesSection ""
   set aVcFilesCxx(units) ""
   set aVcFilesHxx(units) ""
@@ -1885,7 +1885,7 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir
           set written([file tail $aSrcFile]) 1
           append aFilesSection [osutils:vcxproj:cxxfile $aSrcFile $needparam 3]
         } else {
-          puts "Warning : in vcproj more than one occurences for [file tail $aSrcFile]"
+          puts "Warning : in vcproj more than one occurrences for [file tail $aSrcFile]"
         }
         if { ! [info exists aVcFilesCxx($xlo)] } { lappend aVcFilesCxx(units) $xlo }
         lappend aVcFilesCxx($xlo) $aSrcFile
@@ -1895,7 +1895,7 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir
           set written([file tail $aHxxFile]) 1
           append aFilesSection [osutils:vcxproj:hxxfile $aHxxFile]
         } else {
-          puts "Warning : in vcproj more than one occurences for [file tail $aHxxFile]"
+          puts "Warning : in vcproj more than one occurrences for [file tail $aHxxFile]"
         }
         if { ! [info exists aVcFilesHxx($xlo)] } { lappend aVcFilesHxx(units) $xlo }
         lappend aVcFilesHxx($xlo) $aHxxFile
@@ -1905,7 +1905,7 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir
           set written([file tail $aGenFile]) 1
           append aFilesSection [osutils:vcxproj:cxxfile $aGenFile $needparam 5]
         } else {
-          puts "Warning : in vcproj more than one occurences for [file tail $aGenFile]"
+          puts "Warning : in vcproj more than one occurrences for [file tail $aGenFile]"
         }
         if { ! [info exists aVcFilesCxx($xlo)] } { lappend aVcFilesCxx(units) $xlo }
         lappend aVcFilesCxx($xlo) $aGenFile
@@ -1919,7 +1919,7 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir
           set written([file tail $aSrcFile]) 1
           append aFilesSection [osutils:vcproj:file $theVcVer $aSrcFile $needparam]
         } else {
-          puts "Warning : in vcproj more than one occurences for [file tail $aSrcFile]"
+          puts "Warning : in vcproj more than one occurrences for [file tail $aSrcFile]"
         }
       }
       append aFilesSection "\t\t\t</Filter>\n"
@@ -2108,6 +2108,7 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir
     set aVCRTVer [string range $theVcVer 0 3]
     regsub -all -- {__TKDEP__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsReleaseLibs $theVcVer] aProjTmpl
     regsub -all -- {__TKDEP_DEBUG__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsDebugLibs $theVcVer] aProjTmpl
+    regsub -all -- {__TKDEFINES__} $aProjTmpl "" aProjTmpl
 
     set aFilesSection ""
     set aVcFilesCxx(units) ""
@@ -2128,7 +2129,7 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir
         append aFilesSection "\t\t\t</Filter>"
       }
     } else {
-      puts "Warning : in vcproj there are more than one occurences for [file tail $f]"
+      puts "Warning : in vcproj there are more than one occurrences for [file tail $f]"
     }
     #puts "$aProjTmpl $aFilesSection"
     set anIncPaths "..\\..\\..\\inc"
@@ -2326,7 +2327,7 @@ proc osutils:cbptk { theCmpl theOutDir theToolKit thePlatform} {
         set written([file tail $aSrcFile]) 1
         lappend aTKSrcFiles "../../../[wokUtils:FILES:wtail $aSrcFile 3]"
       } else {
-        puts "Warning : more than one occurences for [file tail $aSrcFile]"
+        puts "Warning : more than one occurrences for [file tail $aSrcFile]"
       }
     }
 
@@ -2446,7 +2447,7 @@ proc osutils:cbpx { theCmpl theOutDir theToolKit thePlatform } {
       set written([file tail $aSrcFile]) 1
       lappend aTKSrcFiles "../../../[wokUtils:FILES:wtail $aSrcFile 3]"
     } else {
-      puts "Warning : in cbp there are more than one occurences for [file tail $aSrcFile]"
+      puts "Warning : in cbp there are more than one occurrences for [file tail $aSrcFile]"
     }
 
     # macros for correct DLL exports
@@ -2946,7 +2947,7 @@ proc osutils:xcdtk:sources {theToolKit theTargetType theSrcFileRefSection theGro
         append aSrcFileGuids      "\t\t\t\t$aGuidsMap($aSrcFile) ,\n"
         append aSrcFileRefGuids   "\t\t\t\t$aGuidsMap($aSrcFileRef) ,\n"
       } else {
-        puts "Warning : more than one occurences for [file tail $aSrcFile]"
+        puts "Warning : more than one occurrences for [file tail $aSrcFile]"
       }
     }
 
@@ -3008,26 +3009,26 @@ proc osutils:xcdtk { theOutDir theToolKit theGuidsMap theIsStatic thePlatform {t
   set aUserDataDir "${aToolkitDir}/xcuserdata"
   wokUtils:FILES:mkdir $aUserDataDir
   if { ! [file exists $aUserDataDir] } {
-    puts stderr "Error: Could not create xcuserdata directorty in \"$aToolkitDir\""
+    puts stderr "Error: Could not create xcuserdata directory in \"$aToolkitDir\""
     return
   }
 
   set aUserDataDir "${aUserDataDir}/${aUsername}.xcuserdatad"
   wokUtils:FILES:mkdir $aUserDataDir
   if { ! [file exists $aUserDataDir] } {
-    puts stderr "Error: Could not create ${aUsername}.xcuserdatad directorty in \"$aToolkitDir\"/xcuserdata"
+    puts stderr "Error: Could not create ${aUsername}.xcuserdatad directory in \"$aToolkitDir\"/xcuserdata"
     return
   }
 
   set aSchemesDir "${aUserDataDir}/xcschemes"
   wokUtils:FILES:mkdir $aSchemesDir
   if { ! [file exists $aSchemesDir] } {
-    puts stderr "Error: Could not create xcschemes directorty in \"$aUserDataDir\""
+    puts stderr "Error: Could not create xcschemes directory in \"$aUserDataDir\""
     return
   }
   # End of folders creation.
 
-  # Generating GUID for tookit.
+  # Generating GUID for toolkit.
   upvar $theGuidsMap aGuidsMap
   if { ! [info exists aGuidsMap($theToolKit)] } {
     set aGuidsMap($theToolKit) [OS:genGUID "xcd"]
@@ -3460,26 +3461,26 @@ proc osutils:xcdx { theOutDir theExecutable theGuidsMap } {
   set aUserDataDir "${anExecutableDir}/xcuserdata"
   wokUtils:FILES:mkdir $aUserDataDir
   if { ! [file exists $aUserDataDir] } {
-    puts stderr "Error: Could not create xcuserdata directorty in \"$anExecutableDir\""
+    puts stderr "Error: Could not create xcuserdata directory in \"$anExecutableDir\""
     return
   }
 
   set aUserDataDir "${aUserDataDir}/${aUsername}.xcuserdatad"
   wokUtils:FILES:mkdir $aUserDataDir
   if { ! [file exists $aUserDataDir] } {
-    puts stderr "Error: Could not create ${aUsername}.xcuserdatad directorty in \"$anExecutableDir\"/xcuserdata"
+    puts stderr "Error: Could not create ${aUsername}.xcuserdatad directory in \"$anExecutableDir\"/xcuserdata"
     return
   }
 
   set aSchemesDir "${aUserDataDir}/xcschemes"
   wokUtils:FILES:mkdir $aSchemesDir
   if { ! [file exists $aSchemesDir] } {
-    puts stderr "Error: Could not create xcschemes directorty in \"$aUserDataDir\""
+    puts stderr "Error: Could not create xcschemes directory in \"$aUserDataDir\""
     return
   }
   # End folders creation.
 
-  # Generating GUID for tookit.
+  # Generating GUID for toolkit.
   upvar $theGuidsMap aGuidsMap
   if { ! [info exists aGuidsMap($theExecutable)] } {
     set aGuidsMap($theExecutable) [OS:genGUID "xcd"]

adm/occaux.tcl

@@ -16,7 +16,7 @@
 # commercial license or contractual agreement.
  
 # =======================================================================
-# This script contains auxilary functions which can be used 
+# This script contains auxiliary functions which can be used
 # in documentation generation process
 # =======================================================================
 
@@ -179,8 +179,10 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
   }
   if {"$is_win" == "yes"} {
     set exe ".exe"
+    set com ".com"
   } else {
     set exe ""
+    set com ""
   }
 
   set g_flag "no"
@@ -224,11 +226,11 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
       }
     }
     if {$i_flag == "no"} {
-      if { [file exists $path/inkscape$exe] } {
+      if { [file exists $path/inkscape$com] } {
         catch { exec $path/inkscape -V } version
         puts "Info: $version " 
         puts "      found in $path."
-        set inkscape_path "$path/inkscape$exe"
+        set inkscape_path "$path/inkscape$com"
         set i_flag "yes"
       }
     }
@@ -356,15 +358,29 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
 # Convert SVG files to PDF format to allow including them to PDF
 # (requires InkScape to be in PATH)
 proc OCCDoc_ProcessSvg {latexDir verboseMode} {
+  set anSvgList [glob -nocomplain $latexDir/*.svg]
+  if { $anSvgList == {} } {
+    return
+  }
 
-  foreach file [glob -nocomplain $latexDir/*.svg] {
+  catch { exec inkscape -V } anInkVer
+  set isOldSyntax 0
+  if {[string match "Inkscape 0.*" $anInkVer]} { set isOldSyntax 1 }
+  foreach file $anSvgList {
     if {$verboseMode == "YES"} {
       puts "Info: Converting file $file..."
     }
     set pdffile "[file rootname $file].pdf"
-    if { [catch {exec inkscape -z -D --file=$file --export-pdf=$pdffile} res] } {
-      #puts "Error: $res."
-      return
+    if { $isOldSyntax == 1 } {
+      if { [catch {exec inkscape -z -D --file=$file --export-pdf=$pdffile} res] } {
+        #puts "Error: $res."
+        return
+      }
+    } else {
+      if { [catch {exec inkscape $file --export-area-drawing --export-type=pdf --export-filename=$pdffile} res] } {
+        #puts "Error: $res."
+        return
+      }
     }
   }
 }
@@ -619,7 +635,7 @@ proc OCCDoc_MakeMainPage {outDir outFile modules {theProductsDir ""} } {
     foreach mod $modules {
         puts $fd "\\li \\subpage [string tolower $module_prefix$mod]"
     }
-    # insert modules relationship diagramm
+    # insert modules relationship diagram
     puts $fd "\\dotfile [OCCDoc_CreateModulesDependencyGraph $outDir/html schema_all_modules $modules $module_prefix]"
     puts $fd "**/\n"
   }

adm/qmake/OccCppConfig.pri

@@ -153,5 +153,4 @@ win32 {
   }
 }
 
-#OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}
-OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}
+OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}

adm/qmake/OccModule.pri

@@ -15,8 +15,14 @@ for (aModuleIter, aModuleList) {
       equals (aToolKit, $$OCC_MODULE_NAME)      { toSkipToolkit = 1 }
       !HAVE_VTK:equals (aToolKit, "TKIVtk")     { toSkipToolkit = 1 }
       !HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
+      #!HAVE_OPENGL: equals (aToolKit, "TKOpenGl")       { toSkipToolkit = 1 }
+      #!HAVE_OPENGL: equals (aToolKit, "TKOpenGlTest")   { toSkipToolkit = 1 }
+      !HAVE_GLES2:   equals (aToolKit, "TKOpenGles")     { toSkipToolkit = 1 }
+      !HAVE_GLES2:   equals (aToolKit, "TKOpenGlesTest") { toSkipToolkit = 1 }
       !win32:   equals (aToolKit, "TKD3DHost")  { toSkipToolkit = 1 }
+      !win32:   equals (aToolKit, "TKD3DHostTest") { toSkipToolkit = 1 }
       equals (toSkipToolkit, 0) {
+
         #warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
         eval(occtkgen_$${aToolKit}.input  = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
         eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)

adm/qmake/OccToolkit.pri

@@ -36,7 +36,7 @@ win32 {
   CSF_wsock32    = -lwsock32
   CSF_netapi32   = -lnetapi32
   CSF_OpenGlLibs = -lopengl32
-  HAVE_GLES2 { CSF_OpenGlLibs = -llibEGL -llibGLESv2 }
+  CSF_OpenGlesLibs = -llibEGL -llibGLESv2
   CSF_psapi      = -lPsapi
   CSF_winmm      = -lwinmm
   CSF_d3d9       = -ld3d9
@@ -46,12 +46,12 @@ win32 {
 } else:mac {
   CSF_dl         = -ldl
   CSF_objc       = -lobjc
+  CSF_OpenGlLibs = -framework OpenGL
+  CSF_OpenGlesLibs = -framework OpenGLES
   iphoneos {
     CSF_Appkit     = -framework UIKit
-    CSF_OpenGlLibs = -framework OpenGLES
   } else {
     CSF_Appkit     = -framework AppKit
-    CSF_OpenGlLibs = -framework OpenGL
   }
   CSF_IOKit      = -framework IOKit
   CSF_TclLibs    = -framework Tcl
@@ -60,25 +60,27 @@ win32 {
   CSF_dl = -ldl
   CSF_ThreadLibs = -lpthread -lrt
   CSF_OpenGlLibs = -lGL
+  CSF_OpenGlesLibs = -lEGL -lGLESv2
   CSF_TclTkLibs  = -lX11 -ltk8.6
   CSF_XwLibs     = -lX11 -lXext -lXmu -lXi
   CSF_MotifLibs  = -lX11
   CSF_fontconfig = -lfontconfig
-  HAVE_GLES2 { CSF_OpenGlLibs = -lEGL -lGLESv2 }
 }
 
 for (aCfgIter, CONFIG) {
   aRes = $$find(aCfgIter, "^HAVE_")
-  count(aRes, 1) {
-    DEFINES += $$aCfgIter
+  !equals(aCfgIter, "HAVE_GLES2") {
+    count(aRes, 1) {
+      DEFINES += $$aCfgIter
+    }
   }
 }
 
 # Define the list of standard OCCT file extensions
 aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
 aPxxRegex = ^.*\.(pxx)$
-aCxxRegex = ^.*\.(cxx|c)$
-mac { aCxxRegex = ^.*\.(cxx|c|m|mm)$ }
+aCxxRegex = ^.*\.(cxx|cpp|c)$
+mac { aCxxRegex = ^.*\.(cxx|cpp|c|m|mm)$ }
 
 # Auxiliary function for probing file extension
 defineTest (occCheckExtension) {
@@ -103,6 +105,12 @@ for (anExternLib, anExternLibs) {
   count(hasCsf, 1) {
     aList = $$split($$anExternLib, "\n")
     LIBS += $$aList
+    equals(anExternLib, "CSF_OpenGlLibs") {
+      DEFINES += "HAVE_OPENGL"
+    }
+    equals(anExternLib, "CSF_OpenGlesLibs") {
+      DEFINES += "HAVE_GLES2"
+    }
   } else {
     LIBS += -l$$anExternLib
   }

adm/scripts/android_build.bat

@@ -34,7 +34,7 @@ set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
 
 rem Optional 3rd-party libraries to enable
-set USE_RAPIDJSON=OFF
+set "USE_RAPIDJSON=OFF"
 
 rem Archive tool
 set "THE_7Z_PARAMS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on"
@@ -54,6 +54,11 @@ if not exist "%anNdkPath%/sources/cxx-stl/gnu-libstdc++" (
 set "aLibType=Shared"
 if ["%isStatic%"] == ["1"] set "aLibType=Static"
 set "aDestDir=%aBuildRoot%\android-%aCompiler%"
+if ["%toCMake%"] == ["1"] (
+  if ["%toClean%"] == ["1"] (
+    rmdir /S /Q %aDestDir%"
+  )
+)
 
 set "anOcctVerSuffix="
 set "anOcctVersion=0.0.0"
@@ -64,6 +69,13 @@ for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
 
 for %%s in (%anNdkAbiList%) do (
   call :cmakeGenerate "%anNdkApiLevel%" "%%s"
+  if errorlevel 1 (
+    if not ["%1"] == ["-nopause"] (
+      pause
+    )
+    exit /B 1
+    goto :eof
+  )
 )
 
 for /F "skip=1 delims=" %%F in ('
@@ -99,9 +111,19 @@ goto :eof
 :cmakeGenerate
 set "anApi=%~1"
 set "anAbi=%~2"
+if ["%anApi%"] == [""] (
+  set "anApi=21"
+  if ["%anAbi%"] == ["armeabi-v7a"] ( set "anApi=16" )
+  if ["%anAbi%"] == ["x86"]         ( set "anApi=16" )
+)
 set "aPlatformAndCompiler=android-%anAbi%-%aCompiler%"
 set "aWorkDir=%aBuildRoot%\%aPlatformAndCompiler%-make"
 set "aLogFile=%aBuildRoot%\build-%aPlatformAndCompiler%.log"
+if ["%toCMake%"] == ["1"] (
+  if ["%toClean%"] == ["1"] (
+    rmdir /S /Q %aWorkDir%"
+  )
+)
 if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" )
 if     exist "%aLogFile%" ( del   "%aLogFile%" )
 
@@ -112,7 +134,7 @@ git log -n 100 >> "%aWorkDir%\VERSION.html"
 echo ^</pre^>>> "%aWorkDir%\VERSION.html"
 
 echo Start building OCCT for %aPlatformAndCompiler%
-echo Start building OCCT for %aPlatformAndCompiler%>> %aLogFile%
+echo Start building OCCT for %aPlatformAndCompiler%, API level %anApi%>> %aLogFile%
 
 pushd "%aWorkDir%"
 
@@ -156,7 +178,7 @@ if ["%toCMake%"] == ["1"] (
     goto :eof
   )
 )
-set aTimeGEN=%TIME%
+set "aTimeGEN=%TIME%"
 call :computeDuration %aTimeZERO% %aTimeGEN%
 if ["%toCMake%"] == ["1"] (
   echo Generation time: %DURATION%
@@ -178,7 +200,7 @@ if ["%toMake%"] == ["1"] (
   )
   type "%aLogFile%"
 )
-set aTimeBUILD=%TIME%
+set "aTimeBUILD=%TIME%"
 call :computeDuration %aTimeGEN% %aTimeBUILD%
 if ["%toMake%"] == ["1"] (
   echo Building time: %DURATION%

adm/scripts/ios_build.sh

@@ -0,0 +1,193 @@
+#!/bin/bash
+
+# Auxiliary script for semi-automated building of OCCT for iOS platform.
+# macos_custom.sh should be configured with paths to CMake and other 3rd-parties.
+# FreeType should be specified as mandatory dependency.
+
+aScriptDir=${BASH_SOURCE%/*}
+if [ -d "$aScriptDir" ]; then cd "$aScriptDir"; fi
+aScriptDir="$PWD"
+
+aCasSrc=${aScriptDir}/../..
+aNbJobs="$(getconf _NPROCESSORS_ONLN)"
+
+export aBuildRoot=work
+
+# paths to pre-built 3rd-parties
+export aFreeType=
+export aFreeImage=
+export aRapidJson=
+
+# build stages to perform
+export toSimulator=0
+export isStatic=1
+export toCMake=1
+export toClean=1
+export toMake=1
+export toInstall=1
+export toPack=0
+export toDebug=0
+
+export BUILD_ModelingData=ON
+export BUILD_ModelingAlgorithms=ON
+export BUILD_Visualization=ON
+export BUILD_ApplicationFramework=ON
+export BUILD_DataExchange=ON
+
+export USE_FREEIMAGE=OFF
+export USE_RAPIDJSON=OFF
+
+export IPHONEOS_DEPLOYMENT_TARGET=8.0
+export anAbi=arm64
+#export anAbi=x86_64
+
+if [[ -f "${aScriptDir}/ios_custom.sh" ]]; then
+  source "${aScriptDir}/ios_custom.sh"
+fi
+
+aBuildType="Release"
+aBuildTypePrefix=
+if [[ $toDebug == 1 ]]; then
+  aBuildType="Debug"
+  aBuildTypePrefix="-debug"
+fi
+aLibType="Shared"
+if [[ $isStatic == 1 ]]; then
+  aLibType="Static"
+fi
+aPlatformAndCompiler=ios-${anAbi}${aBuildTypePrefix}-clang
+aPlatformSdk="iphoneos"
+aSysRoot="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
+if [[ $toSimulator == 1 ]]; then
+  #anAbi=x86_64
+  aPlatformAndCompiler=ios-simulator64-${anAbi}${aBuildTypePrefix}-clang
+  aPlatformSdk="iphonesimulator"
+  aSysRoot="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
+fi
+
+aWorkDir="${aCasSrc}/${aBuildRoot}/${aPlatformAndCompiler}-make"
+aDestDir="${aCasSrc}/${aBuildRoot}/${aPlatformAndCompiler}"
+aLogFile="${aCasSrc}/${aBuildRoot}/build-${aPlatformAndCompiler}.log"
+
+if [[ $toCMake == 1 ]] && [[ $toClean == 1 ]]; then
+  rm -r -f "$aWorkDir"
+  rm -r -f "$aDestDir"
+fi
+mkdir -p "$aWorkDir"
+mkdir -p "$aDestDir"
+rm -f "$aLogFile"
+
+anOcctVerSuffix=`grep -e "#define OCC_VERSION_DEVELOPMENT" "$aCasSrc/src/Standard/Standard_Version.hxx" | awk '{print $3}' | xargs`
+anOcctVersion=`grep -e "#define OCC_VERSION_COMPLETE" "$aCasSrc/src/Standard/Standard_Version.hxx" | awk '{print $3}' | xargs`
+aGitBranch=`git symbolic-ref --short HEAD`
+
+# include some information about OCCT into archive
+echo \<pre\>> "${aWorkDir}/VERSION.html"
+git status >> "${aWorkDir}/VERSION.html"
+git log -n 100 >> "${aWorkDir}/VERSION.html"
+echo \</pre\>>> "${aWorkDir}/VERSION.html"
+
+pushd "$aWorkDir"
+
+aTimeZERO=$SECONDS
+set -o pipefail
+
+function logDuration {
+  if [[ $1 == 1 ]]; then
+    aDur=$(($4 - $3))
+    echo $2 time: $aDur sec>> "$aLogFile"
+  fi
+}
+
+# (re)generate Make files
+if [[ $toCMake == 1 ]]; then
+  echo Configuring OCCT for iOS...
+  cmake -G "Unix Makefiles" \
+  -D CMAKE_SYSTEM_NAME="iOS" \
+  -D CMAKE_OSX_ARCHITECTURES:STRING="$anAbi" \
+  -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="$IPHONEOS_DEPLOYMENT_TARGET" \
+  -D CMAKE_OSX_SYSROOT:PATH="$aSysRoot" \
+  -D ENABLE_VISIBILITY:BOOL="TRUE" \
+  -D CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS:BOOL="OFF" \
+  -D CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS:BOOL="OFF" \
+  -D CMAKE_BUILD_TYPE:STRING="$aBuildType" \
+  -D BUILD_LIBRARY_TYPE:STRING="$aLibType" \
+  -D INSTALL_DIR:PATH="$aDestDir" \
+  -D INSTALL_DIR_INCLUDE:STRING="inc" \
+  -D INSTALL_DIR_LIB:STRING="lib" \
+  -D INSTALL_DIR_RESOURCE:STRING="src" \
+  -D INSTALL_NAME_DIR:STRING="@executable_path/../Frameworks" \
+  -D 3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \
+  -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \
+  -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \
+  -D 3RDPARTY_FREETYPE_LIBRARY_DIR:PATH="$aFreeType/lib" \
+  -D USE_RAPIDJSON:BOOL="ON" \
+  -D 3RDPARTY_RAPIDJSON_DIR:PATH="$aRapidJson" \
+  -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="$aRapidJson/include" \
+  -D USE_FREEIMAGE:BOOL="$USE_FREEIMAGE" \
+  -D 3RDPARTY_FREEIMAGE_DIR:PATH="$aFreeImage" \
+  -D 3RDPARTY_FREEIMAGE_INCLUDE_DIR:FILEPATH="$aFreeImage/include" \
+  -D 3RDPARTY_FREEIMAGE_LIBRARY_DIR:PATH="$aFreeImage/lib" \
+  -D 3RDPARTY_FREEIMAGE_LIBRARY:FILEPATH="$aFreeImage/lib/libfreeimage.a" \
+  -D BUILD_MODULE_FoundationClasses:BOOL="ON" \
+  -D BUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \
+  -D BUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \
+  -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
+  -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
+  -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
+  -D BUILD_MODULE_Draw:BOOL="OFF" \
+  -D BUILD_DOC_Overview:BOOL="OFF" \
+  "$aCasSrc" 2>&1 | tee -a "$aLogFile"
+  aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+fi
+aTimeGEN=$SECONDS
+logDuration $toCMake "Generation" $aTimeZERO $aTimeGEN
+
+# clean up from previous build
+if [[ $toClean == 1 ]]; then
+  make clean
+fi
+
+# build the project
+if [[ $toMake == 1 ]]; then
+  echo Building...
+  make -j $aNbJobs 2>&1 | tee -a "$aLogFile"
+  aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+fi
+aTimeBUILD=$SECONDS
+logDuration $toMake "Building"       $aTimeGEN  $aTimeBUILD
+logDuration $toMake "Total building" $aTimeZERO $aTimeBUILD
+
+# install the project
+if [[ $toInstall == 1 ]]; then
+  echo Installing OCCT into $aDestDir...
+  make install 2>&1 | tee -a "$aLogFile"
+  cp -f "$aWorkDir/VERSION.html" "$aDestDir/VERSION.html"
+fi
+aTimeINSTALL=$SECONDS
+logDuration $toInstall "Install" $aTimeBUILD $aTimeINSTALL
+
+# create an archive
+if [[ $toPack == 1 ]]; then
+  YEAR=$(date +"%Y")
+  MONTH=$(date +"%m")
+  DAY=$(date +"%d")
+  aRevision=-${YEAR}-${MONTH}-${DAY}
+  #aRevision=-${aGitBranch}
+
+  anArchName=occt-${anOcctVersion}${anOcctVerSuffix}${aRevision}-${aPlatformAndCompiler}.tar.bz2
+  echo Creating an archive ${aCasSrc}/${aBuildRoot}/${anArchName}...
+  rm ${aDestDir}/../${anArchName} &>/dev/null
+  pushd "$aDestDir"
+  tar -jcf ${aDestDir}/../${anArchName} *
+  popd
+fi
+aTimePACK=$SECONDS
+logDuration $toPack "Packing archive" $aTimeINSTALL $aTimePACK
+
+# finished
+DURATION=$(($aTimePACK - $aTimeZERO))
+echo Total time: $DURATION sec
+logDuration 1 "Total" $aTimeZERO $aTimePACK
+
+popd

adm/scripts/ios_custom.sh.template

@@ -0,0 +1,28 @@
+# environment configuration template for macos_build.sh (to be renamed as macos_custom_env.sh)
+export PATH=/Applications/CMake.app/Contents/bin:$PATH
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-ios"
+export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-ios"
+export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
+
+# Uncomment to customize building steps
+#export toSimulator=0
+#export isStatic=0
+#export toCMake=1
+#export toClean=1
+#export toMake=1
+#export toInstall=1
+#export toPack=0
+#export toDebug=0
+
+#export BUILD_ModelingData=ON
+#export BUILD_ModelingAlgorithms=ON
+#export BUILD_Visualization=ON
+#export BUILD_ApplicationFramework=ON
+#export BUILD_DataExchange=ON
+
+#export USE_RAPIDJSON=ON
+#export USE_FREEIMAGE=ON
+
+#export IPHONEOS_DEPLOYMENT_TARGET=8.0
+#export anAbi=arm64
+#export anAbi=x86_64

adm/scripts/macos_build.sh

@@ -0,0 +1,175 @@
+#!/bin/bash
+
+# Auxiliary script for semi-automated building of OCCT for macOS platform.
+# macos_custom.sh should be configured with paths to CMake and other 3rd-parties.
+# FreeType should be specified as mandatory dependency.
+
+aScriptDir=${BASH_SOURCE%/*}
+if [ -d "$aScriptDir" ]; then cd "$aScriptDir"; fi
+aScriptDir="$PWD"
+
+aCasSrc=${aScriptDir}/../..
+aNbJobs="$(getconf _NPROCESSORS_ONLN)"
+
+export aBuildRoot=work
+
+# paths to pre-built 3rd-parties
+export aFreeType=
+export aFreeImage=
+export aRapidJson=
+
+# build stages to perform
+export toCMake=1
+export toClean=1
+export toMake=1
+export toInstall=1
+export toPack=0
+export toDebug=0
+
+export BUILD_ModelingData=ON
+export BUILD_ModelingAlgorithms=ON
+export BUILD_Visualization=ON
+export BUILD_ApplicationFramework=ON
+export BUILD_DataExchange=ON
+export BUILD_Draw=ON
+
+export USE_FREEIMAGE=ON
+export USE_RAPIDJSON=OFF
+
+export MACOSX_DEPLOYMENT_TARGET=10.10
+#export anAbi=arm64
+export anAbi=x86_64
+
+if [[ -f "${aScriptDir}/macos_custom.sh" ]]; then
+  source "${aScriptDir}/macos_custom.sh"
+fi
+
+aBuildType="Release"
+aBuildTypePrefix=
+if [[ $toDebug == 1 ]]; then
+  aBuildType="Debug"
+  aBuildTypePrefix="-debug"
+fi
+aPlatformAndCompiler=mac-${anAbi}${aBuildTypePrefix}-clang
+
+aWorkDir="${aCasSrc}/${aBuildRoot}/${aPlatformAndCompiler}-make"
+aDestDir="${aCasSrc}/${aBuildRoot}/${aPlatformAndCompiler}"
+aLogFile="${aCasSrc}/${aBuildRoot}/build-${aPlatformAndCompiler}.log"
+
+if [[ $toCMake == 1 ]] && [[ $toClean == 1 ]]; then
+  rm -r -f "$aWorkDir"
+  rm -r -f "$aDestDir"
+fi
+mkdir -p "$aWorkDir"
+mkdir -p "$aDestDir"
+rm -f "$aLogFile"
+
+anOcctVerSuffix=`grep -e "#define OCC_VERSION_DEVELOPMENT" "$aCasSrc/src/Standard/Standard_Version.hxx" | awk '{print $3}' | xargs`
+anOcctVersion=`grep -e "#define OCC_VERSION_COMPLETE" "$aCasSrc/src/Standard/Standard_Version.hxx" | awk '{print $3}' | xargs`
+aGitBranch=`git symbolic-ref --short HEAD`
+
+# include some information about OCCT into archive
+echo \<pre\>> "${aWorkDir}/VERSION.html"
+git status >> "${aWorkDir}/VERSION.html"
+git log -n 100 >> "${aWorkDir}/VERSION.html"
+echo \</pre\>>> "${aWorkDir}/VERSION.html"
+
+pushd "$aWorkDir"
+
+aTimeZERO=$SECONDS
+set -o pipefail
+
+function logDuration {
+  if [[ $1 == 1 ]]; then
+    aDur=$(($4 - $3))
+    echo $2 time: $aDur sec>> "$aLogFile"
+  fi
+}
+
+# (re)generate Make files
+if [[ $toCMake == 1 ]]; then
+  echo Configuring OCCT for macOS...
+  cmake -G "Unix Makefiles" \
+  -D CMAKE_BUILD_TYPE:STRING="$aBuildType" \
+  -D BUILD_LIBRARY_TYPE:STRING="Shared" \
+  -D CMAKE_OSX_ARCHITECTURES:STRING="$anAbi" \
+  -D INSTALL_DIR:PATH="$aDestDir" \
+  -D INSTALL_DIR_INCLUDE:STRING="inc" \
+  -D INSTALL_DIR_LIB:STRING="lib" \
+  -D INSTALL_DIR_RESOURCE:STRING="src" \
+  -D INSTALL_NAME_DIR:STRING="@executable_path/../Frameworks" \
+  -D 3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \
+  -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \
+  -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \
+  -D 3RDPARTY_FREETYPE_LIBRARY_DIR:PATH="$aFreeType/lib" \
+  -D 3RDPARTY_FREETYPE_LIBRARY:FILEPATH="$aFreeType/lib/libfreetype.dylib" \
+  -D USE_RAPIDJSON:BOOL="$USE_RAPIDJSON" \
+  -D 3RDPARTY_RAPIDJSON_DIR:PATH="$aRapidJson" \
+  -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="$aRapidJson/include" \
+  -D USE_FREEIMAGE:BOOL="$USE_FREEIMAGE" \
+  -D 3RDPARTY_FREEIMAGE_DIR:PATH="$aFreeImage" \
+  -D 3RDPARTY_FREEIMAGE_INCLUDE_DIR:FILEPATH="$aFreeImage/include" \
+  -D 3RDPARTY_FREEIMAGE_LIBRARY_DIR:PATH="$aFreeImage/lib" \
+  -D 3RDPARTY_FREEIMAGE_LIBRARY:FILEPATH="$aFreeImage/lib/libfreeimage.a" \
+  -D BUILD_MODULE_FoundationClasses:BOOL="ON" \
+  -D BUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \
+  -D BUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \
+  -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
+  -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
+  -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
+  -D BUILD_MODULE_Draw:BOOL="${BUILD_Draw}" \
+  -D BUILD_DOC_Overview:BOOL="OFF" \
+  "$aCasSrc" 2>&1 | tee -a "$aLogFile"
+  aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+fi
+aTimeGEN=$SECONDS
+logDuration $toCMake "Generation" $aTimeZERO $aTimeGEN
+
+# clean up from previous build
+if [[ $toClean == 1 ]]; then
+  make clean
+fi
+
+# build the project
+if [[ $toMake == 1 ]]; then
+  echo Building OCCT...
+  make -j $aNbJobs 2>&1 | tee -a "$aLogFile"
+  aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+fi
+aTimeBUILD=$SECONDS
+logDuration $toMake "Building"       $aTimeGEN  $aTimeBUILD
+logDuration $toMake "Total building" $aTimeZERO $aTimeBUILD
+
+# install the project
+if [[ $toInstall == 1 ]]; then
+  echo Installing OCCT into $aDestDir...
+  make install 2>&1 | tee -a "$aLogFile"
+  cp -f "$aWorkDir/VERSION.html" "$aDestDir/VERSION.html"
+fi
+aTimeINSTALL=$SECONDS
+logDuration $toInstall "Install" $aTimeBUILD $aTimeINSTALL
+
+# create an archive
+if [[ $toPack == 1 ]]; then
+  YEAR=$(date +"%Y")
+  MONTH=$(date +"%m")
+  DAY=$(date +"%d")
+  aRevision=-${YEAR}-${MONTH}-${DAY}
+  #aRevision=-${aGitBranch}
+
+  anArchName=occt-${anOcctVersion}${anOcctVerSuffix}${aRevision}-${aPlatformAndCompiler}.tar.bz2
+  echo Creating an archive ${aCasSrc}/${aBuildRoot}/${anArchName}...
+  rm ${aDestDir}/../${anArchName} &>/dev/null
+  pushd "$aDestDir"
+  tar -jcf ${aDestDir}/../${anArchName} *
+  popd
+fi
+aTimePACK=$SECONDS
+logDuration $toPack "Packing archive" $aTimeINSTALL $aTimePACK
+
+# finished
+DURATION=$(($aTimePACK - $aTimeZERO))
+echo Total time: $DURATION sec
+logDuration 1 "Total" $aTimeZERO $aTimePACK
+
+popd

adm/scripts/macos_custom.sh.template

@@ -0,0 +1,27 @@
+# environment configuration template for macos_build.sh (to be renamed as macos_custom_env.sh)
+export PATH=/Applications/CMake.app/Contents/bin:$PATH
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-macos"
+export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-macos"
+export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
+
+# Uncomment to customize building steps
+#export aBuildRoot=work
+#export toCMake=1
+#export toClean=1
+#export toMake=1
+#export toInstall=1
+#export toPack=1
+
+#export BUILD_ModelingData=ON
+#export BUILD_ModelingAlgorithms=ON
+#export BUILD_Visualization=ON
+#export BUILD_ApplicationFramework=ON
+#export BUILD_DataExchange=ON
+#export BUILD_Draw=ON
+
+#export USE_RAPIDJSON=ON
+#export USE_FREEIMAGE=ON
+
+#export MACOSX_DEPLOYMENT_TARGET=10.10
+#export anAbi=arm64
+#export anAbi=x86_64

adm/scripts/wasm_build.bat

@@ -4,36 +4,99 @@ rem Auxiliary script for semi-automated building of OCCT for WASM platform.
 rem wasm_custom.bat should be configured with paths to CMake, 3rd-parties and Emscripten SDK.
 rem FreeType should be specified as mandatory dependency.
 
-set "aSrcRoot=%~dp0..\.."
-set "aBuildRoot=work"
+set "aCasSrc=%~dp0..\.."
+set "aBuildRoot=%aCasSrc%\work"
 
 set aNbJobs=%NUMBER_OF_PROCESSORS%
 
+rem Paths to 3rd-party tools and libraries
+set "aCmakeBin="
+set "aFreeType="
+set "aRapidJson="
+
+rem Build stages to perform
 set "toCMake=1"
 set "toClean=0"
 set "toMake=1"
 set "toInstall=1"
+set "toPack=0"
+set "toDebug=0"
+set "toBuildSample=0"
+set "sourceMapBase="
 
+rem OCCT Modules to build
 set "BUILD_ModelingData=ON"
 set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
 
+rem Optional 3rd-party libraries to enable
+set "USE_RAPIDJSON=OFF"
+
+rem Archive tool
+set "THE_7Z_PARAMS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on"
+set "THE_7Z_PATH=%ProgramW6432%\7-Zip\7z.exe"
+
 rem Configuration file
 if exist "%~dp0wasm_custom.bat" call "%~dp0wasm_custom.bat"
 
 call "%EMSDK_ROOT%\emsdk_env.bat"
 set "aToolchain=%EMSDK%/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" )
 
 set "anOcctVerSuffix="
 set "anOcctVersion=0.0.0"
 set "aGitBranch="
-for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_DEVELOPMENT" "%aSrcRoot%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVerSuffix=%%i" )
-for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_COMPLETE" "%aSrcRoot%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVersion=%%i" )
+for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_DEVELOPMENT" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVerSuffix=%%i" )
+for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_COMPLETE" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVersion=%%i" )
 for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
 
+set "aBuildType=Release"
+set "aBuildTypePrefix="
+if ["%toDebug%"] == ["1"] (
+  set "aBuildType=Debug"
+  set "aBuildTypePrefix=-debug"
+)
+
 call :cmakeGenerate
+if errorlevel 1 (
+  if not ["%1"] == ["-nopause"] (
+    pause
+  )
+  exit /B 1
+  goto :eof
+)
+
+for /F "skip=1 delims=" %%F in ('
+  wmic PATH Win32_LocalTime GET Day^,Month^,Year /FORMAT:TABLE
+') do (
+  for /F "tokens=1-3" %%L in ("%%F") do (
+    set DAY00=0%%L
+    set MONTH00=0%%M
+    set YEAR=%%N
+  )
+)
+set DAY00=%DAY00:~-2%
+set MONTH00=%MONTH00:~-2%
+set "aRevision=-%YEAR%-%MONTH00%-%DAY00%"
+rem set "aRevision=-%aGitBranch%"
+set "anArchName=occt-%anOcctVersion%%anOcctVerSuffix%%aRevision%-wasm32%aBuildTypePrefix%"
+set "aTarget=%aBuildRoot%\%anArchName%"
+if ["%toPack%"] == ["1"] (
+  echo Creating archive %anArchName%.7z
+  rmdir /S /Q "%aTarget%"
+  if not exist "%aTarget%" ( mkdir "%aTarget%" )
+  if exist "%aBuildRoot%/%anArchName%.7z" del "%aBuildRoot%/%anArchName%.7z"
+  xcopy /S /Y "%aDestDir%\*" "%aTarget%\"
+
+  if ["%toBuildSample%"] == ["1"] (
+    if not exist "%aTarget%\sample" ( mkdir "%aTarget%\sample" )
+    xcopy /S /Y "%aDestDirSmpl%\*" "%aTarget%\sample\"
+  )
+
+  "%THE_7Z_PATH%" a -r %THE_7Z_PARAMS% "%aBuildRoot%/%anArchName%.7z" "%aTarget%"
+)
 if not ["%1"] == ["-nopause"] (
   pause
 )
@@ -41,13 +104,34 @@ if not ["%1"] == ["-nopause"] (
 goto :eof
 
 :cmakeGenerate
-set "aPlatformAndCompiler=wasm"
-set "aWorkDir=%aSrcRoot%\%aBuildRoot%\%aPlatformAndCompiler%-make"
-set "aDestDir=%aSrcRoot%\%aBuildRoot%\%aPlatformAndCompiler%"
-set "aLogFile=%aSrcRoot%\%aBuildRoot%\build-%aPlatformAndCompiler%.log"
+set "aPlatformAndCompiler=wasm32%aBuildTypePrefix%"
+set "aWorkDir=%aBuildRoot%\occt-%aPlatformAndCompiler%-make"
+set "aDestDir=%aBuildRoot%\occt-%aPlatformAndCompiler%"
+set "aLogFile=%aBuildRoot%\occt-%aPlatformAndCompiler%-build.log"
+if ["%toCMake%"] == ["1"] (
+  if ["%toClean%"] == ["1"] (
+    rmdir /S /Q %aWorkDir%"
+    rmdir /S /Q %aDestDir%"
+  )
+)
 if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" )
 if     exist "%aLogFile%" ( del   "%aLogFile%" )
 
+set "aSrcRootSmpl=%aCasSrc%\samples\webgl"
+set "aWorkDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-make"
+set "aDestDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%"
+set "aLogFileSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-build.log"
+if ["%toBuildSample%"] == ["1"] (
+  if ["%toCMake%"] == ["1"] (
+    if ["%toClean%"] == ["1"] (
+      rmdir /S /Q %aWorkDirSmpl%"
+      rmdir /S /Q %aDestDirSmpl%"
+    )
+  )
+  if not exist "%aWorkDirSmpl%" ( mkdir "%aWorkDirSmpl%" )
+  if     exist "%aLogFileSmpl%" ( del   "%aLogFileSmpl%" )
+)
+
 rem include some information about OCCT into archive
 echo ^<pre^>> "%aWorkDir%\VERSION.html"
 git status >> "%aWorkDir%\VERSION.html"
@@ -59,12 +143,12 @@ echo Start building OCCT for %aPlatformAndCompiler%>> %aLogFile%
 
 pushd "%aWorkDir%"
 
-set aTimeZERO=%TIME%
+set "aTimeZERO=%TIME%"
 if ["%toCMake%"] == ["1"] (
-  echo "Configuring OCCT for WASM..."
+  echo Configuring OCCT for WASM...
   cmake -G "MinGW Makefiles" ^
  -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^
- -D CMAKE_BUILD_TYPE:STRING="Release" ^
+ -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^
  -D BUILD_LIBRARY_TYPE:STRING="Static" ^
  -D INSTALL_DIR:PATH="%aDestDir%" ^
  -D INSTALL_DIR_INCLUDE:STRING="inc" ^
@@ -80,7 +164,10 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
  -D BUILD_MODULE_Draw:BOOL="OFF" ^
  -D BUILD_DOC_Overview:BOOL="OFF" ^
- "%aSrcRoot%"
+ -D USE_RAPIDJSON:BOOL="%USE_RAPIDJSON%" ^
+ -D 3RDPARTY_RAPIDJSON_DIR:PATH="%aRapidJson%" ^
+ -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="%aRapidJson%/include" ^
+ "%aCasSrc%"
 
   if errorlevel 1 (
     popd
@@ -88,61 +175,114 @@ if ["%toCMake%"] == ["1"] (
     goto :eof
   )
 )
-set aTimeGEN=%TIME%
+set "aTimeGEN=%TIME%"
 call :computeDuration %aTimeZERO% %aTimeGEN%
 if ["%toCMake%"] == ["1"] (
   echo Generation time: %DURATION%
   echo Generation time: %DURATION%>> "%aLogFile%"
 )
 
-if "%toClean%"=="1" (
+if ["%toClean%"] == ["1"] (
   mingw32-make clean
 )
 
-if "%toMake%"=="1" (
+if ["%toMake%"] == ["1"] (
   echo Building...
   mingw32-make -j %aNbJobs% 2>> "%aLogFile%"
   if errorlevel 1 (
+    type "%aLogFile%"
     popd
     exit /B 1
     goto :eof
   )
   type "%aLogFile%"
 )
-set aTimeBUILD=%TIME%
+set "aTimeBUILD=%TIME%"
 call :computeDuration %aTimeGEN% %aTimeBUILD%
-if "%toMake%"=="1" (
+if ["%toMake%"] == ["1"] (
   echo Building time: %DURATION%
   echo Building time: %DURATION%>> "%aLogFile%"
 )
 call :computeDuration %aTimeZERO% %aTimeBUILD%
-if "%toMake%"=="1" (
+if ["%toMake%"] == ["1"] (
   echo Total building time: %DURATION%
   echo Total building time: %DURATION%>> "%aLogFile%"
 )
 
-if "%toInstall%"=="1" (
+if ["%toInstall%"] == ["1"] (
   echo Installing into %aDestDir%...
   mingw32-make install 2>> "%aLogFile%"
   copy /Y "%aWorkDir%\VERSION.html" "%aDestDir%\VERSION.html"
 )
-set aTimeINSTALL=%TIME%
-call :computeDuration %aTimeBUILD% %aTimeINSTALL%
-if "%toInstall%"=="1" (
+set "aTimeINSTALL=%TIME%"
+call :computeDuration "%aTimeBUILD%" "%aTimeINSTALL%"
+if ["%toInstall%"] == ["1"] (
   echo Install time: %DURATION%
   echo Install time: %DURATION%>> "%aLogFile%"
 )
 
-call :computeDuration %aTimeZERO% %aTimeINSTALL%
+call :computeDuration "%aTimeZERO%" "%aTimeINSTALL%"
 echo Total time: %DURATION%
 echo Total time: %DURATION%>> "%aLogFile%"
 
 popd
+if ["%toBuildSample%"] == ["0"] (
+  goto :eof
+)
+
+pushd "%aWorkDirSmpl%"
+
+if ["%toCMake%"] == ["1"] (
+  cmake -G "MinGW Makefiles" ^
+ -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^
+ -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^
+ -D CMAKE_INSTALL_PREFIX:PATH="%aDestDirSmpl%" ^
+ -D SOURCE_MAP_BASE:STRING="%sourceMapBase%" ^
+ -D OpenCASCADE_DIR:PATH="%aDestDir%/lib/cmake/opencascade" ^
+ -D freetype_DIR:PATH="%aFreeType%/lib/cmake/freetype" ^
+ "%aSrcRootSmpl%"
+
+  if errorlevel 1 (
+    popd
+    pause
+    exit /B
+    goto :eof
+  )
+)
+if ["%toClean%"] == ["1"] (
+  mingw32-make clean
+)
+
+if ["%toMake%"] == ["1"] (
+  echo Building...
+  mingw32-make -j %aNbJobs% 2>> "%aLogFileSmpl%"
+  if errorlevel 1 (
+    type "%aLogFileSmpl%"
+    popd
+    pause
+    exit /B
+    goto :eof
+  )
+  type "%aLogFileSmpl%"
+)
+
+if ["%toInstall%"] == ["1"] (
+  mingw32-make install 2>> "%aLogFileSmpl%"
+  if errorlevel 1 (
+    type "%aLogFileSmpl%"
+    popd
+    pause
+    exit /B
+    goto :eof
+  )
+)
+popd
+
 goto :eof
 
 :computeDuration
-set aTimeFrom=%1
-set aTimeEnd=%2
+set "aTimeFrom=%~1"
+set "aTimeEnd=%~2"
 rem handle time before 10AM (win10 - remove empty space at the beginning)
 if "%aTimeFrom:~0,1%"==" " set "aTimeFrom=%aTimeFrom:~1%"
 if  "%aTimeEnd:~0,1%"==" " set  "aTimeEnd=%aTimeEnd:~1%"

adm/scripts/wasm_custom.bat.template

@@ -1,16 +1,26 @@
-rem Environment configuration template for occ_build_wasm.bat (to be renamed as wasm_custom_env.bat)
-set "aFreeType=%aSrcRoot%\..\3rdparty\freetype-2.7.1-wasm"
-set "EMSDK_ROOT=%aSrcRoot%\..\emsdk"
+rem Environment configuration template for wasm_build.bat (to be renamed as wasm_custom.bat)
+set "EMSDK_ROOT=%aCasSrc%\..\emsdk"
+set "aFreeType=%aCasSrc%\..\3rdparty\freetype-2.7.1-wasm"
+rem set "aRapidJson=%aCasSrc%\..\3rdparty\rapidjson-1.1.0"
+rem set "aCmakeBin=%ProgramW6432%\CMake\bin"
 
 rem Uncomment to customize building steps
 rem set "aBuildRoot=work"
 rem set "toCMake=1"
-rem set "toClean=0"
+rem set "toClean=1"
 rem set "toMake=1"
 rem set "toInstall=1"
+rem set "toPack=1"
+rem set "toDebug=1"
+rem set "toBuildSample=1"
+rem Source map base (should point to server where C++ sources will be copied)
+rem enables -g4 debug building option for WebGL sample and allows navigating C++ source code within JavaScript debugger.
+rem set "sourceMapBase=http://localhost:9090/"
 
 rem set "BUILD_ModelingData=ON"
 rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
+
+rem set "USE_RAPIDJSON=OFF"

adm/scripts/wasm_sample_build.bat

@@ -0,0 +1,109 @@
+@echo OFF
+
+rem Auxiliary script for semi-automated building of WebGL sample.
+rem wasm_custom.bat should be configured with paths to CMake, 3rd-parties and Emscripten SDK.
+rem FreeType should be specified as mandatory dependency.
+
+set "aCasSrc=%~dp0..\.."
+set "aBuildRoot=%aCasSrc%\work"
+
+set aNbJobs=%NUMBER_OF_PROCESSORS%
+
+rem Paths to 3rd-party tools and libraries
+set "aCmakeBin="
+set "aFreeType="
+
+rem Build stages to perform
+set "toCMake=1"
+set "toClean=0"
+set "toMake=1"
+set "toInstall=1"
+set "toDebug=0"
+set "sourceMapBase="
+
+rem Configuration file
+if exist "%~dp0wasm_custom.bat" call "%~dp0wasm_custom.bat"
+
+call "%EMSDK_ROOT%\emsdk_env.bat"
+set "aToolchain=%EMSDK%/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" )
+
+set "aBuildType=Release"
+set "aBuildTypePrefix="
+if ["%toDebug%"] == ["1"] (
+  set "aBuildType=Debug"
+  set "aBuildTypePrefix=-debug"
+)
+
+call :cmakeGenerate
+if not ["%1"] == ["-nopause"] (
+  pause
+)
+
+goto :eof
+
+:cmakeGenerate
+set "aPlatformAndCompiler=wasm32%aBuildTypePrefix%"
+set "aDestDirOcct=%aBuildRoot%\occt-%aPlatformAndCompiler%"
+set "aSrcRootSmpl=%aCasSrc%\samples\webgl"
+set "aWorkDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-make"
+set "aDestDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%"
+set "aLogFileSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-build.log"
+if ["%toCMake%"] == ["1"] (
+  if ["%toClean%"] == ["1"] (
+    rmdir /S /Q %aWorkDirSmpl%"
+    rmdir /S /Q %aDestDirSmpl%"
+  )
+)
+if not exist "%aWorkDirSmpl%" ( mkdir "%aWorkDirSmpl%" )
+if     exist "%aLogFileSmpl%" ( del   "%aLogFileSmpl%" )
+
+pushd "%aWorkDirSmpl%"
+
+if ["%toCMake%"] == ["1"] (
+  cmake -G "MinGW Makefiles" ^
+ -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^
+ -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^
+ -D CMAKE_INSTALL_PREFIX:PATH="%aDestDirSmpl%" ^
+ -D SOURCE_MAP_BASE:STRING="%sourceMapBase%" ^
+ -D OpenCASCADE_DIR:PATH="%aDestDirOcct%/lib/cmake/opencascade" ^
+ -D freetype_DIR:PATH="%aFreeType%/lib/cmake/freetype" ^
+ "%aSrcRootSmpl%"
+
+  if errorlevel 1 (
+    popd
+    pause
+    exit /B
+    goto :eof
+  )
+)
+if ["%toClean%"] == ["1"] (
+  mingw32-make clean
+)
+
+if ["%toMake%"] == ["1"] (
+  echo Building...
+  mingw32-make -j %aNbJobs% 2>> "%aLogFileSmpl%"
+  if errorlevel 1 (
+    type "%aLogFileSmpl%"
+    popd
+    pause
+    exit /B
+    goto :eof
+  )
+  type "%aLogFileSmpl%"
+)
+
+if ["%toInstall%"] == ["1"] (
+  mingw32-make install 2>> "%aLogFileSmpl%"
+  if errorlevel 1 (
+    type "%aLogFileSmpl%"
+    popd
+    pause
+    exit /B
+    goto :eof
+  )
+)
+popd
+
+goto :eof

adm/templates/custom.build.bat.in

@@ -14,6 +14,7 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
     set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
     set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
+    set "OPENVR_DIR=@3RDPARTY_OPENVR_DLL_DIRS@"
 
     if not "@3RDPARTY_QT_DIR@" == "" (
       set "QTDIR=@3RDPARTY_QT_DIR@"
@@ -39,7 +40,7 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests"
     set "CSF_OCCTDocPath=@CMAKE_SOURCE_DIR@/doc"
 
-    rem for compatability with external application using CASROOT
+    rem for compatibility with external application using CASROOT
     set "CASROOT=@CMAKE_SOURCE_DIR@"
   ) 
 )

adm/templates/custom.build.sh.in

@@ -29,7 +29,7 @@ if [ "$1" == "@BIN_LETTER@" ]; then
     export CSF_OCCTTestsPath="@CMAKE_SOURCE_DIR@/tests"
     export CSF_OCCTDocPath="@CMAKE_SOURCE_DIR@/doc"
 
-    # for compatability with external application using CASROOT
+    # for compatibility with external application using CASROOT
     export CASROOT="@CMAKE_SOURCE_DIR@"
   fi
 fi

adm/templates/custom.install.bat.in

@@ -10,12 +10,13 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "TCL_DIR=@USED_3RDPARTY_TCL_DIR@"
     set "TK_DIR=@USED_3RDPARTY_TK_DIR@"
     set "FREETYPE_DIR=@USED_3RDPARTY_FREETYPE_DIR@"
-    set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIRS@"
+    set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIR@"
     set "EGL_DIR=@USED_3RDPARTY_EGL_DIRS@"
     set "GLES2_DIR=@USED_3RDPARTY_GLES2_DIRS@"
     set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
     set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
     set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
+    set "OPENVR_DIR=@USED_3RDPARTY_OPENVR_DIR@"
 
     if not "@USED_3RDPARTY_QT_DIR@" == "" (
       set "QTDIR=@USED_3RDPARTY_QT_DIR@"

adm/templates/env.bat

@@ -185,7 +185,7 @@ if ["%HAVE_OPENCL%"]    == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DH
 if ["%HAVE_FREEIMAGE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREEIMAGE" & set "CSF_DEFINES=HAVE_FREEIMAGE;%CSF_DEFINES%"
 if ["%HAVE_FFMPEG%"]    == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FFMPEG"    & set "CSF_DEFINES=HAVE_FFMPEG;%CSF_DEFINES%"
 if ["%HAVE_VTK%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_VTK"       & set "CSF_DEFINES=HAVE_VTK;%CSF_DEFINES%"
-if ["%HAVE_GLES2%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_GLES2"     & set "CSF_DEFINES=HAVE_GLES2;%CSF_DEFINES%"
+if ["%HAVE_GLES2%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_GLES2_EXT" & set "CSF_DEFINES=HAVE_GLES2_EXT;%CSF_DEFINES%"
 if ["%HAVE_D3D%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_D3D"       & set "CSF_DEFINES=HAVE_D3D;%CSF_DEFINES%"
 if ["%HAVE_ZLIB%"]      == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_ZLIB"      & set "CSF_DEFINES=HAVE_ZLIB;%CSF_DEFINES%"
 if ["%HAVE_LIBLZMA%"]   == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_LIBLZMA"   & set "CSF_DEFINES=HAVE_LIBLZMA;%CSF_DEFINES%"

adm/templates/env.bat.in

@@ -115,16 +115,18 @@ if /I "%VCFMT%" == "vc9" (
   exit
 )
 
-rem ----- For compatability with external application using CASROOT -----
+rem ----- For compatibility with external application using CASROOT -----
 if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
 
 rem ----- Define path to 3rdparty products -----
-set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
+if ["%THIRDPARTY_DIR%"] == [""] set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
 
 if ["%ARCH%"] == ["32"] set VCARCH=x86
 if ["%ARCH%"] == ["64"] set VCARCH=amd64
 
 if /I ["%1"] == ["vc141"] set "VCVER=vc14"
+if /I ["%1"] == ["vc142"] set "VCVER=vc14"
+
 if exist "%CASROOT%\custom.bat" (
   call "%CASROOT%\custom.bat" %VCVER% %ARCH% %CASDEB%
 )
@@ -138,7 +140,11 @@ if not ["%GLES2_DIR%"] == [""]         set "PATH=%GLES2_DIR%;%PATH%"
 if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
 if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
 if not ["%FFMPEG_DIR%"] == [""]        set "PATH=%FFMPEG_DIR%;%PATH%"
-if not ["%QTDIR%"] == [""]             set "PATH=%QTDIR%/bin;%PATH%"
+if not ["%OPENVR_DIR%"] == [""]        set "PATH=%OPENVR_DIR%;%PATH%"
+if not ["%QTDIR%"] == [""] (
+  set "PATH=%QTDIR%/bin;%PATH%"
+  set "QT_PLUGIN_PATH=%QTDIR%/plugins"
+)
 
 rem ----- Set path to 3rd party and OCCT libraries -----
 if not "%CSF_OCCTBinPath%" == "" (

adm/templates/env.build.sh.in

@@ -2,7 +2,7 @@
 
 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
 
-# ----- For compatability with external application using CASROOT -----
+# ----- For compatibility with external application using CASROOT -----
 if [ "${CASROOT}" == "" ]; then
   export CASROOT="${aScriptPath}"
 fi

adm/templates/env.install.sh.in

@@ -2,13 +2,15 @@
 
 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
 
-# ----- For compatability with external application using CASROOT -----
+# ----- For compatibility with external application using CASROOT -----
 if [ "${CASROOT}" == "" ]; then
   export CASROOT="@INSTALL_DIR@"
 fi
 
 # ----- Define path to 3rdparty products -----
-export THIRDPARTY_DIR="@3RDPARTY_DIR@"
+if [ "${THIRDPARTY_DIR}" == "" ]; then
+  export THIRDPARTY_DIR="@3RDPARTY_DIR@"
+fi
 
 # ----- Read script arguments -----
 shopt -s nocasematch

adm/templates/env.samples.bat.in

@@ -6,6 +6,7 @@ if exist "%~dp0custom.bat" (
 
 call "@INSTALL_DIR_ABSOLUTE@\@INSTALL_DIR_SCRIPT@\env.bat" %1 %2 %3
 if /I ["%1"] == ["vc141"] set "VCVER=vc141"
+if /I ["%1"] == ["vc142"] set "VCVER=vc142"
 set "BIN_DIR=win%ARCH%\%VCVER%\bind"
 set "LIB_DIR=win%ARCH%\%VCVER%\libd"
 
@@ -26,3 +27,5 @@ if not "%QTDIR%" == "" (
   set "PATH=%QTDIR%/bin;%PATH%"
   set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"
 )
+
+set "CSF_OCCTOverviewSampleCodePath=%~dp0..\..\OCCTOverview\code"

adm/templates/env.samples.sh.in

@@ -20,3 +20,5 @@ export STATION=$host
 export RES_DIR=${aSamplePath}/${STATION}/res
 
 export PATH=${QTDIR}/bin:${PATH}
+
+export "CSF_OCCTOverviewSampleCodePath=${aSamplePath}/../../OCCTOverview/code"

adm/templates/env.sh

@@ -102,7 +102,7 @@ if [ "$HAVE_TBB"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -D
 if [ "$HAVE_OPENCL"    == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENCL"; fi
 if [ "$HAVE_FREEIMAGE" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FREEIMAGE"; fi
 if [ "$HAVE_FFMPEG"    == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FFMPEG"; fi
-if [ "$HAVE_GLES2"     == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GLES2"; fi
+if [ "$HAVE_GLES2"     == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GLES2_EXT"; fi
 if [ "$HAVE_VTK"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_VTK"; fi
 if [ "$HAVE_ZLIB"      == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_ZLIB"; fi
 if [ "$HAVE_LIBLZMA"   == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_LIBLZMA"; fi

adm/templates/sample.bat

@@ -19,6 +19,7 @@ if ["%1"] == [""] (
   echo    AndroidQt
   echo    FuncDemo
   echo    IESample
+  echo    OCCTOverview  
   echo    Tutorial
   PAUSE
   exit /B
@@ -35,5 +36,8 @@ if not exist "%EXE_PATH%" (
   exit /B
 )
 
+rem Set path to location where sample code is installed
+set "CSF_OCCTOverviewSampleCodePath=%CSF_OCCTSamplesPath%\OCCTOverview\code"
+
 "%EXE_PATH%"
 

adm/templates/sample.sh

@@ -8,6 +8,7 @@ if [ "$1" == "" ]; then
   echo available samples:
   echo    FuncDemo
   echo    IESample
+  echo    OCCTOverview
   echo    Tutorial
 fi
 
@@ -31,5 +32,7 @@ if [ ! -f "$EXE_PATH" ]; then
   exit 1
 fi
 
+export CSF_OCCTOverviewSampleCodePath="${CSF_OCCTSamplesPath}/OCCTOverview/code"
+
 cd ${aCurrentPath}
 "$EXE_PATH"

adm/templates/template.vc10

@@ -90,7 +90,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -107,7 +107,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
@@ -138,7 +138,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@@ -156,7 +156,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
@@ -186,7 +186,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -203,7 +203,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
@@ -234,7 +234,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@@ -252,7 +252,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>

adm/templates/template.vc10x

@@ -85,7 +85,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -100,7 +100,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
@@ -130,7 +130,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@@ -146,7 +146,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
@@ -175,7 +175,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -190,7 +190,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
@@ -219,7 +219,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@@ -235,7 +235,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>

adm/upgrade.dat

@@ -71,6 +71,30 @@ BOPTools::MapShapesAndAncestors TopExp::MapShapesAndAncestors
 BOPCol_Box2DBndTreeSelector BOPTools_BoxSelector<Bnd_Box2d>
 BiTgte_DataMapOfShapeBox TopTools_DataMapOfShapeBox
 CDM_MessageDriver Message_Messenger
+Message_ProgressSentry Message_ProgressScope
+Adaptor2d_HCurve2d Adaptor2d_Curve2d
+Adaptor2d_HLine2d Adaptor2d_Line2d
+Adaptor2d_HOffsetCurve Adaptor2d_OffsetCurve
+Adaptor3d_HCurve Adaptor3d_Curve
+Adaptor3d_HCurveOnSurface Adaptor3d_CurveOnSurface
+Adaptor3d_HIsoCurve Adaptor3d_IsoCurve
+Adaptor3d_HSurface Adaptor3d_Surface
+BRepAdaptor_HCompCurve BRepAdaptor_CompCurve
+BRepAdaptor_HCurve BRepAdaptor_Curve
+BRepAdaptor_HCurve2d BRepAdaptor_Curve2d
+BRepAdaptor_HSurface BRepAdaptor_Surface
+BiTgte_HCurveOnEdge BiTgte_CurveOnEdge
+BiTgte_HCurveOnVertex BiTgte_CurveOnVertex
+ChFiDS_HElSpine ChFiDS_ElSpine
+Geom2dAdaptor_GHCurve Geom2dAdaptor_Curve
+Geom2dAdaptor_HCurve Geom2dAdaptor_Curve
+GeomAdaptor_GHCurve GeomAdaptor_Curve
+GeomAdaptor_GHSurface GeomAdaptor_Surface
+GeomAdaptor_HCurve GeomAdaptor_Curve
+GeomAdaptor_HSurface GeomAdaptor_Surface
+GeomAdaptor_HSurfaceOfLinearExtrusion GeomAdaptor_SurfaceOfLinearExtrusion
+GeomAdaptor_HSurfaceOfRevolution GeomAdaptor_SurfaceOfRevolution
+PrsMgr_PresentationManager3d PrsMgr_PresentationManager
 
 [tcollection]
 AdvApp2Var_SequenceOfNode

adm/upgrade.tcl

@@ -52,7 +52,7 @@ proc HelpInformation {} {
   loginfo "  -$ArgName(Rename)      - apply renaming of classes"
   loginfo ""
   loginfo "Advanced options:"
-  loginfo "  -$ArgName(CompatibleMode)      - preserve old RTTI macros for compatability with OCCT 6.x"
+  loginfo "  -$ArgName(CompatibleMode)      - preserve old RTTI macros for compatibility with OCCT 6.x"
   loginfo "  -$ArgName(CheckOnly)       - do check only, no modifications will be made"
   loginfo "  -$ArgName(WLog)        - show gui log of upgrade process"
   loginfo "  -$ArgName(Log)=<file path> - put the log into a file"
@@ -370,7 +370,7 @@ proc upgrade {args} {
   }
 }
 
-# search and rename the indeces (old names) of @theNewNames with their values (new ones)
+# search and rename the indices (old names) of @theNewNames with their values (new ones)
 #  processes files that have @theExtensions only in @thePath folder
 proc Rename {thePath theExtensions theNewNames theCheckMode} {
   upvar $theNewNames aNewNames

dox/FILES_HTML.txt

@@ -5,56 +5,56 @@
 # The order of files in this list determines order of top-level pages
 # in the generated documentation.
 
-overview/overview.md
+introduction/introduction.md
 
+samples/samples.md
 ../samples/mfc/standard/ReadMe.md
 ../samples/CSharp/ReadMe.md
 ../samples/CSharp/ReadMe_D3D.md
-
 ../samples/qt/AndroidQt/ReadMe.md
+../samples/qt/OCCTOverview/ReadMe.md
 ../samples/java/jniviewer/ReadMe.md
 ../samples/ios/UIKitSample/ReadMe.md
 ../samples/webgl/ReadMe.md
+samples/ocaf.md
+samples/ocaf_func.md
+samples/draw_scripts.md
 
 tutorial/tutorial.md
 
-technical_overview/technical_overview.md
+build/build_upgrade.md
+build/build_occt/building_occt.md
+build/build_3rdparty/building_3rdparty.md
+build/build_documentation/building_documentation.md
+
+debug/debug.md
+upgrade/upgrade.md
 
 user_guides/user_guides.md
 user_guides/foundation_classes/foundation_classes.md
 user_guides/modeling_data/modeling_data.md
 user_guides/modeling_algos/modeling_algos.md
-user_guides/boolean_operations/boolean_operations.md
+user_guides/mesh/mesh.md
 user_guides/shape_healing/shape_healing.md
 user_guides/visualization/visualization.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
 user_guides/ocaf/ocaf.md
-user_guides/tobj/tobj.md
 user_guides/draw_test_harness/draw_test_harness.md
 user_guides/inspector/inspector.md
-user_guides/brep_wp/brep_wp.md
 user_guides/vis/vis.md
 
-dev_guides/dev_guides.md
-dev_guides/documentation/documentation.md
-dev_guides/contribution/coding_rules.md
-dev_guides/contribution_workflow/contribution_workflow.md
-dev_guides/git_guide/git_guide.md
-dev_guides/tests/tests.md
-dev_guides/debug/debug.md
-dev_guides/upgrade/upgrade.md
-dev_guides/visualization/pbr_math.md
+specification/specification.md
+specification/boolean_operations/boolean_operations.md
+specification/brep_format.md
+specification/pbr_math.md
 
-dev_guides/building/building.md
-dev_guides/building/3rdparty/3rdparty_windows.md
-dev_guides/building/3rdparty/3rdparty_linux.md
-dev_guides/building/3rdparty/3rdparty_osx.md
-dev_guides/building/cmake/cmake.md
-dev_guides/building/android/android.md
-dev_guides/building/code_blocks.md
-dev_guides/building/msvc.md
-dev_guides/building/xcode.md
+contribution/contribution.md
+contribution/documentation/documentation.md
+contribution/coding_rules.md
+contribution/contribution_workflow/contribution_workflow.md
+contribution/git_guide/git_guide.md
+contribution/tests/tests.md
 
 license.md

dox/FILES_PDF.txt

@@ -4,28 +4,29 @@
 # Empty spaces are allowed.
 # Strings starting with '#' are treated as comments and ignored.
 
-user_guides/brep_wp/brep_wp.md
+tutorial/tutorial.md
+
+upgrade/upgrade.md
+
 user_guides/foundation_classes/foundation_classes.md
-user_guides/iges/iges.md
 user_guides/modeling_data/modeling_data.md
 user_guides/modeling_algos/modeling_algos.md
-user_guides/boolean_operations/boolean_operations.md
-user_guides/shape_healing/shape_healing.md
+user_guides/mesh/mesh.md
 user_guides/ocaf/ocaf.md
-user_guides/step/step.md
-user_guides/draw_test_harness/draw_test_harness.md
-user_guides/inspector/inspector.md
-user_guides/tobj/tobj.md
 user_guides/visualization/visualization.md
-user_guides/xde/xde.md
 user_guides/vis/vis.md
+user_guides/iges/iges.md
+user_guides/step/step.md
+user_guides/xde/xde.md
+user_guides/inspector/inspector.md
+user_guides/draw_test_harness/draw_test_harness.md
 
-dev_guides/contribution_workflow/contribution_workflow.md
-dev_guides/documentation/documentation.md
-dev_guides/contribution/coding_rules.md
-dev_guides/git_guide/git_guide.md
-dev_guides/tests/tests.md
-dev_guides/upgrade/upgrade.md
-dev_guides/visualization/pbr_math.md
+contribution/contribution_workflow/contribution_workflow.md
+contribution/documentation/documentation.md
+contribution/coding_rules.md
+contribution/git_guide/git_guide.md
+contribution/tests/tests.md
 
-tutorial/tutorial.md
+specification/boolean_operations/boolean_operations.md
+specification/brep_format.md
+specification/pbr_math.md

dox/build/build_3rdparty/building_3rdparty.md

@@ -0,0 +1,628 @@
+ Build 3rd-parties {#build_upgrade_building_3rdparty}
+==============================================
+@tableofcontents
+
+On Windows, the easiest way to install third-party libraries is to download archive with pre-built binaries from https://opencascade.com/content/3rd-party-components.
+On Linux and OS X, it is recommended to use the version installed in the system natively.
+
+@section dev_guides__building_3rdparty_win_1 Windows
+
+This document presents guidelines for building third-party products used by Open CASCADE Technology (OCCT) and samples on Windows platform. It is assumed that you are already familiar with MS Visual Studio / Visual C++. 
+
+You need to use the same version of MS Visual Studio for building all third-party products and OCCT itself, in order to receive a consistent set of run-time binaries. 
+
+The links for downloading the third-party products are available at https://opencascade.com/content/3rd-party-components.
+
+There are two types of third-party products used  by OCCT: 
+
+* Mandatory  products: 
+	* Tcl/Tk 8.5 -- 8.6;
+	* FreeType 2.4.10 -- 2.5.3.
+* Optional  products:
+	* TBB 3.x -- 4.x;
+	* FreeImage 3.14.1 -- 3.16.0;
+	* VTK 6.1.0.
+
+It is recommended to create a separate new folder on your workstation, where you will unpack the downloaded archives of the third-party  products, and where you will build these products (for example, *c:\\occ3rdparty*). 
+
+Further in this document, this folder is referred to as *3rdparty*. 
+
+@subsection dev_guides__building_3rdparty_win_2 Tcl/Tk
+
+Tcl/Tk is required for DRAW test harness.
+
+**Installation from sources: Tcl**
+  
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+  
+1. In the *win* sub-directory, edit file *buildall.vc.bat*:
+
+   * Edit the line "call ... vcvars32.bat" to have correct path to the version of Visual Studio to be used for building, for instance:
+
+         call "%VS80COMNTOOLS%\vsvars32.bat"
+
+     If you are building 64-bit version, set environment accordingly, e.g.:
+
+         call "%VS80COMNTOOLS%\..\..\VC\vcvarsall.bat" amd64
+     
+   * Define variable *INSTALLDIR* pointing to directory where Tcl/Tk will be installed, e.g.:
+
+         set INSTALLDIR=D:\OCCT\3rdparty\tcltk-86-32
+
+   * Add option *install* to the first command line calling *nmake*:
+
+         nmake -nologo -f makefile.vc release htmlhelp install %1
+
+   * Remove second call to *nmake* (building statically linked executable)
+
+2. Edit file *rules.vc* replacing line 
+
+       SUFX	    = tsgx
+
+   by
+
+       SUFX	    = sgx
+
+   This is to avoid extra prefix 't' in the library name, which is not recognized by default by OCCT build tools.
+
+
+3. By default, Tcl uses dynamic version of run-time library (MSVCRT), which must be installed on the system where Tcl will be used.
+   You may wish to link Tcl library with static version of run-time to avoid this dependency.
+   For that:
+
+   * Edit file *makefile.vc* replacing strings "crt = -MD" by "crt = -MT"
+
+   * Edit source file *tclMain.c* (located in folder *generic*) commenting out forward declaration of function *isatty()*.
+
+
+4. In the command prompt, run *buildall.vc.bat*
+
+   You might need to run this script twice to have *tclsh* executable installed; check subfolder *bin* of specified installation path to verify this.
+
+5. For convenience of use, we recommend making a copy of *tclsh* executable created in subfolder *bin* of *INSTALLDIR* and named with Tcl version number suffix, as *tclsh.exe* (with no suffix)
+
+       > cd D:\OCCT\3rdparty\tcltk-86-32\bin
+       > cp tclsh86.exe tclsh.exe
+
+**Installation from sources: Tk**
+  
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+
+Apply the same steps as described for building Tcl above, with the same INSTALLDIR.
+Note that Tk produces its own executable, called *wish*. 
+
+You might need to edit default value of *TCLDIR* variable defined in *buildall.vc.bat* (should be not necessary if you unpack both Tcl and Tk sources in the same folder).
+
+@subsection dev_guides__building_3rdparty_win_2_2 FreeType
+
+FreeType is required for text display in a 3D viewer. You can download its sources from https://sourceforge.net/projects/freetype/files/
+
+### The building procedure
+
+1. Unpack the downloaded archive of FreeType product into the *3rdparty*  folder. As a result, you will get a folder named, for example, *3rdparty\\freetype-2.4.10*.  Further in this document, this folder is referred to as *freetype*. 
+   
+2. Open the solution file *freetype\\builds\\win32\\vc20xx\\freetype.sln*  in Visual Studio. Here *vc20xx* stands for your version of Visual Studio. 
+
+3. Select the configuration to build: either Debug or Release. 
+
+4. Build  the *freetype* project. 
+
+   As a result, you will get a  freetype import library (.lib) in the *freetype\\obj\\win32\\vc20xx*  folder.  
+
+
+5. If you build FreeType for a 64 bit platform, select in the main menu **Build - Configuration Manager**  and add *x64* platform to the solution configuration by copying the settings from Win32 platform: 
+
+   @figure{/build/build_3rdparty/images/3rdparty_image001.png}
+
+   Update the value of the Output File for  x64 configuration: 
+
+   @figure{/build/build_3rdparty/images/3rdparty_image003.png}
+
+   Build the *freetype* project. 
+
+   As a result, you will obtain a 64 bit import library (.lib) file in the *freetype\\x64\\vc20xx*  folder. 
+
+   To build FreeType as a dynamic library (.dll) follow steps 6, 7 and 8 of this procedure. 
+
+6. Open menu Project-> Properties-> Configuration  Properties-> General and change option **Configuration Type** to *Dynamic  Library (.dll)*. 
+7. Edit file *freetype\\include\\freetype\\config\\ftoption.h*:  
+  
+   in line 255, uncomment the definition of macro *FT_EXPORT* and change it as follows: 
+
+       #define FT_EXPORT(x)   __declspec(dllexport) x 
+
+8. Build  the *freetype* project. 
+
+   As a result, you will obtain the files of the import  library (.lib) and the dynamic library (.dll)   in folders <i>freetype  \\objs\\release</i> or <i>\\objs\\debug </i>. 
+   
+   If you build for a 64 bit platform, follow step 5 of the procedure. 
+
+   To facilitate the use of FreeType libraries in OCCT with minimal adjustment of build procedures, it is recommended to copy the include files and libraries of FreeType into a separate folder, named according to the pattern: *freetype-compiler-bitness-building mode*, where: 
+   * **compiler** is *vc8* or *vc9* or *vc10* or *vc11*; 
+   * **bitness**  is *32* or *64*;
+   * **building mode** is *opt* (for Release) or *deb* (for Debug). 
+    
+   The *include* subfolder should be copied as is, while libraries should be renamed to *freetype.lib* and *freetype.dll* (suffixes removed) and placed to subdirectories *lib *and  *bin*, respectively. If the Debug configuration is built, the Debug libraries should be put into subdirectories *libd* and *bind*. 
+
+
+@subsection dev_guides__building_3rdparty_win_3_1 TBB
+
+This third-party product is installed with binaries 
+from the archive that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the  release version you need  (e.g. *tbb30_018oss*) and pick the archive for Windows  platform. 
+
+Unpack the downloaded  archive of TBB product into the *3rdparty* folder. 
+
+Further in this document,  this folder is referred to as *tbb*. 
+
+@subsection dev_guides__building_3rdparty_win_3_3 FreeImage
+
+This third-party product should be built as a dynamically loadable library (.dll file). 
+You can download its sources from 
+https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+
+### The building procedure: 
+
+1. Unpack the  downloaded archive of FreeImage product into *3rdparty* folder. 
+  
+   As a result, you should have a folder named *3rdparty\\FreeImage*. 
+  
+   Rename it according to the rule: *freeimage-platform-compiler-building  mode*, where 
+   
+   * **platform**  is *win32* or *win64*; 
+   * **compiler**  is *vc8* or *vc9* or *vc10* or *vc11*; 
+   * **building  mode** is *opt* (for release) or *deb* (for debug) 
+
+   Further in this  document, this folder is referred to as *freeimage*. 
+
+2. Open the solution file *freeimage\\FreeImage.*.sln* in your Visual Studio. 
+  
+   If you use a Visual Studio version higher than VC++ 2008, apply conversion of the workspace. 
+   Such conversion should be suggested automatically by Visual  Studio. 
+    
+3. Select a  configuration to build. 
+
+   - Choose **Release**  if you are building Release binaries. 
+   - Choose **Debug** if you are building  Debug binaries. 
+
+   *Note:* 
+
+   If you want to  build a debug version of FreeImage binaries then you need to rename the following files in FreeImage and FreeimagePlus projects:
+   
+   Project -> Properties -> Configuration Properties -> Linker -> General -> Output File
+
+       FreeImage*d*.dll  to FreeImage.dll 
+       FreeImagePlus*d*.dll to FreeImagePlus.dll 
+
+   Project -> Properties -> Configuration Properties -> Linker -> Debugging-> Generate Program Database File
+
+       FreeImage*d*.pdb  to FreeImage.pdb 
+       FreeImagePlus*d*.pdb to FreeImagePlus.pdb 
+
+   Project -> Properties -> Configuration Properties -> Linker -> Advanced-Import Library
+
+       FreeImage*d*.lib  to FreeImage.lib 
+       FreeImagePlus*d*.lib  to FreeImagePlus.lib 
+
+   Project -> Properties -> Configuration Properties -> Build Events -> Post -> Build Event -> Command Line 
+
+       FreeImage*d*.dll     to FreeImage.dll 
+       FreeImage*d*.lib     to FreeImage.lib 
+       FreeImagePlus*d*.dll to FreeImagePlus.dll 
+       FreeImagePlus*d*.lib to FreeImagePlus.lib 
+
+   Additionally, rename in project FreeImagePlus 
+   
+   Project -> Properties -> Configuration  Properties -> Linker -> Input -> Additional Dependencies 
+
+       from FreeImage*d*.lib to FreeImage.lib 
+
+4. Select a platform to build. 
+
+   - Choose *Win32* if you are building for a 32 bit platform. 
+   - Choose *x64* if you are building for a 64 bit platform. 
+
+5. Start the building process. 
+
+   As a result, you should have the  library files of FreeImage product  in *freeimage\\Dist* folder (*FreeImage.dll* and *FreeImage.lib*) and in *freeimage\\Wrapper\\FreeImagePlus\\dist* folder (*FreeImagePlus.dll* and *FreeImagePlus.lib*).
+
+@subsection dev_guides__building_3rdparty_win_3_4 VTK
+
+VTK is an open-source, freely available software system for 3D computer graphics, image processing and visualization. VTK Integration Services component provides adaptation functionality for visualization of OCCT topological shapes by means of VTK library.
+
+### The building procedure:
+
+1. Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it into *3rdparty* folder.
+
+   As a result, you will get a folder named, for example, <i>3rdparty\VTK-6.1.0.</i>
+
+   Further in this document, this folder is referred to as *VTK*.
+
+2. Use CMake to generate VS projects for building the library:
+   - Start CMake-GUI and select VTK folder as source path, and the folder of your choice for VS project and intermediate build data.
+   - Click **Configure**.
+   - Select the VS version to be used from the ones you have installed (we recommend using VS 2010) and the architecture (32 or 64-bit).
+   - Generate VS projects with default CMake options. The open solution *VTK.sln* will be generated in the build folder.
+
+3. Build project VTK in Release mode.
+
+
+@section build_3rdparty_linux Linux
+
+This document presents additional guidelines for building third-party 
+products used by Open CASCADE Technology and samples on Linux platform. 
+
+The links for downloading the third-party products are available on the web site at 
+https://opencascade.com/content/3rd-party-components.
+
+There are two types of third-party products, which are  necessary to build OCCT: 
+  
+* Mandatory  products: 
+	* Tcl/Tk 8.5 - 8.6;  
+	* FreeType 2.4.10 - 2.5.3;
+* Optional  products: 
+	* TBB 3.x - 4.x;
+	* FreeImage 3.14.1 - 3.16.0;
+	* VTK 6.1.0.
+
+
+@subsection dev_guides__building_3rdparty_linux_2_1 Tcl/Tk 
+
+Tcl/Tk is required for DRAW test harness. 
+
+**Installation from sources: Tcl**
+  
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+  
+1. Enter the unix sub-directory of the directory where the Tcl source  files are located <i>(TCL_SRC_DIR)</i>. 
+
+       cd TCL_SRC_DIR/unix   
+
+2. Run the *configure* command:
+
+       configure --enable-gcc  --enable-shared --enable-threads --prefix=TCL_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the command line. 
+  
+3. If the configure command has finished successfully, start  the building process:
+  
+       make   
+
+4. If building is finished successfully, start the installation of Tcl. 
+   All binary and service files of the product will be copied to the directory defined by *TCL_INSTALL_DIR* 
+
+       make install   
+
+**Installation from sources: Tk**
+  
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+  
+1. Enter the unix sub-directory of the directory where the Tk source files are located <i>(TK_SRC_DIR)</i> 
+
+       cd TK_SRC_DIR/unix   
+
+2. Run the configure command, where <i>TCL_LIB_DIR</i> is *TCL_INSTALL_DIR/lib*.
+
+       configure --enable-gcc  --enable-shared --enable-threads --with-tcl=TCL_LIB_DIR  --prefix=TK_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the  command line. 
+
+3. If the configure command has finished successfully, start the building process: 
+
+       make   
+
+4. If the building has finished successfully, start the installation of Tk. 
+   All binary and service files of the product will be copied 
+   to the directory defined by *TK_INSTALL_DIR* (usually it is *TCL_INSTALL_DIR*) 
+
+       make install   
+
+@subsection dev_guides__building_3rdparty_linux_2_2 FreeType
+
+FreeType is required for text display in the 3D viewer. 
+Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
+  
+1. Enter the directory where the source files of FreeType  are located <i>(FREETYPE_SRC_DIR)</i>. 
+
+       cd FREETYPE_SRC_DIR   
+
+2. Run the *configure* command: 
+  
+       configure  --prefix=FREETYPE_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>CFLAGS='-m64 -fPIC'  CPPFLAGS='-m64 -fPIC'</i> option to the command line. 
+    
+3. If the *configure* command has finished successfully, start  the building process: 
+
+       make   
+
+4. If the building has finished successfully, start the installation of FreeType. 
+   All binary and service files of the product will be copied to the directory defined by *FREETYPE_INSTALL_DIR* 
+    
+       make install   
+
+    
+@subsection dev_guides__building_3rdparty_linux_3_1 TBB
+
+This third-party product is  installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the  release version you need and pick the archive for Linux platform.
+To install, unpack the downloaded archive of TBB product.
+
+@subsection dev_guides__building_3rdparty_linux_3_3 FreeImage
+
+Download the necessary archive from https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+and unpack it. The directory with unpacked sources is  further referred to as *FREEIMAGE_SRC_DIR*. 
+  
+1. Modify *FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h*: 
+   In line 60 insert the following: 
+
+       #include string.h   
+
+2. Enter the directory where the source files of FreeImage are located <i>(FREEIMAGE_SRC_DIR)</i>. 
+  
+       cd FREEIMAGE_SRC_DIR   
+
+3. Run the building process 
+  
+       make   
+
+4. Run the installation process 
+
+   a. If you have the permission to write into directories <i>/usr/include</i> and <i>/usr/lib</i>, run the following command: 
+
+          make install   
+   b. If you do not have this permission, you need to modify file *FREEIMAGE_SRC_DIR/Makefile.gnu*: 
+  
+      Change lines 7-9 from:
+  
+          DESTDIR ?= /   
+          INCDIR  ?= $(DESTDIR)/usr/include   
+          INSTALLDIR  ?= $(DESTDIR)/usr/lib   
+
+      to: 
+
+          DESTDIR  ?= $(DESTDIR)   
+          INCDIR  ?= $(DESTDIR)/include   
+          INSTALLDIR  ?= $(DESTDIR)/lib   
+
+      Change lines 65-67 from: 
+
+          install  -m 644 -o root -g root $(HEADER) $(INCDIR)   
+          install  -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)   
+          install  -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)   
+  
+      to:
+
+          install  -m 755 $(HEADER) $(INCDIR)   
+          install  -m 755 $(STATICLIB) $(INSTALLDIR)   
+          install  -m 755 $(SHAREDLIB) $(INSTALLDIR)
+
+      Change line 70 from: 
+
+          ldconfig
+
+      to:
+  
+          \#ldconfig   
+    
+   Then run the installation process by the following command: 
+
+        make DESTDIR=FREEIMAGE_INSTALL_DIR  install   
+
+5. Clean temporary files
+
+        make clean
+
+@subsection dev_guides__building_3rdparty_linux_3_4 VTK
+
+You can download VTK sources from https://www.vtk.org/VTK/resources/software.html
+
+### The building procedure:
+
+Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it.
+
+1. Install or build *cmake* product from the source file.
+2. Start *cmake* in GUI mode with the directory where the source files of *VTK* are located:
+
+       ccmake VTK_SRC_DIR
+
+   * Press <i>[c]</i> to make the  initial configuration
+   * Define the necessary options in *VTK_INSTALL_PREFIX*
+   * Press <i>[c]</i> to make the final  configuration
+   * Press <i>[g]</i> to generate  Makefile and exit
+
+3. Start the building of VTK:
+
+       make
+
+4. Start the installation of VTK. Binaries will be installed according to the *VTK_INSTALL_PREFIX* option.
+
+       make install
+
+@subsection dev_guides__building_3rdparty_linux_4 Installation From Official Repositories
+
+**Debian-based distributives**
+
+All 3rd-party products required for building of  OCCT could be installed
+from official repositories. You may install them from  console using apt-get utility:
+
+    sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libfreeimage-dev
+
+Building is possible with C++ compliant compiler:
+
+    sudo apt-get install g++
+
+@section build_3rdparty_macos Mac OS X
+
+This document presents additional guidelines for building third-party products 
+used by Open CASCADE Technology and samples on Mac OS X platform (10.6.4  and later). 
+
+The links for downloading the third-party products are available at https://opencascade.com/content/3rd-party-components.
+
+There are two types of third-party products, which are  necessary to build OCCT: 
+  
+* Mandatory  products: 
+	* Tcl/Tk 8.5 - 8.6;
+	* FreeType 2.4.10 - 2.5.3.
+* Optional  products: 
+	* TBB 3.x - 4.x;
+	* FreeImage 3.14.1 - 3.16.0
+  
+
+@subsection dev_guides__building_3rdparty_osx_2_1 Tcl/Tk 8.5 
+
+Tcl/Tk is required for DRAW test harness. Version 8.5 or  8.6 can be used with OCCT. 
+
+**Installation from sources: Tcl 8.5**
+
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+
+1. Enter the *macosx* sub-directory of the directory where the Tcl source files are located <i>(TCL_SRC_DIR)</i>. 
+
+       cd TCL_SRC_DIR/macosx   
+
+2. Run the *configure* command 
+
+       configure --enable-gcc  --enable-shared --enable-threads --prefix=TCL_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the command line. 
+
+3. If the *configure* command has finished successfully, start the building process 
+
+       make   
+  
+4. If building is finished successfully, start the installation of Tcl. 
+   All binary and service files of the product will be copied to the directory defined by *TCL_INSTALL_DIR*. 
+
+       make install   
+
+**Installation from sources: Tk 8.5**
+
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+
+1. Enter the *macosx* sub-directory of the directory where the  source files of Tk are located <i>(TK_SRC_DIR)</i>. 
+
+       cd TK_SRC_DIR/macosx   
+
+2. Run the *configure* command, where TCL_LIB_DIR is  TCL_INSTALL_DIR/lib 
+
+       configure --enable-gcc --enable-shared --enable-threads --with-tcl=TCL_LIB_DIR --prefix=TK_INSTALL_DIR   
+
+	For a 64 bit platform also add <i>--enable-64bit</i> option to the  command line. 
+
+3. If the *configure* command has finished successfully, start the building process:
+
+       make   
+
+4. If the building has finished successfully, start the  installation of Tk. All binary and service files of the product will be copied to the directory defined by *TK_INSTALL_DIR* (usually it is TCL_INSTALL_DIR) 
+
+       make install   
+
+@subsection dev_guides__building_3rdparty_osx_2_2 FreeType 2.4.10
+  
+FreeType is required for text display in the 3D viewer. 
+
+Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
+
+1. Enter the directory where the source files of FreeType  are located <i>(FREETYPE_SRC_DIR)</i>. 
+
+       cd FREETYPE_SRC_DIR   
+
+2. Run the *configure* command 
+  
+       configure  --prefix=FREETYPE_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>CFLAGS='-m64 -fPIC'  CPPFLAGS='-m64 -fPIC'</i> option to the command line. 
+
+3. If the *configure* command has finished successfully, start  the building process 
+
+       make   
+
+4. If building has finished successfully, start the installation of FreeType. 
+   All binary and service files of the product will be copied to the directory defined by *FREETYPE_INSTALL_DIR*.
+
+       make install   
+    
+@subsection dev_guides__building_3rdparty_osx_3_1 TBB 3.x or 4.x
+
+This third-party product is installed with binaries from the archive 
+that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the release version you need (e.g. *tbb30_018oss*) 
+and  pick the archive for Mac OS X platform. 
+To install, unpack the downloaded archive of TBB 3.0 product (*tbb30_018oss_osx.tgz*).
+
+@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage 3.14.1 or 3.15.x
+
+Download the necessary archive from 
+https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+and unpack it. The directory with unpacked sources is  further referred to as *FREEIMAGE_SRC_DIR*.  
+
+Note that for building FreeImage on Mac OS X 10.7 you should replace *Makefile.osx* 
+in *FREEIMAGE_SRC_DIR* by the corrected file, which you can find in attachment to issue #22811 in OCCT Mantis bug tracker 
+(https://tracker.dev.opencascade.org/file_download.php?file_id=6937&type=bug).
+
+1. If you build FreeImage 3.15.x you can skip this  step. 
+   Modify <i>FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h:</i> 
+  
+   In line 60 insert the following: 
+
+       #include string.h 
+
+   Modify <i>FREEIMAGE_SRC_DIR/Source/FreeImage/PluginTARGA.cpp:</i> 
+  
+   In line 320 replace: 
+
+       SwapShort(value); 
+
+   with: 
+
+       SwapShort(&value); 
+
+2. Enter the directory where the source files of FreeImage  are located <i>(FREEIMAGE_SRC_DIR)</i>. 
+
+       cd FREEIMAGE_SRC_DIR 
+
+3. Run the building process 
+
+       make   
+
+4. Run the installation process 
+   
+   1. If you have the permission to write into <i>/usr/local/include</i>  and <i>/usr/local/lib</i> directories, run the following command: 
+
+          make install   
+
+   2. If you do not have this permission, you need to modify file *FREEIMAGE_SRC_DIR/Makefile.osx*: 
+
+      Change line 49 from:     
+
+          PREFIX ?= /usr/local
+
+      to:
+   
+          PREFIX  ?= $(PREFIX) 
+
+      Change lines 65-69 from: 
+
+          install -d -m 755 -o  root -g wheel $(INCDIR) $(INSTALLDIR) 
+          install  -m 644 -o root -g wheel $(HEADER) $(INCDIR) 
+          install  -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) 
+          ranlib  -sf $(INSTALLDIR)/$(STATICLIB) 
+          ln  -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) 
+    
+      to: 
+
+          install  -d $(INCDIR) $(INSTALLDIR) 
+          install  -m 755 $(HEADER) $(INCDIR) 
+          install  -m 755 $(STATICLIB) $(INSTALLDIR) 
+          install  -m 755 $(SHAREDLIB) $(INSTALLDIR) 
+          ln  -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)  
+          ln  -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+
+      Then run the installation process by the following command: 
+  
+          make PREFIX=FREEIMAGE_INSTALL_DIR  install 
+  
+5. Clean temporary files 
+  
+       make clean 

dox/build/build_documentation/building_documentation.md

@@ -0,0 +1,19 @@
+Build Documentation {#build_upgrade__building_documentation}
+=================
+
+To generate HTML documentation from sources contained in *dox* subdirectory, 
+you need to have Tcl and Doxygen 1.8.5 (or above) installed on your system.
+
+Use script **gendoc** (batch file on Windows, shell script on Linux / Mac OSX) to generate documentation.
+
+To generate Overview documentation:
+
+    cmd> gendoc -overview
+
+To generate Reference manual:
+
+    cmd> gendoc -refman
+
+Run this command without arguments to get help on supported options.
+
+See @ref occt_contribution__documentation for prerequisites and details on OCCT documentation system.

dox/build/build_occt/building_occt.md

@@ -0,0 +1,581 @@
+Build OCCT {#build_upgrade__building_occt}
+===================
+
+@tableofcontents
+
+@note Before building OCCT, make sure to have all required third-party libraries installed.
+The list of required libraries depends on what OCCT modules will be used, and your preferences.
+The typical minimum is **Freetype** (necessary for Visualization) and **Tcl/Tk** (for DRAW).
+See @ref intro_req "requirements on 3rdparty libraries" for a full list.
+On OS X we recommend to use native libraries.
+
+@section build_occt_windows Windows
+
+@subsection build_occt_win_cmake Building with CMake tool
+
+This article describes the **CMake**-based build process, which is now suggested as a standard way to produce the binaries of Open CASCADE Technology from sources. *OCCT requires CMake version 2.8.12 or later*.
+
+Here we describe the build procedure on the example of Windows platform with Visual Studio 2010. 
+However, CMake is cross-platform and can be used to build OCCT on Linux and OS X in essentially the same way.
+
+@note Before you start, make sure to have installed all 3-rd party products that you are going to use with OCCT; see @ref build_upgrade.
+
+@subsubsection build_cmake_start Start CMake
+
+CMake is a tool that generates the actual project files for the selected target build system (e.g. Unix makefiles) or IDE (e.g. Visual Studio 2010).
+
+For unexperienced users we recommend to start with *cmake-gui* -- a cross-platform GUI tool provided by CMake on Windows, Mac and Linux.
+A command-line alternative, *ccmake*  can also be used.
+
+CMake deals with three directories: source, build or binary and installation.
+
+* The source directory is where the sources of OCCT are located in your file system;
+* The build or binary directory is where all files created during CMake configuration and generation process will be located. The mentioned process will be described below.
+* The installation directory is where binaries will be installed after building the *INSTALL* project that is created by CMake generation process, along with header files and resources required for OCCT use in applications. 
+
+The good practice is not to use the source directory as a build one.
+Different configurations should be built in different build directories to avoid conflicts. 
+It is however possible to choose one installation directory for several configurations of OCCT (differentiated by platform, bitness, compiler and build type), for example:
+      
+    d:/occt/                   -- the source directory
+    d:/tmp/occt-build-vc10-x64 -- the build directory with the generated
+                                  solution and other intermediate files created during a CMake tool working
+    d:/occt-install            -- the installation directory that is
+                                  able to contain several OCCT configurations
+
+@subsubsection build_cmake_conf Configuration process
+
+If the command-line tool is used, run the tool from the build directory with a single argument indicating the source (relative or absolute path) directory:
+
+    cd d:/tmp/occt-build-vc10-x64
+    ccmake d:/occt
+
+@figure{/build/build_occt/images/cmake_image000.png}
+
+Press *c* to configure.
+
+All actions required in the configuration process with the GUI tool will be described below.
+
+If the GUI tool is used, run this tool without additional arguments and after that specify the source directory by clicking **Browse Source** and the build (binary) one by clicking **Browse Build**.
+
+@figure{/build/build_occt/images/cmake_image001.png}
+
+**Note**: Each configuration of the project should be built in its own directory. When building multiple configurations it is recommended to indicate in the name of build directories the system, bitness and compiler (e.g., <i>d:/occt/build/win32-vc10</i> ).
+
+Once the source and build directories are selected, "Configure" button should be pressed in order to start manual configuration process. It begins with selection of a target configurator. It is "Visual Studio 10 2010 Win64" in our example.
+
+@figure{/build/build_occt/images/cmake_image002.png}
+
+To build OCCT for **Universal Windows Platform (UWP)** specify the path to toolchain file for cross-compiling <i>d:/occt/adm/templates/uwp.toolchain.config.cmake</i>.
+
+Alternatively, if you are using CMake from the command line add options -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 .
+
+**Note**: Universal Windows Platform (UWP) is supported only on "Visual Studio 14 2015". File <i>d:/occt/samples/xaml/ReadMe.md</i> describes the building procedure of XAML (UWP) sample.
+
+Once "Finish" button is pressed, the first pass of the configuration process is executed. At the end of the process, CMake outputs the list of environment variables, which have to be properly specified for successful configuration. 
+
+@figure{/build/build_occt/images/cmake_image003.png}
+
+The error message provides some information about these variables. This message will appear after each pass of the process until all required variables are specified correctly.
+
+The change of the state of some variables can lead to the appearance of new variables. The new variables appeared after the pass of the configuration process are highlighted with red color by CMake GUI tool.
+
+Note: There is "grouped" option, which groups variables with a common prefix.
+
+The following table gives the full list of environment variables used at the configuration stage:
+
+| Variable | Type | Purpose |
+|----------|------|---------|
+| CMAKE_BUILD_TYPE | String | Specifies the build type on single-configuration generators (such as make).  Possible values are Debug, Release and RelWithDebInfo |
+| USE_FREEIMAGE | Boolean flag | Indicates whether FreeImage product should be used in OCCT visualization module for support of popular graphics image formats (PNG, BMP, etc.) |
+| USE_RAPIDJSON | Boolean flag | Indicates whether RapidJSON product should be used in OCCT Data Exchange module for support of glTF mesh file format |
+| USE_TBB | Boolean flag | Indicates whether TBB 3rd party is used or not. TBB stands for Threading Building Blocks, the technology of Intel Corp, which comes with different mechanisms and patterns for injecting parallelism into your application. OCCT remains parallel even without TBB product |
+| USE_VTK | Boolean flag | Indicates whether VTK 3rd party is used or not. VTK stands for Visualization ToolKit, the technology of Kitware Inc intended for general-purpose scientific visualization. OCCT comes with a bridge between CAD data representation and VTK by means of its dedicated VIS component (VTK Integration Services). You may skip this 3rd party unless you are planning to use VTK visualization for OCCT geometry. See the official documentation @ref occt_user_guides__vis for the details on VIS |
+| 3RDPARTY_DIR | Path | Defines the root directory where all required 3rd party products will be searched. Once you define this path it is very convenient to click "Configure" button in order to let CMake automatically detect all necessary products|
+| 3RDPARTY_FREETYPE_* | Path | Path to Freetype binaries |
+| 3RDPARTY_TCL_* 3RDPARTY_TK_* | Path | Path to Tcl/Tk binaries |
+| 3RDPARTY_FREEIMAGE* | Path | Path to Freeimage binaries |
+| 3RDPARTY_TBB* | Path | Path to TBB binaries |
+| 3RDPARTY_VTK_* | Path | Path to VTK binaries |
+| BUILD_MODULE_<MODULE>| Boolean flag | Indicates whether the corresponding OCCT module should be built or not. It should be noted that some toolkits of a module can be built even if this module is not checked (this happens if some other modules depend on these toolkits). The main modules and their descriptions can be found in @ref user_guides |
+| BUILD_LIBRARY_TYPE | String |  Specifies the type of library to be created. "Shared" libraries are linked dynamically and loaded at runtime. "Static" libraries are archives of object files used when linking other targets. Note that Draw Harness plugin system is incompatible with "Static" builds, and therefore it is disabled for these builds.|
+| BUILD_ADDITIONAL_TOOLKITS | String | Semicolon-separated individual toolkits to include into build process. If you want to build some particular libraries (toolkits) only, then you may uncheck all modules in the corresponding *BUILD_MODUE_\<MODULE\>* options and provide the list of necessary libraries here. Of course, all dependencies will be resolved automatically |
+| BUILD_YACCLEX | Boolean flag | Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and ExprIntrp functionality are generated automatically with Flex/Bison. Checking this option leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files |
+| BUILD_SAMPLES_MFC | Boolean flag | Indicates whether MFC samples should be built together with OCCT. This option is only relevant to Windows platforms |
+| BUILD_SAMPLES_QT | Boolean flag | Indicates whether QT samples should be built together with OCCT. |
+| BUILD_Inspector | Boolean flag | Indicates whether Inspector should be built together with OCCT. |
+| BUILD_DOC_Overview | Boolean flag | Indicates whether OCCT overview documentation project should be created together with OCCT. It is not built together with OCCT. Checking this option leads to automatic search of Doxygen binaries. Its building calls Doxygen command to generate the documentation in HTML format |
+| BUILD_PATCH | Path | Points to the directory recognized as a "patch" for OCCT. If specified, the files from this directory take precedence over the corresponding native OCCT sources. This way you are able to introduce patches to Open CASCADE Technology not affecting the original source distribution |
+| BUILD_WITH_DEBUG | Boolean flag | Enables extended messages of many OCCT algorithms, usually printed to cout. These include messages on internal errors and special cases encountered, timing, etc. |
+| BUILD_ENABLE_FPE_SIGNAL_HANDLER | Boolean flag | Enable/Disable the floating point exceptions (FPE) during DRAW execution only. Corresponding environment variable (CSF_FPE) can be changed manually in custom.bat/sh scripts without regeneration by CMake. |
+| CMAKE_CONFIGURATION_TYPES | String | Semicolon-separated CMake configurations |
+| INSTALL_DIR | Path | Points to the installation directory. *INSTALL_DIR* is a synonym of *CMAKE_INSTALL_PREFIX*. The user can specify both *INSTALL_DIR* or *CMAKE_INSTALL_PREFIX* |
+| INSTALL_DIR_BIN | Path | Relative path to the binaries installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_BIN}) |
+| INSTALL_DIR_SCRIPT | Path | Relative path to the scripts installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}) |
+| INSTALL_DIR_LIB | Path | Relative path to the libraries installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_LIB}) |
+| INSTALL_DIR_INCLUDE | Path | Relative path to the includes installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_INCLUDE}) |
+| INSTALL_DIR_RESOURCE | Path | Relative path to the resources installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_RESOURCE}) |
+| INSTALL_DIR_LAYOUT | String | Defines the structure of OCCT files (binaries, resources, headers, etc.) for the install directory. Two variants are predefined: for Windows (standard OCCT layout) and for Unix operating systems (standard Linux layout). If needed, the layout can be customized with INSTALL_DIR_* variables |
+| INSTALL_DIR_DATA | Path | Relative path to the data files installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_DATA}) |
+| INSTALL_DIR_SAMPLES | Path | Relative path to the samples installation directory. Note that only "samples/tcl" folder will be installed. (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}) |
+| INSTALL_DIR_TESTS | Path | Relative path to the tests installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_TESTS}) |
+| INSTALL_DIR_DOC | Path | Relative path to the documentation installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_DOC}) |
+| INSTALL_FREETYPE | Boolean flag | Indicates whether Freetype binaries should be installed into the installation directory |
+| INSTALL_FREEIMAGE* | Boolean flag | Indicates whether Freeimage binaries should be installed into the installation directory |
+| INSTALL_TBB | Boolean flag | Indicates whether TBB binaries should be installed into the installation directory |
+| INSTALL_VTK | Boolean flag | Indicates whether VTK binaries should be installed into the installation directory |
+| INSTALL_TCL | Boolean flag | Indicates whether TCL binaries should be installed into the installation directory |
+| INSTALL_TEST_CASES | Boolean flag | Indicates whether non-regression OCCT test scripts should be installed into the installation directory |
+| INSTALL_DOC_Overview | Boolean flag | Indicates whether OCCT overview documentation should be installed into the installation directory |
+
+**Note:** Only the forward slashes ("/") are acceptable in the CMake options defining paths.
+
+@subsubsection build_cmake_3rdparty 3rd party search mechanism
+
+If *3RDPARTY_DIR* directory is defined, then required 3rd party binaries are sought in it, and default system folders are ignored.
+
+The procedure expects to find binary and header files of each 3rd party product in its own sub-directory: *bin*, *lib* and *include*.
+
+The results of the search (achieved on the next pass of the configuration process) are recorded in the corresponding variables:
+
+* *3RDPARTY_\<PRODUCT\>_DIR* -- path to the 3rdparty directory (with directory name) (e.g. <i>D:/3rdparty/tcltk-86-32</i>)
+* *3RDPARTY_\<PRODUCT\>_LIBRARY_DIR* -- path to the directory containing a library (e.g. <i>D:/3rdparty/tcltk-86-32/lib</i>). 
+* *3RDPARTY_\<PRODUCT\>_INCLUDE_DIR* -- path to the directory containing a header file (e.g., <i>D:/3rdparty/tcltk-86-32/include</i>)
+* *3RDPARTY_\<PRODUCT\>_DLL_DIR* -- path to the directory containing a shared library (e.g., <i>D:/3rdparty/tcltk-86-32/bin</i>) This variable is only relevant to Windows platforms.
+
+Note: each library and include directory should be children of the product directory if the last one is defined.
+
+The search process is as follows:
+
+1. Common path: *3RDPARTY_DIR*
+2. Path to a particular 3rd-party library: *3RDPARTY_\<PRODUCT\>_DIR*
+3. Paths to headers and binaries:
+   1. *3RDPARTY_\<PRODUCT\>_INCLUDE_DIR*
+   2. *3RDPARTY_\<PRODUCT\>_LIBRARY_DIR*
+   3. *3RDPARTY_\<PRODUCT\>_DLL_DIR*
+
+If a variable of any level is not defined (empty or <i> \<variable name\>-NOTFOUND </i>) and the upper level variable is defined, the content of the non-defined variable will be sought at the next configuration step. If the search process at level 3 does not find the required files, it seeks in default places.
+
+If a search result (include path, or library path, or dll path) does not meet your expectations, you can change *3RDPARTY_\<PRODUCT\>_*_DIR variable*, clear (if they are not empty) *3RDPARTY_\<PRODUCT\>_DLL_DIR, 3RDPARTY_\<PRODUCT\>_INCLUDE_DIR* and 3RDPARTY_\<PRODUCT\>_LIBRARY_DIR variables (or clear one of them) and run the configuration process again.
+
+At this time the search will be performed in the newly identified directory 
+and the result will be recorded to corresponding variables (replace old value if it is necessary).
+
+For example, *3RDPARTY_FREETYPE_DIR* variable 
+
+    d:/3rdparty/freetype-2.4.10
+
+can be changed to 
+
+    d:/3rdparty/freetype-2.5.3
+
+During the configuration process the related variables (*3RDPARTY_FREETYPE_DLL_DIR*, *3RDPARTY_FREETYPE_INCLUDE_DIR* and *3RDPARTY_FREETYPE_LIBRARY_DIR*) will be filled with new found values.
+
+**Note**: The names of searched libraries and header files are hard-coded. If there is the need to change their names, change appropriate cmake variables (edit CMakeCache.txt file or edit in cmake-gui in advance mode) without reconfiguration: *3RDPARTY_\<PRODUCT\>_INCLUDE* for include, *3RDPARTY_\<PRODUCT\>_LIB* for library and *3RDPARTY_\<PRODUCT\>_DLL* for shared library.
+
+@subsubsection build_cmake_gen Projects generation
+
+Once the configuration process is done, the "Generate" button is used to prepare project files for the target IDE.
+In our exercise the Visual Studio solution will be automatically created in the build directory.
+
+@subsubsection build_cmake_build Building
+
+Go to the build folder, start the Visual Studio solution *OCCT.sln* and build it by clicking **Build -> Build Solution**.
+
+@figure{/build/build_occt/images/cmake_image004.png}
+
+By default the build solution process skips the building of the INSTALL and Overview project.
+
+When the building process is finished build:
+* Overview project to generate OCCT overview documentation (if BUILD_DOC_Overview variable is checked)
+* the *INSTALL* project to run **the installation process**
+
+For this, right-click on the *Overview/INSTALL* project and select **Project Only -> Build Only** -> *Overview/INSTALL* in the solution explorer. 
+
+@subsubsection build_cmake_install Installation
+
+Installation is a process of extracting redistributable resources (binaries, include files etc) from the build directory into the installation one. The installation directory will be free of project files, intermediate object files and any other information related to the build routines. 
+
+Normally you use the installation directory of OCCT to link against your specific application. 
+
+The directory structure is as follows:
+    
+    data            -- data files for OCCT (brep, iges, stp)
+    doc             -- OCCT overview documentation in HTML format
+    inc             -- header files
+    samples         -- samples
+    src             -- all required source files for OCCT
+    tests           -- OCCT test suite
+    win32\vc10\bind -- binary files (installed 3rdparties and occt)
+              \libd -- libraries (installed 3rdparties and occt)
+
+**Note:** The above example is given for debug configuration. However, it is generally safe to use the same installation directory for the release build. In the latter case the contents of install directory will be enriched with subdirectories and files related to the release configuration. In particular, the binaries directory win64 will be expanded as
+follows:
+
+    \win32\vc10\bind
+               \libd
+               \bin
+               \lib
+
+If CMake installation flags are enabled for the 3rd party products (e.g. INSTALL_FREETYPE), then the corresponding binaries will be copied to the same bin(d) and lib(d) directories together with the native binaries of OCCT. Such organization of libraries can be especially helpful if your OCCT-based software does not use itself the 3rd parties of Open CASCADE Technology (thus, there is no sense to pack them into dedicated directories).
+
+The installation folder contains the scripts to run *DRAWEXE* (*draw.bat* or *draw.sh*), samples (if they were installed) and overview.html (short-cut for installed OCCT overview documentation).
+
+@subsection build_occt_win_codeblocks Building with Code::Blocks
+
+This file describes steps to build OCCT libraries from sources using **Code::Blocks**, a cross-platform IDE, using project files generated by OCCT legacy tool **genproj**.
+It can be used as an alternative to CMake build system (see @ref build_occt_win_cmake) for all supported platforms.
+
+@subsubsection build_codeblocks_3rdparty Third-party libraries
+
+Before building OCCT, make sure to have all the needed third-party libraries installed, see @ref build_upgrade.
+
+@subsubsection build_codeblocks_conf Configuration
+
+Before building it is necessary to set up build environment.
+
+The environment is defined in the file *custom.sh* (on Linux and OS X) or *custom.bat* (on Windows) which can be edited directly:
+
+* Add paths to includes of used third-party libraries in variable *CSF_OPT_INC*. 
+* Add paths to their binary libraries in variable  *CSF_OPT_LIB64*.
+* Set variable *SHORTCUT_HEADERS* to specify a method for population of folder *inc* by header files. Supported methods are:
+  * *Copy* - headers will be copied from *src*;
+  * *ShortCut* - short-cut header files will be created, redirecting to same-named header located in *src*;
+  * "HardLink* - hard links to headers located in *src* will be created.
+* For optional  third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*,  e.g.:
+~~~~~
+       export HAVE_FREEIMAGE=false
+~~~~~
+
+Alternatively, or when *custom.sh* or *custom.bat* does not exist, you can launch **genconf** tool to configure environment interactively:
+
+@figure{/build/build_occt/images/genconf_linux.png}
+
+Click "Save" to store the specified configuration in *custom.sh* or *custom.bat* file.
+  
+@subsubsection build_codeblocks_gen Projects generation
+
+Launch **genproj** tool with option *cbp* to update content of *inc* folder and generate project files after changes in OCCT code affecting layout or composition of source files:
+
+~~~~~
+  $ cd /dev/OCCT/opencascade-7.0.0
+  $ ./genproj cbp
+~~~~~
+
+The generated Code::Blocks project are placed into subfolder *adm/&lt;OS&gt;/cbp*.
+
+@note To use **genproj** and **genconf** tools you need to have Tcl installed and accessible by PATH.
+
+@subsubsection build_codeblocks_build Building
+
+To start **Code::Blocks**, launch script *codeblocks.sh*.
+
+To build all toolkits, click **Build->Build workspace** in the menu bar.
+
+To start *DRAWEXE*, which has been built with **Code::Blocks** on Mac OS X, run the script
+~~~~~
+   ./draw.sh cbp [d]
+~~~~~
+Option *d* is used if OCCT has been built in **Debug** mode.
+
+@subsection build_occt_genproj Building with Genproj tool
+
+This page describes steps to build OCCT libraries from a complete source archive on Windows with <b>MS Visual C++</b> using projects generated by **genproj** tool. 
+It is an alternative to use of CMake build system (see @ref build_occt_win_cmake).
+
+**genproj** is a legacy tool (originated from command "wgenproj" in WOK) for generation of Visual Studio, Code.Blocks, and XCode project files used for building Open CASCADE Technology.
+These project files are placed inside OCCT directory (in *adm* subfolder) and use relative paths, thus can be moved together with sources.
+
+The project files included in official distribution of OCCT are generated by this tool.
+If you have official distribution with project files included, you can use them directly without a need to call **genproj**.
+
+@subsubsection build_msvc_3rdparty Third-party libraries
+
+Before building OCCT, make sure to have all the required third-party libraries installed.
+
+The easiest way to install third-party libraries is to download archive with pre-built binaries, corresponding to version of Visual Studio you are using, from https://opencascade.com/content/3rd-party-components.
+
+You can also build third-party libraries from their sources, see @ref build_upgrade_building_3rdparty for instructions.
+
+@subsubsection build_msvc_conf Configuration
+
+If you have Visual Studio projects already available (pre-installed or generated), you can edit file *custom.bat* manually to adjust the environment:
+
+* *VCVER* -- specification of format of project files, defining also version of Visual Studio to be used, and default name of the sub-folder for binaries:
+
+| VCVER     | Visual Studio version | Windows Platform                 | Binaries folder name |
+|-----------|-----------------------|----------------------------------|----------------------|
+| vc10      | 2010 (10)             | Desktop (Windows API)            | vc10 |
+| vc11      | 2012 (11)             | Desktop (Windows API)            | vc11 |
+| vc12      | 2013 (12)             | Desktop (Windows API)            | vc12 |
+| vc14      | 2015 (14)             | Desktop (Windows API)            | vc14 |
+| vc14-uwp  | 2015 (14)             | UWP (Universal Windows Platform) | vc14-uwp |
+| vc141     | 2017 (15)             | Desktop (Windows API)            | vc14 |
+| vc141-uwp | 2017 (15)             | UWP (Universal Windows Platform) | vc14-uwp |
+| vc142     | 2019 (16)             | Desktop (Windows API)            | vc14 |
+| vc142-uwp | 2019 (16)             | UWP (Universal Windows Platform) | vc14-uwp |
+
+* *ARCH* -- architecture (32 or 64), affects only *PATH* variable for execution
+* <i>HAVE_*</i> -- flags to enable or disable use of optional third-party products
+* <i>CSF_OPT_*</i> -- paths to search for includes and binaries of all used  third-party products
+* *SHORTCUT_HEADERS* -- defines method for population of folder *inc* by header files. Supported methods are:
+  * *Copy* - headers will be copied from *src*;
+  * *ShortCut* - short-cut header files will be created, redirecting to same-named header located in *src*;
+  * "HardLink* - hard links to headers located in *src* will be created.
+
+Alternatively, you can launch **genconf**, a GUI tool allowing to configure build options interactively.
+That tool will analyze your environment and propose you to choose available options:
+
+* Version of Visual Studio to be used (from the list of installed ones, detected by presence of environment variables like *VS100COMNTOOLS*).
+* Method to populate folder *inc* (short-cuts by default).
+* Location of third-party libraries (usually downloaded from OCCT web site, see above).
+* Path to common directory where third-party libraries are located (optional).
+* Paths to headers and binaries of the third-party libraries (found automatically basing on previous options; click button "Reset" to update).
+* Generation of PDB files within Release build ("Release with Debug info", false by default).
+
+@figure{/build/build_occt/images/genconf_windows.png}
+
+Click "Save" to store the specified configuration in *custom.bat* file.
+  
+@subsubsection build_msvc_generate Projects generation
+
+Launch **genproj** to update content of *inc* folder and generate project files after changes in OCCT code affecting layout or composition of source files.
+
+@note To use **genproj** and **genconf** tools you need to have Tcl installed and accessible by PATH.
+If Tcl is not found, the tool may prompt you to enter the path to directory where Tcl can be found.
+ 
+~~~~~
+  $ genproj.bat
+~~~~~
+
+Note that if *custom.bat* is not present, **genproj** will start **genconf** to configure environment.
+
+@subsubsection build_msvc_build Building
+
+Launch *msvc.bat* to start Visual Studio with all necessary environment variables defined, and build the whole solution or required toolkits.
+
+Note: the MSVC project files are located in folders <i>adm\\msvc\\vc...</i>.
+Binaries are produced in *win32* or *win64* folders.
+
+To start DRAW, launch *draw.bat*.
+
+@section build_occt_linux Linux
+
+You may choose one of the following ways to generate, configure and build OCCT sources on Linux just keeping in mind 
+this platform specific:
+
+* @ref build_occt_win_cmake "Configuration, generation and building OCCT on Windows using CMake tool"
+* @ref build_occt_code_blocks "Building on Mac OS X with Code::Blocks IDE"
+
+@section build_occt_crossplatform_cmake Android (cross-compiling)
+
+This article describes the steps to build OCCT libraries for Android from a complete source package
+with GNU make (makefiles). The steps on Windows 7 and Ubuntu 15.10 are similar. There is the only one difference:
+ makefiles are built with mingw32-make
+on Windows and native GNU make on Ubuntu.
+
+Required tools (download and install if it is required):
+  - CMake v3.0+ http://www.cmake.org/cmake/resources/software.html
+  - Cross-compilation toolchain for CMake https://github.com/taka-no-me/android-cmake
+  - Android NDK rev.10+ https://developer.android.com/tools/sdk/ndk/index.html
+  - GNU Make: MinGW v4.82+ for Windows (http://sourceforge.net/projects/mingw/files/), GNU Make 4.0 for Ubuntu. 
+
+Run GUI tool provided by CMake.
+
+@subsection build_occt_crossplatform_cmake_config Configuration
+
+**Configure Tools**
+  - Specify the root folder of OCCT (<i>$CASROOT</i>, which contains *CMakelists.txt* file) by clicking **Browse Source**.
+  - Specify the location (build folder) for Cmake generated project files by clicking **Browse Build**.
+
+@figure{/build/build_occt/images/android_image001.png}
+
+Click **Configure** button. It opens the window with a drop-down list of generators supported by CMake project.
+
+Select "MinGW MakeFiles" item from the list
+  - Choose "Specify toolchain file for cross-compiling"
+  - Click "Next"
+@figure{/build/build_occt/images/android_image002.png}
+
+  - Specify a toolchain file at the next dialog by android.toolchain.cmake . It is contained by cross-compilation 
+toolchain for CMake
+  - Click "Finish"
+@figure{/build/build_occt/images/android_image003.png}
+
+If ANDROID_NDK environment variable is not defined in current OS, add cache entry ANDROID_NDK (entry type is PATH) -- 
+path to the NDK folder ("Add Entry" button)
+@figure{/build/build_occt/images/android_image004.png}
+
+If on Windows the message is appeared: "CMake Error: CMake was unable to find a build program corresponding 
+to "MinGW Makefiles"
+CMAKE_MAKE_PROGRAM is not set.  You probably need to select a different build tool.",
+specify **CMAKE_MAKE_PROGRAM** to mingw32-make executable.
+@figure{/build/build_occt/images/android_image005.png}
+
+**Configure OCCT**
+
+How to configure OCCT, see "OCCT Configuration" section of @ref build_occt_win_cmake 
+"Configure, Generate, Build using CMake tool" taking into account the specific configuration variables for android:
+  - ANDROID_ABI = armeabi-v7a
+  - ANDROID_NATIVE_API_LEVEL = 15
+  - ANDROID_NDK_LAYOUT is equal to CMAKE_BUILD_TYPE variable
+  - **BUILD_MODULE_Draw = OFF**
+
+@figure{/build/build_occt/images/android_image006.png}
+
+@subsection build_occt_crossplatform_cmake_generation Generate Makefiles
+
+Click **Generate** button and wait until the generation process is finished. 
+Then makefiles will appear in the build folder (e.g. <i> D:/tmp/occt-android </i>).
+
+@subsection build_occt_crossplatform_cmake_building Build Makefiles
+
+Open console and go to the build folder. Type "mingw32-make" (Windows) or "make" (Ubuntu) to start build process.
+
+> mingw32-make
+or
+> make
+
+Parallel building can be started with using **"-jN"** argument of "mingw32-make/make", where N is the number of
+ building threads.
+
+> mingw32-make -j4
+or
+> make -j4
+
+@subsection build_occt_crossplatform_cmake_install Install OCCT Libraries
+
+Type "mingw32-make/make" with argument "install" to place the libraries to the install folder
+
+> mingw32-make install
+or
+> make install
+
+@section build_occt_macos Mac OS X
+
+@subsection build_occt_macos_xcode Building with Xcode
+
+This file describes steps to build OCCT libraries from sources on Mac OS X with **Xcode** projects, generated by OCCT legacy tool **genproj**.
+
+<h2>Configuration</h2>
+
+Before building it is necessary to set up build environment.
+
+The environment is defined in the file *custom.sh* which can be edited directly:
+
+* Add paths to includes of used third-party libraries in variable *CSF_OPT_INC* (use colon ":" as path separator).
+* Add paths to their binary libraries in variable  *CSF_OPT_LIB64*.
+* Set variable *SHORTCUT_HEADERS* to specify a method for population of folder *inc* by header files. Supported methods are:
+  * *Copy* - headers will be copied from *src*;
+  * *ShortCut* - short-cut header files will be created, redirecting to same-named header located in *src*;
+  * "HardLink* - hard links to headers located in *src* will be created.
+* For optional  third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*,  e.g.:
+~~~~~
+       export HAVE_GL2PS=false
+~~~~~
+
+Alternatively, or when *custom.sh* does not exist, you can launch *genconf.sh* to configure environment interactively:
+
+@figure{/build/build_occt/images/genconf_osx.png}
+
+Click "Save" to store the specified configuration in *custom.sh* file.
+  
+<h2>Projects generation</h2>
+
+Launch **genproj** tool to update content of *inc* folder and generate project files after changes in OCCT code affecting layout or composition of source files.
+
+@note To use **genproj** and **genconf** tools you need to have Tcl installed and accessible by PATH.
+
+For instance, in Terminal application:
+
+~~~~~
+  $ cd /dev/OCCT/opencascade-7.0.0
+  $ ./genproj
+~~~~~
+
+<h2>Building</h2>
+
+To start **Xcode**, launch script *xcode.sh*.
+
+To build a certain toolkit, select it in **Scheme** drop-down list in Xcode toolbar, press **Product** in the menu and click **Build** button. 
+
+To build the entire OCCT:
+* Create a new empty project (select **File -> New -> Project -> Empty project** in the menu; input the project name, e.g. *OCCT*; then click **Next** and **Create**).
+* Drag and drop the *OCCT* folder in the created *OCCT* project in the Project navigator.
+* Select **File -> New -> Target -> Aggregate** in the menu. 
+* Enter the project name (e.g. *OCCT*) and click **Finish**. The **Build Phases** tab will open.  
+* Click "+" button to add the necessary toolkits to the target project. It is possible to select all toolkits by pressing **Command+A** combination. 
+
+<h2>Launching DRAW</h2>
+
+To start *DRAWEXE*, which has been built with Xcode on Mac OS X, perform the following steps:
+
+1.Open Terminal application
+
+2.Enter <i>\<OCCT_ROOT_DIR\></i>:
+~~~~~
+   cd \<OCCT_ROOT_DIR\>
+~~~~~
+
+3.Run the script
+~~~~~
+   ./draw_cbp.sh xcd [d]
+~~~~~
+
+Option *d* is used if OCCT has been built in **Debug** mode.
+
+@subsection build_occt_code_blocks Building with Code::Blocks
+
+This file describes steps to build OCCT libraries from sources using **Code::Blocks**, a cross-platform IDE, using 
+project files generated by OCCT legacy tool **genproj**.
+
+<h2>Configure</h2>
+
+Before building it is necessary to set up build environment.
+
+The environment is defined in the file *custom.sh* (on Linux and OS X) or *custom.bat* (on Windows) which can be edited 
+directly:
+
+* Add paths to includes of used third-party libraries in variable *CSF_OPT_INC*. 
+* Add paths to their binary libraries in variable  *CSF_OPT_LIB64*.
+* Set variable *SHORTCUT_HEADERS* to specify a method for population of folder *inc* by header files. Supported methods are:
+  * *Copy* - headers will be copied from *src*;
+  * *ShortCut* - short-cut header files will be created, redirecting to same-named header located in *src*;
+  * "HardLink* - hard links to headers located in *src* will be created.
+* For optional  third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*,  e.g.:
+~~~~~
+       export HAVE_GL2PS=false
+~~~~~
+
+Alternatively, or when *custom.sh* or *custom.bat* does not exist, you can launch **genconf** tool to configure
+ environment interactively:
+
+@figure{/build/build_occt/images/genconf_linux.png}
+
+Click "Save" to store the specified configuration in *custom.sh* or *custom.bat* file.
+  
+<h2>Generate Projects</h2>
+
+Launch **genproj** tool with option *cbp* to update content of *inc* folder and generate project files after changes in 
+OCCT code affecting layout or composition of source files:
+
+~~~~~
+  $ cd /dev/OCCT/opencascade-7.0.0
+  $ ./genproj cbp
+~~~~~
+
+The generated Code::Blocks project are placed into subfolder *adm/&lt;OS&gt;/cbp*.
+
+@note To use **genproj** and **genconf** tools you need to have Tcl installed and accessible by PATH.
+
+<h2>Build</h2>
+
+To start **Code::Blocks**, launch script *codeblocks.sh*.
+
+To build all toolkits, click **Build->Build workspace** in the menu bar.
+
+To start *DRAWEXE*, which has been built with **Code::Blocks** on Mac OS X, run the script
+~~~~~
+   ./draw_cbp.sh cbp [d]
+~~~~~
+Option *d* is used if OCCT has been built in **Debug** mode.

dox/build/build_upgrade.md

@@ -0,0 +1,10 @@
+Build, Debug and Upgrade {#build_upgrade}
+=================
+
+This chapter contains the detailed information about building, debugging and upgrade procedures:
+
+* @subpage build_upgrade__building_occt
+* @subpage build_upgrade_building_3rdparty
+* @subpage build_upgrade__building_documentation
+* @subpage occt__debug
+* @subpage occt__upgrade

dox/contribution/coding_rules.md

@@ -1,4 +1,4 @@
-Coding Rules {#occt_dev_guides__coding_rules}
+Coding Rules {#occt_contribution__coding_rules}
 ======================================
 
 @tableofcontents

dox/contribution/contribution.md

@@ -0,0 +1,10 @@
+Contribution {#contribution}
+============
+
+This chapter contains the detailed information about contribution procedure:
+
+* @subpage occt_contribution__contribution_workflow
+* @subpage occt_contribution__git_guide
+* @subpage occt_contribution__coding_rules
+* @subpage occt_contribution__tests
+* @subpage occt_contribution__documentation

dox/contribution/contribution_workflow/contribution_workflow.md

@@ -1,4 +1,4 @@
-Contribution Workflow {#occt_dev_guides__contribution_workflow}
+Contribution Workflow {#occt_contribution__contribution_workflow}
 ====================================
 @tableofcontents 
 
@@ -144,11 +144,12 @@ Change of layout or re-formatting of the existing code is allowed only in the pa
 
 @note If deemed useful, re-formatting or cosmetic changes affecting considerable parts of the code can be made within a dedicated issue.
 
-The changes should comply with the OCCT @ref occt_dev_guides__coding_rules "Codng Rules". 
+The changes should comply with the OCCT @ref occt_contribution__coding_rules "Codng Rules". 
 It is especially important to comment the code properly so that other people can understand it easier.
 
 The modification should be tested by running OCCT tests (on the platform and scope available to **Developer**) and ensuring absence of regressions.
-In case if modification affects results of some existing test case and the new result is correct, such test case should be updated to report OK (or BAD), as descibed in @ref testmanual_details_results "Automated Test System / Interpretation of Test Results".
+In case if modification affects results of some existing test case and the new result is correct,
+such test case should be updated to report OK (or BAD), as described in @ref testmanual_details_results "Automated Test System / Interpretation of Test Results".
       
 @subsubsection occt_contribution_workflow_fix_test Providing a test case
 
@@ -163,9 +164,9 @@ When the test case cannot be provided for any reason, the maximum possible infor
 
 If the change affects a functionality described in @ref user_guides "User Guides", the corresponding user guide should be updated to reflect the change.
 
-If the change affects OCCT test system, build environment, or development tools described in @ref dev_guides "Developer Guides", the corresponding guide should be updated.
+If the change affects OCCT test system, build environment, or development tools described in @ref build_upgrade "Build, Debug and Upgrade" or @ref contribution "Contribution", the corresponding guide should be updated.
  
-The changes that break compatibility with the previous versions of OCCT (i.e. affecting API or behavior of existing functionality in the way that may require update of existing applications based on an earlier official release of OCCT to work correctly) should be described in the document @ref occt_dev_guides__upgrade "Upgrade from previous OCCT versions".
+The changes that break compatibility with the previous versions of OCCT (i.e. affecting API or behavior of existing functionality in the way that may require update of existing applications based on an earlier official release of OCCT to work correctly) should be described in the document @ref occt__upgrade "Upgrade from previous OCCT versions".
 It is recommended to add a sub-section for each change described.
 The description should provide the explanation of the incompatibility introduced by the change, and describe how it can be resolved (at least, in known situations).
 When feasible, the automatic upgrade procedure (adm/upgrade.tcl) can be extended by a new option to perform the required upgrade of the dependent code automatically. 
@@ -183,7 +184,7 @@ In case if the fix is implemented on the previous release of OCCT, the branch ca
 The branch name should be composed of letters **CR** (abbreviation of "Change Request") followed by the issue ID number (without leading zeros). 
 It is possible to add an optional suffix to the branch name after the issue ID, e.g. to distinguish between several versions of the fix (see @ref occt_contribution_nonstd_rebase).
 
-See @ref occt_dev_guides__git_guide "Guide to using GIT" for help.
+See @ref occt_contribution__git_guide "Guide to using GIT" for help.
 
 @note When a branch with the name given according to the above rule is pushed to Git, a note is automatically added to the corresponding issue in Mantis, indicating the person who has made the push, the commit hash, and (for new commits) the description.
   
@@ -226,7 +227,7 @@ The possible variants are:
 
 @subsection occt_contribution_workflow_review Code review
 
-The **Reviewer** analyzes the proposed solution for applicability in accordance with OCCT @ref occt_dev_guides__coding_rules "Coding Rules" and examines all changes in the sources, test case(s), and documentation to detect obvious and possible errors, misprints, or violations of the coding style. 
+The **Reviewer** analyzes the proposed solution for applicability in accordance with OCCT @ref occt_contribution__coding_rules "Coding Rules" and examines all changes in the sources, test case(s), and documentation to detect obvious and possible errors, misprints, or violations of the coding style. 
 
 If the Reviewer detects some problems, he can either:
 

dox/contribution/documentation/documentation.md

@@ -1,10 +1,26 @@
- Documentation System {#occt_dev_guides__documentation}
+ Documentation System {#occt_contribution__documentation}
 ======================
 
 @tableofcontents
 
 @section  OCCT_DM_SECTION_1 Introduction
 
+OCCT documentation is provided in several forms:
+
+- This overview provides general description of OCCT structure, functionality, modules, and features. 
+  It is available in HTML format (generated by Doxygen) and includes User and Developer Guides.
+  The sources of this documentation are contained in **dox** subdirectory of OCCT sources 
+  (plain text format is used, with mixed MarkDown / Doxygen syntax mark-up).
+
+- User and Developer Guides describing in details OCCT modules and development tools are also available in 
+  Adobe Portable Document Format (PDF). To read this format, you need Adobe Acrobat Reader, 
+  which is a freeware and can be downloaded from the Adobe site. 
+
+- Full reference documentation covering all OCCT classes generated automatically by Doxygen 
+  software is provided in HTML format. 
+  Reference documentation is presented in **Modules --> Toolkits --> Packages --> Classes** 
+  logic structure with cross-references to all OCCT classes and complete in-browser search by all classes.
+
 This document provides practical guidelines for generation and editing of OCCT user documentation.
 
 @section  OCCT_DM_SECTION_2 Prerequisites
@@ -30,7 +46,7 @@ You can use *custom.bat* file to add necessary paths to the *PATH* variable.
 Note that in the process of PDF generation MiKTeX may need some packages not installed by default.
 We recommend setting option "Install missing packages on-the-fly" to "Ask me first" (default) during MiKTeX installation:
 
-@figure{/dev_guides/documentation/images/documentation_miktex.png,"",320}
+@figure{/contribution/documentation/images/documentation_miktex.png,"",320}
 
 On the first run of **pdflatex** it will open a dialog window prompting for installation of missing packages.
 Follow the instructions to proceed (define proxy settings if needed, select a mirror site to download from, etc.).
@@ -102,7 +118,7 @@ The MarkDown files have a <i>*.md</i> extension and are based on rules described
 
 @subsection  OCCT_DM_SECTION_3_2 Directory Structure
 
-@figure{/dev_guides/documentation/images/documentation_folders.png,"",160}
+@figure{/contribution/documentation/images/documentation_folders.png,"",160}
 
 Each document has its own folder if there are any images used in it. These images are stored in *images* subfolder.
 
@@ -112,7 +128,7 @@ If you want to use the same image for several documents, you can place it in *do
 
 
 @verbatim
-@figure{/dev_guides/documentation/images/documentation_test_image.svg,"",420}
+@figure{/contribution/documentation/images/documentation_test_image.svg,"",420}
 @endverbatim
 
 
@@ -122,16 +138,16 @@ The documentation is generated in subfolder *doc* :
 
 @section  OCCT_DM_SECTION_4 Adding a New Document
 
-Place a new document in the folder taking into account its logical position in the documentation hierarchy. For instance, the document *svn.md* about the use of SVN to work with OCCT source code can be placed into <i>/dox/dev_guides/</i>. 
+Place a new document in the folder taking into account its logical position in the documentation hierarchy. For instance, the document *svn.md* about the use of SVN to work with OCCT source code can be placed into <i>/dox/contribution/</i>. 
 
 If there are images in the document, it should be placed in its own folder containing a subfolder for images. For instance:
-* <i> /dox/dev_guides/svn/ </i> -- for *svn.md* file;
-* <i> /dox/dev_guides/svn/images/ </i> -- for images.
+* <i> /dox/contribution/svn/ </i> -- for *svn.md* file;
+* <i> /dox/contribution/svn/images/ </i> -- for images.
 
 Add a relative path to *svn.md* in file <i>dox/FILES.txt</i>. For instance
 
 @verbatim
-dev_guides/svn/svn.md
+contribution/svn/svn.md
 @endverbatim
 
 **Note** that the order of paths to documents in *FILES.txt* is reproduced in the Table of Contents in the HTML output, thus they need to be placed logically.
@@ -154,7 +170,7 @@ http://www.stack.nl/~dimitri/doxygen/manual
 A document file in *.md format must start with a proper header defining a caption and a unique tag.
 
 @verbatim
-Documentation System {#dev_guides__documentation}
+Documentation System {#contribution__documentation}
 =====================
 @endverbatim
 
@@ -399,12 +415,12 @@ Captions are included below the image; in PDF output the images with caption are
 Example:
 
 @verbatim
-  @figure{/dev_guides/documentation/images/documentation_test_image.svg,"Test SVG image"}
+  @figure{/contribution/documentation/images/documentation_test_image.svg,"Test SVG image"}
 @endverbatim
 
 is rendered as:
 
-@figure{/dev_guides/documentation/images/documentation_test_image.svg,"Test SVG image",320}
+@figure{/contribution/documentation/images/documentation_test_image.svg,"Test SVG image",320}
 
 We recommend using **Inkscape** for creation and edition of vector graphics.
 The graphics created in MS Word Draw and some other vector editors can be copy-pasted to Inkscape and saved as SVG images.

dox/contribution/git_guide/git_guide.md

@@ -1,4 +1,4 @@
-Guide to installing and using Git for OCCT development {#occt_dev_guides__git_guide}
+Guide to installing and using Git for OCCT development {#occt_contribution__git_guide}
 =================================
 
 @tableofcontents 
@@ -17,7 +17,7 @@ Guide to installing and using Git for OCCT development {#occt_dev_guides__git_gu
   For the experienced Git users it can be enough to read sections 1 and 3
    of this document to start working with the repository.
    
-  Familiarize yourselves with the @ref occt_dev_guides__contribution_workflow "Contribution Workflow document"  
+  Familiarize yourselves with the @ref occt_contribution__contribution_workflow "Contribution Workflow document"  
   that describes how Git is used for processing contributions to OCCT.
   
   This and related documents are available at the Resources page 
@@ -143,7 +143,7 @@ The official repository contains:
   - Extension: <code>.svg</code>
   - External program: <code>&lt;path_to_OCCT&gt;\\adm\\svgdiff.bat %%base %%mine %%bname %%yname</code>
 
-@figure{OCCT_GitGuide_V2_svgdiff.png,"",709}
+@figure{OCCT_GitGuide_V2_svgdiff.png,"",320}
 
 @subsection occt_gitguide_2_2 Linux platform