Update for sublibs

.circleci/config.yml

@@ -29,48 +29,48 @@ workflows:
 ## --------------------
 ## OpenCPN 5.8 Plugins
 ## ----------------------
-        - build-android-arm64:
-             <<: *std-filters
-        - build-android-armhf:
-             <<: *std-filters
-        - build-flatpak-aarch64-2208:
-            <<: *std-filters
-        - build-flatpak-x86-2208:
-            <<: *std-filters
-        - build-flatpak-aarch64-2408:
-            <<: *std-filters
-        - build-flatpak-x86-2408:
-            <<: *std-filters
-        - build-msvc-wx32-2022:
-            <<: *std-filters
-        - build-debian-arm64-12-bookworm:
-            <<: *std-filters
-        - build-debian-armhf-12-bookworm:
-            <<: *std-filters
-        - build-debian-x86_64-12-bookworm:
-            <<: *std-filters
-        - build-debian-armhf-11-bullseye:
-            <<: *std-filters
-        - build-debian-arm64-11-bullseye:
-            <<: *std-filters
-        - build-debian-x86_64-11-bullseye:
-            <<: *std-filters
+# #        - build-android-arm64:
+#              <<: *std-filters
+#         - build-android-armhf:
+#              <<: *std-filters
+#         - build-flatpak-aarch64-2208:
+#             <<: *std-filters
+#         - build-flatpak-x86-2208:
+#             <<: *std-filters
+#         - build-flatpak-aarch64-2408:
+#             <<: *std-filters
+#         - build-flatpak-x86-2408:
+#             <<: *std-filters
+#         - build-msvc-wx32-2022:
+#             <<: *std-filters
+#         - build-debian-arm64-12-bookworm:
+#             <<: *std-filters
+#         - build-debian-armhf-12-bookworm:
+#             <<: *std-filters
+#         - build-debian-x86_64-12-bookworm:
+#             <<: *std-filters
+#         - build-debian-armhf-11-bullseye:
+#             <<: *std-filters
+#         - build-debian-arm64-11-bullseye:
+#             <<: *std-filters
+#         - build-debian-x86_64-11-bullseye:
+#             <<: *std-filters
 ## KEEP needed for Jammy with wx32
-        - build-ubuntu-x86_64-2204-jammy:
-            <<: *std-filters
+#        - build-ubuntu-x86_64-2204-jammy:
+#            <<: *std-filters
         - build-macos-universal:
               <<: *std-filters
 
 ## -------------------------------------------
 ## OpenCPN 5.6.2 Plugins  Frozen - 28/05/2023
 ## ------------------------------------------
 ## Circleci will not build for macos 11 so removed - 18/10/2023
-        - build-macos:
-             <<: *std-filters
-        - build-msvc-2022:
-            requires: # Avoid building in parallel and causing choco propblems
-              - build-msvc-wx32-2022
-            <<: *std-filters
+#        - build-macos:
+#             <<: *std-filters
+#        - build-msvc-2022:
+#            requires: # Avoid building in parallel and causing choco propblems
+#              - build-msvc-wx32-2022
+#            <<: *std-filters
 
 orbs:
     cloudsmith: cloudsmith/cloudsmith@1.0.4

CMakeLists.txt

@@ -64,7 +64,7 @@ set(LONG_DESCRIPTION
 
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "1")
-set(VERSION_PATCH "162")
+set(VERSION_PATCH "165")
 set(VERSION_TWEAK "0")
 set(VERSION_DATE "11/12/2024") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov58")
@@ -86,12 +86,13 @@ set(ALPHA "alpha") # Standard Repos
 # Set if  Cloudsmith Base Repository name does not match your Git Repository
 # name. set(CLOUDSMITH_BASE_REPOSITORY "${GIT_REPOSITORY_NAME}")
 # set(CLOUDSMITH_BASE_REPOSITORY "opencpn-plugins")  #Ricks's customization
-set(CLOUDSMITH_BASE_REPOSITORY "crowdsource") # without the pi
+set(CLOUDSMITH_BASE_REPOSITORY "crowdsource_pi") # without the pi
 
 # Set the following to use OpenCPN cloudsmith repositories instead of own
 # repositories
-set(CLOUDSMITH_USER "egil-moller")
-# set(CLOUDSMITH_USER "jon-gough")
+#set(CLOUDSMITH_USER "egil-moller")
+#set(CLOUDSMITH_USER "opencpn")
+set(CLOUDSMITH_USER "jon-gough")
 
 set(XML_INFO_URL
     "https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi"

cmake/fix-macos-libs.sh

@@ -6,15 +6,18 @@
 
 readonly RUNTIME_PATH="@executable_path/../Frameworks/"
 
-plugin=$(find . -maxdepth 1 -name '*.dylib')
-for lib in $(otool -L "$plugin" | awk ' /wx/ {print $1}'); do
-    libdir=${lib%/*}
-    if [ "$libdir" = "$lib" ]; then
-        continue
-    elif [ "$libdir" != "$RUNTIME_PATH" ]; then
-        runtime_lib=$(echo $lib | sed "s|$libdir|$RUNTIME_PATH|")
-        install_name_tool -change "$lib" "$runtime_lib" "$plugin"
-    fi
+echo "Fixing maxos library paths in $(pwd)..."
+find . -name '*.dylib' | while read plugin; do
+    echo "    Fixing library $plugin..."
+    for lib in $(otool -L "$plugin" | awk ' /wx/ {print $1}'); do
+        libdir=${lib%/*}
+        if [ "$libdir" = "$lib" ]; then
+            continue
+        elif [ "$libdir" != "$RUNTIME_PATH" ]; then
+            runtime_lib=$(echo $lib | sed "s|$libdir|$RUNTIME_PATH|")
+            install_name_tool -change "$lib" "$runtime_lib" "$plugin"
+        fi
+    done
+    echo "fix-macos-libs.sh: Revised library paths:"
+    otool -L "$plugin" | grep wx
 done
-echo "fix-macos-libs.sh: Revised library paths:"
-otool -L "$plugin" | grep wx