From c4e4d97ae8cd9a914cabe432f26b7654a6b55337 Mon Sep 17 00:00:00 2001 From: Egil Date: Tue, 14 Jan 2025 14:59:37 +0100 Subject: [PATCH 1/8] Added debug print to macos fix script --- CMakeLists.txt | 2 +- cmake/fix-macos-libs.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f95f27..4993e4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ set(LONG_DESCRIPTION set(VERSION_MAJOR "0") set(VERSION_MINOR "1") -set(VERSION_PATCH "162") +set(VERSION_PATCH "164") set(VERSION_TWEAK "0") set(VERSION_DATE "11/12/2024") # DD/MM/YYYY format set(OCPN_MIN_VERSION "ov58") diff --git a/cmake/fix-macos-libs.sh b/cmake/fix-macos-libs.sh index 725ebb9..2156c69 100755 --- a/cmake/fix-macos-libs.sh +++ b/cmake/fix-macos-libs.sh @@ -6,6 +6,8 @@ readonly RUNTIME_PATH="@executable_path/../Frameworks/" +echo "Fixing maxos library paths in $(pwd)..." + plugin=$(find . -maxdepth 1 -name '*.dylib') for lib in $(otool -L "$plugin" | awk ' /wx/ {print $1}'); do libdir=${lib%/*} From daf356bd51fc304e9c81219a36014236a94103ed Mon Sep 17 00:00:00 2001 From: Egil Date: Tue, 14 Jan 2025 19:00:51 +0100 Subject: [PATCH 2/8] Added debug print to macos fix script --- CMakeLists.txt | 2 +- cmake/fix-macos-libs.sh | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4993e4a..23fbc91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ set(LONG_DESCRIPTION set(VERSION_MAJOR "0") set(VERSION_MINOR "1") -set(VERSION_PATCH "164") +set(VERSION_PATCH "165") set(VERSION_TWEAK "0") set(VERSION_DATE "11/12/2024") # DD/MM/YYYY format set(OCPN_MIN_VERSION "ov58") diff --git a/cmake/fix-macos-libs.sh b/cmake/fix-macos-libs.sh index 2156c69..64f385c 100755 --- a/cmake/fix-macos-libs.sh +++ b/cmake/fix-macos-libs.sh @@ -7,16 +7,17 @@ readonly RUNTIME_PATH="@executable_path/../Frameworks/" echo "Fixing maxos library paths in $(pwd)..." - -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 +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 From 7d24333b1f60698ed8687f07bd9ec0562aa459bb Mon Sep 17 00:00:00 2001 From: jongough <2803240+jongough@users.noreply.github.com> Date: Wed, 15 Jan 2025 09:34:11 +1100 Subject: [PATCH 3/8] Update to make jon-gough owner of repository --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23fbc91..53f2e59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,8 +90,8 @@ set(CLOUDSMITH_BASE_REPOSITORY "crowdsource") # 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 "jon-gough") set(XML_INFO_URL "https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi" From 2b3d70f0a0bd0a5aaacb1a15ea065c61f8128674 Mon Sep 17 00:00:00 2001 From: jongough <2803240+jongough@users.noreply.github.com> Date: Wed, 15 Jan 2025 12:37:39 +1100 Subject: [PATCH 4/8] Update cloudsmith repository name --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53f2e59..9db1fa2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ 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 From 4c2178095e3dde63e9c01935193bae809f821f05 Mon Sep 17 00:00:00 2001 From: jongough <2803240+jongough@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:04:05 +1100 Subject: [PATCH 5/8] Only build macos and change name of repository --- .circleci/config.yml | 68 ++++++++++++++++++++++---------------------- CMakeLists.txt | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f73e8ae..40badad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,35 +29,35 @@ 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 @@ -65,12 +65,12 @@ workflows: ## 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9db1fa2..53f2e59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ 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_pi") # without the pi +set(CLOUDSMITH_BASE_REPOSITORY "crowdsource") # without the pi # Set the following to use OpenCPN cloudsmith repositories instead of own # repositories From 988823470173dece5f04220989ae0bbbe805c498 Mon Sep 17 00:00:00 2001 From: jongough <2803240+jongough@users.noreply.github.com> Date: Thu, 16 Jan 2025 09:11:47 +1100 Subject: [PATCH 6/8] Try putting output in testplugin alpha repository --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53f2e59..9fd5574 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,12 +86,12 @@ 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 "testplugin") # 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 "opencpn") set(XML_INFO_URL "https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:plugins:safety:odraw1.6_pi" From 3f0e8f88809e2862dc8bc7a4f68edfdd2339148e Mon Sep 17 00:00:00 2001 From: jongough <2803240+jongough@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:36:44 +1100 Subject: [PATCH 7/8] Try sending to jon-gough cloudsmith --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fd5574..5c3f920 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 "testplugin") # without the pi +set(CLOUDSMITH_BASE_REPOSITORY "testplugin_pi") # without the pi # Set the following to use OpenCPN cloudsmith repositories instead of own # repositories #set(CLOUDSMITH_USER "egil-moller") -set(CLOUDSMITH_USER "opencpn") +#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" From b22010f69fc40d70abd16e276770283e7999a9dc Mon Sep 17 00:00:00 2001 From: jongough <2803240+jongough@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:00:19 +1100 Subject: [PATCH 8/8] Point at crowdsource cloudsmith in jon-gough --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c3f920..19f652f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ 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 "testplugin_pi") # without the pi +set(CLOUDSMITH_BASE_REPOSITORY "crowdsource_pi") # without the pi # Set the following to use OpenCPN cloudsmith repositories instead of own # repositories