Merge branch 'master' into fix_flipedge

FreeCAD · Aug 2, 2023 · 272dc91 · 272dc91
2 parents 3523efe + a8ea4e5
commit 272dc91
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,7 +105,7 @@ if(MSVC AND FREECAD_LIBPACK_USE AND LIBPACK_FOUND)
     CopyLibpackDirectories()
 endif()
 
-if (BUILD_TEST)
+if (ENABLE_DEVELOPER_TESTS)
     add_subdirectory(tests)
 endif()
 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 [Blog](https://blog.freecad.org)
 
 
-[![Release](https://img.shields.io/github/release/freecad/freecad.svg)](https://github.com/freecad/freecad/releases/latest) [![Master][freecad-master-status]][gitlab-branch-master] [![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad) [![Gitter](https://img.shields.io/gitter/room/freecad/freecad.svg)](https://gitter.im/freecad/freecad?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Liberapay](https://img.shields.io/liberapay/receives/FreeCAD.svg?logo=liberapay)](https://liberapay.com/FreeCAD)
+[![Release](https://img.shields.io/github/release/freecad/freecad.svg)](https://github.com/freecad/freecad/releases/latest) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad) [![Liberapay](https://img.shields.io/liberapay/receives/FreeCAD.svg?logo=liberapay)](https://liberapay.com/FreeCAD)
 
 <img src="https://user-images.githubusercontent.com/1828501/174066870-1692005b-f8d7-43fb-a289-6d2f07f73d7f.png" width="800"/>
 
@@ -53,19 +53,6 @@ For development releases check the [weekly-builds page](https://github.com/FreeC
 
 Other options are described at the [wiki Download page](https://wiki.freecad.org/Download).
 
-Build Status
-------------
-
-| Master | 0.20 | Translation |
-|:------:|:----:|:-----------:|
-|[![Master][freecad-master-status]][gitlab-branch-master]|[![0.20][freecad-0.20-status]][gitlab-branch-0.20]|[![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad)|
-
-[freecad-0.20-status]: https://gitlab.com/freecad/FreeCAD-CI/badges/releases/FreeCAD-0-20/pipeline.svg
-[freecad-master-status]: https://gitlab.com/freecad/FreeCAD-CI/badges/master/pipeline.svg
-[gitlab-branch-0.20]: https://gitlab.com/freecad/FreeCAD-CI/-/commits/releases/FreeCAD-0-20
-[gitlab-branch-master]: https://gitlab.com/freecad/FreeCAD-CI/-/commits/master
-[travis-builds]: https://travis-ci.org/FreeCAD/FreeCAD/builds
-
 Compiling
 ---------
 

diff --git a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
@@ -133,6 +133,7 @@ macro(InitializeFreeCADBuildOptions)
     option(BUILD_SURFACE "Build the FreeCAD surface module" ON)
     option(BUILD_VR "Build the FreeCAD Oculus Rift support (need Oculus SDK 4.x or higher)" OFF)
     option(BUILD_CLOUD "Build the FreeCAD cloud module" OFF)
+    option(ENABLE_DEVELOPER_TESTS "Build the FreeCAD unit tests suit" ON)
 
     if(MSVC)
         option(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)

diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
@@ -76,7 +76,7 @@ macro(PrintFinalReport)
     value(CMAKE_CXX_STANDARD)
     value(CMAKE_CXX_FLAGS)
     value(CMAKE_BUILD_TYPE)
-    value(BUILD_TEST)
+    value(ENABLE_DEVELOPER_TESTS)
     value(FREECAD_USE_FREETYPE)
     value(FREECAD_USE_EXTERNAL_SMESH)
     value(BUILD_SMESH)

diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake
@@ -23,7 +23,7 @@ if(BUILD_GUI)
         list (APPEND FREECAD_QT_COMPONENTS Designer)
     endif()
 endif()
-if (BUILD_TEST)
+if (ENABLE_DEVELOPER_TESTS)
     list (APPEND FREECAD_QT_COMPONENTS Test)
 endif ()
 

diff --git a/package/fedora/freecad.spec b/package/fedora/freecad.spec
@@ -232,7 +232,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS
 %endif
        -DPACKAGE_WCREF="%{release} (Git)" \
        -DPACKAGE_WCURL="git://github.com/%{github_name}/FreeCAD.git master" \
-       -DBUILD_TEST=FALSE \
+       -DENABLE_DEVELOPER_TESTS=FALSE \
        ../
 
 make fc_version

diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
@@ -2530,11 +2530,21 @@ void Application::setStyleSheet(const QString& qssFile, bool tiledBackground)
 void Application::checkForDeprecatedSettings()
 {
     // From 0.21, `FCBak` will be the intended default backup format
-    // TODO: Check for `FCStd#` and warn user.
-    bool useFCBakExtension = App::GetApplication().GetParameterGroupByPath
-        ("User parameter:BaseApp/Preferences/Document")->GetBool("UseFCBakExtension", true);
-    if (!useFCBakExtension) {
-        Base::Console().Warning("`.FCStd#` backup format is deprecated from 0.21 and may be removed in future versions. Please use `.FCBak` instead.\n");
+    bool makeBackups = App::GetApplication()
+                           .GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document")
+                           ->GetBool("CreateBackupFiles", true);
+    if (makeBackups) {
+        bool useFCBakExtension =
+            App::GetApplication()
+                .GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document")
+                ->GetBool("UseFCBakExtension", true);
+        if (!useFCBakExtension) {
+            // TODO: This should be translated
+            Base::Console().Warning("The `.FCStd#` backup format is deprecated as of v0.21 and may "
+                                    "be removed in future versions.\n"
+                                    "To update, check the 'Preferences->General->Document->Use "
+                                    "date and FCBak extension' option.\n");
+        }
     }
 }