Merge pull request #286 from rgleason/master

1.14.1 + TP 1.0.238

.gitignore

@@ -1,4 +1,5 @@
-build/
-buildwin/
-.directory
+./build*
 po/POTFILES.in.test
+temp
+tmp
+master.zip

CMakeLists.txt

@@ -17,7 +17,7 @@
 ## *   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,                                       *
 ## *   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx                                       *
 #-----------------------------------------------------------------------------
-# Frontend2 Author: Jon Gough  TP v1.0.213.0 17/06/2022  DD/MM/YYYY format				 
+# Frontend2 Author: Jon Gough  TP v1.0.253.0 07/08/2023 DD/MM/YYYY format				 
 # buildCI:yes useODAPI:no validateJSON:no
 # ---------------------------------------------------------------------------
 ## ----- When changing this file do NOT change the order in which sections occur        ----- ##
@@ -53,14 +53,14 @@ set(SHORT_DESCRIPTION "Compute optimal routes based on weather and constraints."
 set(LONG_DESCRIPTION "WR features include: optimal routing subject to various constraints based on weather data, automatic boat polar computation.")				  
 
 set(VERSION_MAJOR "1")
-set(VERSION_MINOR "13")
-set(VERSION_PATCH "46")
+set(VERSION_MINOR "15")
+set(VERSION_PATCH "3")
 set(VERSION_TWEAK "0")
-set(VERSION_DATE  "17/06/2022")#DD/MM/YYYY format
-set(OCPN_MIN_VERSION "ov50")
+set(VERSION_DATE  "31/08/2023")#DD/MM/YYYY format
+set(OCPN_MIN_VERSION "ov58")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "16")
-set(TP_COMMENT "  * Release for O5 using CI")
+set(TP_COMMENT "  * Release for O571 or o58 using CI")
 
 set(PARENT "opencpn")
 
@@ -164,6 +164,7 @@ SET(SRCS
             src/zuFile.cpp
             src/georef.c
             src/GribRecord.cpp
+            src/navobj_util.cpp
 )
 
 SET (HDRS
@@ -191,11 +192,12 @@ SET (HDRS
             include/zuFile.h
             include/georef.h
             include/GribRecord.h
+            include/navobj_util.h
 )
 
 set(EXTSRC
 )
- set(EXTINCLUDE     
+set(EXTINCLUDE     
     extinclude/ODAPI.h     
     extinclude/ODJSONSchemas.h
 )
@@ -252,21 +254,16 @@ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/)
 include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/GL)
 include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/ocpn-api)
 include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/wxJSON/include)
-
-# These 3 are included down below
-#include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/jsoncpp)
-#include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/libtess2/include)
-#include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/plugingl/include)
-
-if(QT_ANDROID)
-    include_directories( ${PROJECT_SOURCE_DIR}/extinclude/GLES2)
-endif(QT_ANDROID)
-
+include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/pugixml)
 
 ##
 ## ----- Change above to match project requirements for android build ----- ##
 ##
 
+#if(QT_ANDROID)
+#    include_directories( ${PROJECT_SOURCE_DIR}/extinclude/GLES2)
+#endif(QT_ANDROID)
+
 ##=================================================
 target_sources(${PACKAGE_NAME} PUBLIC ${SRC})
 ##=================================================
@@ -338,6 +335,12 @@ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/libtess2/include)
 add_subdirectory(libs/libtess2)
 target_link_libraries(${PACKAGE_NAME} ocpn::libtess2)
 
+IF (MSVC)
+include_directories(BEFORE ${PROJECT_SOURCE_DIR}/libs/pugixml)
+add_subdirectory(libs/pugixml)
+target_link_libraries(${PACKAGE_NAME} ocpn::pugixml)
+ENDIF (MSVC)
+
 # Needed for all builds
 # ----- Do not change - needed to build app ----- ##
 #========================================================

appveyor.yml

@@ -2,8 +2,6 @@ clone_folder: c:\project\ocpn_project
 shallow_clone: false
 clone_depth: 10
 
-image:
-- Visual Studio 2017
 
 platform:
 # - x64
@@ -15,42 +13,81 @@ test: OFF
 environment:
   OCPN_TARGET: MSVC
 
