Merge V8_4_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a11858e04346dcfb4637c56cb7db850f1ee49334..2d452241cfe370415e906b9fe9aeaa6eda564cd2 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/bin/appliskel/salome b/bin/appliskel/salome
index d44507d2c29f6d535090710a1740e3cfd4609def..37430157e53cbb61bdf70a6172c84e08fe3eb741 100755 (executable)
--- a/bin/appliskel/salome
+++ b/bin/appliskel/salome
@@ -23,7 +23,7 @@ def main(args):
     appliPath = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
     proc = subprocess.Popen([os.path.join(appliPath, '.salome_run')] + args, close_fds=True)
     out, err = proc.communicate()
-    return out, err, proc.returncode
+    sys.exit(proc.returncode)
 
 if __name__ == "__main__":
     main(sys.argv[1:])

diff --git a/src/Basics/Basics_OCCTVersion.hxx b/src/Basics/Basics_OCCTVersion.hxx
index e7ca523c8dca981fd333b4a963e359fde2b4c5b4..ce73b22fa38275fe92d45006e7cdc23455cacbd6 100644 (file)
--- a/src/Basics/Basics_OCCTVersion.hxx
+++ b/src/Basics/Basics_OCCTVersion.hxx
@@ -28,8 +28,6 @@
 
 #include <Standard_Version.hxx>
 
-#include <Standard_DefineHandle.hxx>
-
 //
 // NOTE: Since version 6.7.0 OCC_VERSION_DEVELOPMENT macro in the Standard_Version.hxx
 // points to the development status of the OCCT version: for example "dev", "alpha",
@@ -50,15 +48,4 @@
 #  endif
 #endif
 
-// temporary code for backward compatibility with OCCT
-#if OCC_VERSION_MAJOR < 7
-  #define OCCT_DEFINE_STANDARD_RTTIEXT(C1,C2) DEFINE_STANDARD_RTTI(C1)
-  #define OCCT_IMPLEMENT_STANDARD_RTTIEXT(C1,C2) \
-          IMPLEMENT_STANDARD_HANDLE(C1,C2) \
-          IMPLEMENT_STANDARD_RTTIEXT(C1,C2)
-#else
-  #define OCCT_DEFINE_STANDARD_RTTIEXT(C1,C2) DEFINE_STANDARD_RTTIEXT(C1,C2)
-  #define OCCT_IMPLEMENT_STANDARD_RTTIEXT(C1,C2) IMPLEMENT_STANDARD_RTTIEXT(C1,C2)
-#endif
-
 #endif // BASICS_OCCTVERSION_HXX