feat(prefs): dev build defaults and skip version migration
Some checks failed
Build and Test / build (pull_request) Has been cancelled

- Set PACKAGE_VERSION_SUFFIX to "dev" so isDevelopmentVersion()
  returns true for local and CI dev builds.  Release build scripts
  (build.sh, build.bat) override this to "" via cmake -D flag.
- Skip the version migration dialog for dev builds in
  DlgVersionMigrator::exec(), alongside the existing
  usingCustomDirectories() check.
- Set UserParameterTemplate to the KindredCreate preference pack so
  first-run installs start with the Catppuccin Mocha theme defaults
  instead of bare FreeCAD defaults.
This commit is contained in:
2026-02-12 12:06:48 -06:00
parent 9a31a579b2
commit 2b0c6774c0
5 changed files with 11 additions and 3 deletions

View File

@@ -66,7 +66,7 @@ set(FREECAD_VERSION "${FREECAD_VERSION_MAJOR}.${FREECAD_VERSION_MINOR}.${FREECAD
set(PACKAGE_VERSION_MAJOR ${KINDRED_CREATE_VERSION_MAJOR})
set(PACKAGE_VERSION_MINOR ${KINDRED_CREATE_VERSION_MINOR})
set(PACKAGE_VERSION_PATCH ${KINDRED_CREATE_VERSION_PATCH})
set(PACKAGE_VERSION_SUFFIX "") # either "dev" for development snapshot or "" (empty string)
set(PACKAGE_VERSION_SUFFIX "dev") # cleared to "" by release build scripts
set(PACKAGE_BUILD_VERSION "0") # used when the same version will be re-released
set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")

View File

@@ -29,6 +29,7 @@ cmake ^
-D Python3_EXECUTABLE:FILEPATH="%PYTHON%" ^
-D SMESH_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%/include/smesh" ^
-D SMESH_LIBRARY:FILEPATH="%LIBRARY_PREFIX%/lib/SMESH.lib" ^
-D PACKAGE_VERSION_SUFFIX:STRING="" ^
-B build ^
-S .
if %ERRORLEVEL% neq 0 exit 1

View File

@@ -51,6 +51,7 @@ cmake \
-D Python_EXECUTABLE:FILEPATH="$PYTHON" \
-D Python3_EXECUTABLE:FILEPATH="$PYTHON" \
-D BUILD_DYNAMIC_LINK_PYTHON:BOOL=OFF \
-D PACKAGE_VERSION_SUFFIX:STRING="" \
-B build \
-S .

View File

@@ -182,6 +182,10 @@ int DlgVersionMigrator::exec()
if (App::Application::directories()->usingCustomDirectories()) {
return 0;
}
// Dev builds share a single config directory; skip versioned migration
if (App::Application::isDevelopmentVersion()) {
return 0;
}
if (!isCurrentVersionKnown()) {
calculateMigrationSize();
QDialog::exec();

View File

@@ -199,11 +199,13 @@ int main(int argc, char** argv)
App::Application::Config()["StartWorkbench"] = "PartDesignWorkbench";
// App::Application::Config()["HiddenDockWindow"] = "Property editor";
App::Application::Config()["SplashAlignment"] = "Bottom|Left";
App::Application::Config()["SplashTextColor"] = "#cdd6f4"; // Catppuccin Mocha text
App::Application::Config()["SplashTextColor"] = "#cdd6f4"; // Catppuccin Mocha text
App::Application::Config()["SplashWarningColor"] = "#f38ba8"; // Catppuccin Mocha red
App::Application::Config()["SplashInfoColor"] = "#a6adc8"; // Catppuccin Mocha subtext0
App::Application::Config()["SplashInfoColor"] = "#a6adc8"; // Catppuccin Mocha subtext0
App::Application::Config()["SplashInfoPosition"] = "6,75";
App::Application::Config()["DesktopFileName"] = "net.kindredsystems.KindredCreate";
App::Application::Config()["UserParameterTemplate"]
= "data/Gui/PreferencePacks/KindredCreate/KindredCreate.cfg";
try {
// Init phase ===========================================================