-install:
-  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+# use enviornment matrix with job_name to allow build of one or more environments
+  matrix:
+  - job_name: Visual Studio 2017
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
-  # sent environment variables for wxWidgets
-  - set WXWIN=C:\wxWidgets-3.1.2
-  - set wxWidgets_ROOT_DIR=%WXWIN%
-  - set wxWidgets_LIB_DIR=%WXWIN%\lib\vc_dll
-  - cmd: SET PATH=%PATH%;%WXWIN%;%wxWidgets_LIB_DIR%;C:\Program Files (x86)\Poedit\Gettexttools\bin
+## This can be built in Circleci and is currently the FE2 default
+##
+#  - job_name: Visual Studio 2022
+#    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+
+
+matrix:
+# allow either job to fail and the other to complete
+  fast_finish: false
+
+init:
+  - appveyor version
+
+for:
+-
+  matrix:
+    only:
+      - job_name: Visual Studio 2017
+  install:
+    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+    - set WX_VER=
+    - set WXWIN=c:\wxWidgets-3.1.2
+    - set wxWidgets_ROOT_DIR=%WXWIN%
+    - set wxWidgets_LIB_DIR=%WXWIN%\lib\vc_dll
+    - set cmake_parms=-T v141_xp
+    - SET PATH=%PATH%;%WXWIN%;%wxWidgets_LIB_DIR%;C:\Program Files (x86)\Poedit\Gettexttools\bin
 
   # install dependencies:
-  - choco install poedit
-  - choco install git
+    - choco install poedit
+    - choco install git
 
-  # http://opencpn.navnux.org/build_deps/nsis-3.04-setup.exe - no longer available, replaced with below
-  - ps: Start-FileDownload https://download.opencpn.org/s/54HsBDLNzRZLL6i/download  -FileName nsis-3.04-setup.exe
-  - cmd: nsis-3.04-setup.exe /S
+    - ps: Start-FileDownload https://download.opencpn.org/s/54HsBDLNzRZLL6i/download  -FileName nsis-3.04-setup.exe
+    - cmd: nsis-3.04-setup.exe /S
 
   # Download and unzip wxwidgets
-  # http://opencpn.navnux.org/build_deps/wxWidgets-3.1.2.7z - no longer available, replaced with below
-  - ps: Start-FileDownload https://download.opencpn.org/s/E2p4nLDzeqx4SdX/download -FileName wxWidgets-3.1.2.7z
-  - cmd: 7z x wxWidgets-3.1.2.7z -o%WXWIN% > null
+    - ps: Start-FileDownload https://download.opencpn.org/s/E2p4nLDzeqx4SdX/download -FileName wxWidgets-3.1.2.7z
+    - cmd: 7z x wxWidgets-3.1.2.7z -o%WXWIN% > null
 
-  - set
+-
+  matrix:
+    only:
+      - job_name: Visual Studio 2022
+  install:
+    - call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"
+    - set WX_VER=32
+    - set WXWIN=C:\wxWidgets-3.2.1
+    - set wxWidgets_ROOT_DIR=%WXWIN%
+    - set wxWidgets_LIB_DIR=%WXWIN%\lib\vc_dll
+    - set cmake_parms=-A Win32
+    - SET PATH=%PATH%;%WXWIN%;%wxWidgets_LIB_DIR%;C:\Program Files\Poedit\Gettexttools\bin
+
+    # install dependencies:
+    - choco install poedit
+    - choco install git
+    - choco install wget
+
+    # Download and unzip wxwidgets
+    - wget -nv https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.1/wxMSW-3.2.1_vc14x_Dev.7z
+    - wget -nv https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.1/wxWidgets-3.2.1-headers.7z
+    - 7z x -o%WXWIN% wxMSW-3.2.1_vc14x_Dev.7z
+    - 7z x -o%WXWIN% wxWidgets-3.2.1-headers.7z
 
 before_build:
   - cd c:\project\ocpn_project
-  - cd buildwin
   - ps: Start-FileDownload https://downloads.sourceforge.net/project/opencpnplugins/opencpn_packaging_data/PVW32Con.exe
-  - cd ..
   - rm -rf build && mkdir build && cd build
-  #- ps: Start-FileDownload https://downloads.sourceforge.net/project/opencpnplugins/opencpn_lib/4.99.1405-vc141_xp/opencpn.lib - no longer available, replaced with below
   - ps: Start-FileDownload https://sourceforge.net/projects/opencpnplugins/files/opencpn.lib
-  # http://opencpn.navnux.org/build_deps/OpenCPN_buildwin-4.99a.7z - no longer available, replaced with below
   - ps: Start-FileDownload https://download.opencpn.org/s/oibxM3kzfzKcSc3/download -FileName OpenCPN_buildwin-4.99a.7z
   - cmd: 7z x -y OpenCPN_buildwin-4.99a.7z -oc:\project\ocpn_project\buildwin
-  - cmake -T v141_xp ..
+  - cmake %cmake_parms% ..
 
 build_script:
   - cmake --build . --target package --config Release
@@ -62,16 +99,3 @@ build_script:
 artifacts:
   - path: 'build\*.exe'
     name: installer
