Merge branch 'OpenCPN:master' into master

.circleci/config.yml

@@ -6,13 +6,14 @@ jobs:
   build-bookworm:
     docker:
       - image: leamas/debian-git:bookworm
-      # bookworm-scm fails on non-existing /etc/apt/sources.list
-      # - image: buildpack-deps:bookworm-scm
+        # bookworm-scm fails on non-existing /etc/apt/sources.list
+        # - image: buildpack-deps:bookworm-scm
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PW
     environment:
       - OCPN_TARGET: bookworm
+      - PACKAGE_BRANCH: ci/bookworm-backports
     steps:
       - checkout
       - run: cat /etc/apt/sources.list
@@ -36,8 +37,8 @@ jobs:
   build-jammy:
     docker:
       - image: leamas/ubuntu-git:jammy
-      # jammy-scm fails on missing sudo
-      # - image: buildpack-deps:jammy-scm
+        # jammy-scm fails on missing sudo
+        # - image: buildpack-deps:jammy-scm
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PW
@@ -57,14 +58,18 @@ jobs:
     environment:
       - OCPN_TARGET: flatpak
     steps:
+      # We maintain two caches, one for even build numbers and one for odd.
+      # flatpak-builder knows about what can be used in the cache, we just
+      # make sure that we always save existing data
       - run: cd ~; git clone "$CIRCLE_REPOSITORY_URL" -b "$CIRCLE_BRANCH"
-      - run: ci/docker-auth.sh
+      # - run: echo "CIRCLE_BUILD_NUM: $CIRCLE_BUILD_NUM"
+      - run: echo $((CIRCLE_BUILD_NUM % 2)) > .buildstamp
       - restore_cache:
-          keys:
-            - fp-cache-v3-{{checksum "flatpak/org.opencpn.OpenCPN.yaml"}}
+          key: fp-v1-{{checksum ".buildstamp"}}
       - run: ci/circleci-build-flatpak.sh
+      - run: echo $(((CIRCLE_BUILD_NUM + 1) % 2)) > .buildstamp
       - save_cache:
-          key: fp-cache-v3-{{checksum "flatpak/org.opencpn.OpenCPN.yaml"}}
+          key: fp-v1-{{checksum ".buildstamp"}}
           paths:
             - build/.flatpak-builder/cache
             - build/.flatpak-builder/ccache
@@ -86,42 +91,42 @@ jobs:
     macos:
       xcode: "13.3.1"
     environment:
-      - OCPN_TARGET:  macos
+      - OCPN_TARGET: macos
       - pkg_mod: 11
       - MACOSX_DEPLOYMENT_TARGET: 11.0
     steps:
       - checkout
       - restore_cache:
-         keys:
-           - macos-cache-v2-{{checksum "ci/generic-build-macos.sh"}}
+          keys:
+            - macos-cache-v2-{{checksum "ci/generic-build-macos.sh"}}
       - run: ci/generic-build-macos.sh
       - save_cache:
-         key: macos-cache-v2-{{checksum "ci/generic-build-macos.sh"}}
-         paths:
-           - /usr/local/bin
-           - /usr/local/include
-           - /usr/local/lib
+          key: macos-cache-v2-{{checksum "ci/generic-build-macos.sh"}}
+          paths:
+            - /usr/local/bin
+            - /usr/local/include
+            - /usr/local/lib
       - run: ci/generic-upload.sh
 
   build-macos-universal:
     macos:
       xcode: "15.1.0"
     environment:
-      - OCPN_TARGET:  macos
+      - OCPN_TARGET: macos
       - pkg_mod: 11
       - MACOSX_DEPLOYMENT_TARGET: 11.0
     steps:
       - checkout
       - restore_cache:
-         keys:
-           - macos-cache-v2-universal-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}}
+          keys:
+            - macos-cache-v2-universal-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}}
       - run: ci/universal-build-macos.sh
       - save_cache:
-         key: macos-cache-v2-universal-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}}
-         paths:
-           - /usr/local/bin
-           - /usr/local/include
-           - /usr/local/lib
+          key: macos-cache-v2-universal-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}}
+          paths:
+            - /usr/local/bin
+            - /usr/local/include
+            - /usr/local/lib
       - run: ci/generic-upload.sh
 
   build-macos-intel-legacy:
@@ -140,21 +145,21 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-         keys:
-           - macos-cache-v2-intel-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}}
+          keys:
+            - macos-cache-v2-intel-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}}
       - run: ci/universal-build-macos.sh
       - save_cache:
-         key: macos-cache-v2-intel-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}}
-         paths:
-           - /usr/local/bin
-           - /usr/local/include
-           - /usr/local/lib
+          key: macos-cache-v2-intel-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}}
+          paths:
+            - /usr/local/bin
+            - /usr/local/include
+            - /usr/local/lib
       - run: ci/generic-upload.sh
 
 std-filters: &std-filters
   filters:
     branches:
-     only:
+      only:
         - master
         - build
         - flatpak

.github/workflows/windows.yaml

@@ -64,7 +64,7 @@ jobs:
         run: |
           set -x
           cd build
-          cmake --install .
+          cmake --build . --config $CONFIGURATION --target install
           cmake --build . --config $CONFIGURATION --target run-tests
 
       - name: Upload

.gitignore

@@ -4,7 +4,6 @@
 *~
 .DS_Store
 .idea
-.pre-commit-config.yaml
 .vs
 .vscode
 build
@@ -17,5 +16,6 @@ cache
 crowdin.yaml
 cscope.files
 cscope.out
+data/doc/local/*
 index.sh
 tags

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "flatpak/org.opencpn.OpenCPN"]
+	path = flatpak/org.opencpn.OpenCPN
+	url = https://github.com/flathub/org.opencpn.OpenCPN.git
+	branch = ci

.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+    -   id: check-yaml
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+-   repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v18.1.8
+    hooks:
+    -   id: clang-format
+        exclude: (?x)^( libs.*| data.*)$