-
-# Removed from process as not providing real benefit at the moment
-#deploy:
-#  description: 'release created by AppVeyor CI'
-#  provider: GitHub
-#  #auth_token: '%GitHub_auth_token%'
-#  auth_token: '%GIT-PTOKEN-testplugin_pi-INTO-APPVEYOR%'
-#  artifact: installer,portable
-#  draft: true
-#  prerelease: true
-#  on:
-#    appveyor_repo_tag: true # deploy on tag push only
-#    configuration: Release  # Debug contains non-redist MS DLLs

bld.bat

@@ -1,4 +1,68 @@
+REM FE2  Testplugin
+
+REM --------------------------------------
+REM  For Opencpn 5.8 and wxWidgets-3.2.2 using Visual Studio 15 2017
+REM --------------------------------------
+REM Used for local builds and testing.
+REM Use bash prompt because of the cloudsmith-upload.sh at the end.
+REM Set local environment using wxWidgets-3.2.2
+set "wxDIR=%WXWIN%"
+set "wxWidgets_ROOT_DIR=%WXWIN%"
+set "wxWidgets_LIB_DIR=%WXWIN%\lib\vc14x_dll" 
+set "WXWIN=C:\Users\fcgle\source\wxWidgets-3.2.2"
+REM  For Opencpn 5.8 and wxWidgets-3.2.2
 cd build
-cmake -T v141_xp ..
-cmake --build . --target package --config release >output.txt
+cmake -T v143 -A Win32 -DOCPN_TARGET=MSVC ..
+cmake --build . --target package --config relwithdebinfo >output.txt
 bash ./cloudsmith-upload.sh
+
+REM --------------------------------------
+REM  For Opencpn 5.6.2 and wxWidgets-3.1.2  release
+REM --------------------------------------
+REM  Using built C:\Users\fcgle\source\wxWidgets-3.1.2 and local settings
+REM set "wxDIR=%WXWIN%"
+REM set "wxWidgets_ROOT_DIR=%WXWIN%" 
+REM set "wxWidgets_LIB_DIR=%WXWIN%\lib\vc14x_dll" 
+REM set "WXWIN=C:\Users\fcgle\source\wxWidgets-3.1.2"
+REM cd build
+REM cmake -T v141_xp -DOCPN_TARGET=MSVC ..
+REM cmake --build . --target package --config release >output.txt
+REM bash ./cloudsmith-upload.sh
+
+REM --------------------------------------
+REM  For Opencpn 5.8 and wxWidgets-3.2.2 using Visual Studio 15 2017
+REM --------------------------------------
+REM  Using built C:\Users\fcgle\source\wxWidgets-3.2.2 and local settings
+REM set "wxDIR=%WXWIN%"
+REM set "wxWidgets_LIB_DIR=%WXWIN%\lib\vc14x_dll" 
+REM set "WXWIN=C:\Users\fcgle\source\wxWidgets-3.2.2"
+REM cd build
+REM cmake -T v141_xp -G -DOCPN_TARGET=MSVC "Visual Studio 15 2017"
+REM       -DCMAKE_BUILD_TYPE=RelWithDebInfo  .. 
+REM cmake --build . --target tarball --config RelWithDebInfo >output.txt
+REM bash ./cloudsmith-upload.sh
+
+REM --------------------------------------
+REM  For Opencpn 5.8.2 and wxWidgets-3.2.2 using Visual Studio 12 2022
+REM  TransmitterDAN full Build in repos2 which executes win_deps.bat
+REM --------------------------------------
+REM .\buildwin\win_deps.bat
+REM cd build
+REM cmake -T v143 -A Win32 -DOCPN_TARGET=MSVC "Visual Studio 17 2022" ^
+REM      -DCMAKE_BUILD_TYPE=RelWithDebInfo  ..
+REM cmake --build . --target tarball --config RelWithDebInfo >output.txt
+
+REM  Setup for wxWidgets 3.2.2
+REM  wxWidgets_INCLUDE_DIRS   %WXWIN%\include
+REM  wxWidgets_LIB_DIR   %WXWIN%\lib\vc_dll
+REM  wxWidgets_LIBRARIES    %WXWIN%\lib\vc_dll
+REM  wxWidgets_ROOT_DIR   %WXWIN%
+REM  WXWIN   C:\Users\fcgle\source\repos2\OpenCPN\cache\buildwxWidgets\
+
+REM --------------------------------------
+REM configdev58.bat   by Rick for local builds.
+REM --------------------------------------
+REM Can use  "call configdev58.bat" in another batch file to set up local wxWidgets environment
+REM set "wxDIR=C:\Users\fcgle\source\repos2\OpenCPN\buildwin\..\cache\buildwxWidgets" 
+REM set "wxWidgets_ROOT_DIR=C:\Users\fcgle\source\repos2\OpenCPN\buildwin\..\cache\buildwxWidgets" 
+REM set "wxWidgets_LIB_DIR=C:\Users\fcgle\source\repos2\OpenCPN\buildwin\..\cache\buildwxWidgets\lib\vc_dll"