mefged with frontend2 branch

Author: mauroc

CMakeLists.txt

@@ -21,7 +21,7 @@
 ## *   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx          *
 ## ***
 ##
-## ====FRONTEND 2  Version: 1.0.124 (corresponds with testplugin 1.0.124)=============
+## ====FRONTEND 2  Version: 1.0.126 (corresponds with testplugin 1.0.126)=============
 ##     
 ## ----- When changing this file do NOT change the order in which sections occur        ----- ##
 ## ----- Changes should only be made between the section blocks that identify where     ----- ##
@@ -57,7 +57,8 @@ SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "3")
 SET(VERSION_PATCH "8")
 set(VERSION_TWEAK "2")
-set(VERSION_DATE "7/05/2020")
+set(VERSION_DATE "7/14/2020")
+
 set(OCPN_MIN_VERSION "ov50")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "16")
@@ -125,15 +126,15 @@ message(STATUS "${CMLOC}Build type: ${CMAKE_BUILD_TYPE}")
 
 project(${PACKAGE})
 
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;")
 
 #===========================================================
-INCLUDE("cmake/PluginSetup.cmake")
+include("PluginSetup")
 #===========================================================
 ## ----- The above is used to setup standard variables that are required by the CMAKE process - do not remove ----- ##
 ## ----- Modify section below if there are special requirements for the plugin ----- ##
 ##
 
-# Settings and Options
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 option(Plugin_CXX11 "Use c++11" OFF)
@@ -142,7 +143,7 @@ option(Plugin_CXX11 "Use c++11" OFF)
 ## ----- Modify section above if there are special requirements for the plugin ----- ##
 ## ----- do not change next section - needed to configure build process ----- ##
 #===========================================================
-INCLUDE("cmake/PluginConfigure.cmake")
+include("PluginConfigure")
 #===========================================================
 ## ----- do not change section above - needed to configure build process ----- ##
 ## ----- Change below to match project requirements for source, headers, etc. ----- ##
@@ -304,9 +305,9 @@ ENDIF(TINYXML_FOUND)
 ## ----- Do not change - needed to build app ----- ##
 ##
 
-include("cmake/PluginInstall.cmake")
-include("cmake/PluginLocalization.cmake")
-include("cmake/PluginPackage.cmake")
+include("PluginInstall")
+include("PluginLocalization")
+include("PluginPackage")
 
 ##
 ## ----- do not change section above - needed to configure build process ----- ##

appveyor.yml

@@ -1,5 +1,4 @@
 clone_folder: c:\project\ocpn_project
-
 shallow_clone: false
 clone_depth: 10
 
@@ -28,25 +27,23 @@ install:
   # install dependencies:
   - choco install poedit
   - choco install git
-
   - ps: Start-FileDownload http://opencpn.navnux.org/build_deps/nsis-3.04-setup.exe
   - cmd: nsis-3.04-setup.exe /S
 
   # Download and unzip wxwidgets
   - ps: Start-FileDownload http://opencpn.navnux.org/build_deps/wxWidgets-3.1.2.7z
   - cmd: 7z x wxWidgets-3.1.2.7z -o%WXWIN% > null
-
   - set
 
 before_build:
   - cd c:\project\ocpn_project
+  - ps: Start-FileDownload https://downloads.sourceforge.net/project/opencpnplugins/opencpn_lib/4.99.1405-vc141_xp/opencpn.lib
   - ps: Start-FileDownload http://opencpn.navnux.org/build_deps/OpenCPN_buildwin-4.99a.7z
   - cmd: 7z x -y OpenCPN_buildwin-4.99a.7z -oc:\project\ocpn_project\buildwin
   - 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
   - cmake -T v141_xp ..
 
 build_script:
@@ -59,22 +56,13 @@ build_script:
 artifacts:
   - path: 'build\*.exe'
     name: installer
-#deploy:
-#  description: 'release created by AppVeyor CI'
-#  provider: GitHub
-#  auth_token: '%GitHub_auth_token%'
-#  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
 
+# 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-into-appveyor%'
+#  auth_token:  '%git-ptoken-testplugin-into-appveyor%'
 #  artifact: installer,portable
 #  draft: true
 #  prerelease: true

ci/circleci-build-mingw.sh

@@ -9,6 +9,11 @@ set -xe
 su -c "dnf install -q -y sudo dnf-plugins-core"
 sudo dnf builddep -y mingw/fedora/opencpn-deps.spec
 rm -rf build; mkdir build; cd build
+# For weatherfax builds
+#wget https://downloads.sourceforge.net/project/opencpnplugins/opencpn_packaging_data/PVW32Con.exe
+#wget https://downloads.sourceforge.net/project/opencpnplugins/opencpn_packaging_data/portaudio-vc12.7z
+#7za e portaudio-vc12.7z -o../buildwin -y
+#mv PVW32Con.exe ../buildwin/.
 cmake -DCMAKE_TOOLCHAIN_FILE=../mingw/fedora/toolchain.cmake ..
 make -j2
 make package

ci/control

@@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 9),
  libwxgtk3.0-gtk3-dev | base-files (<< 10),
  libwxgtk-webview3.0-dev | libwxgtk-webview3.0-gtk3-dev | base-files (<< 11),
  libwxsvg-dev | base-files (<< 11),
+ librtlsdr-dev,
  portaudio19-dev,
  python3-pip,
  python3-setuptools

cmake/PluginLocalization.cmake

@@ -14,14 +14,21 @@ message(STATUS "${CMLOC}Starting POTFILE generation")
 
 set(POTFILE ${CMAKE_CURRENT_SOURCE_DIR}/po/POTFILES.in)
 file(REMOVE ${POTFILE}.test)
+file(WRITE ${POTFILE}.test "")
+message(STATUS "${CMLOC}Checking file: ${CMAKE_CURRENT_SOURCE_DIR}/po/${PACKAGE_NAME}.pot")
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/po/${PACKAGE_NAME}.pot)
+    message(STATUS "${CMLOC}Found: ${CMAKE_CURRENT_SOURCE_DIR}/po/${PACKAGE_NAME}.pot")
+else()
+    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/po/${PACKAGE_NAME}.pot "")
+    message(STATUS "${CMLOC}Creating empty ${CMAKE_CURRENT_SOURCE_DIR}/po/${PACKAGE_NAME}.pot")
+endif()
 foreach(POTLINE IN ITEMS ${SRCS})
     file(APPEND ${POTFILE}.test "${POTLINE}\n")
 endforeach(POTLINE)
 foreach(POTLINE IN ITEMS ${HDRS})
     file(APPEND ${POTFILE}.test "${POTLINE}\n")
 endforeach(POTLINE)
 # convert crlf to lf for consistency and make copy_if_different work correctly
-file(WRITE ${POTFILE}.test "")
 configure_file(${POTFILE}.test ${POTFILE}.test NEWLINE_STYLE UNIX)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${POTFILE}.test ${POTFILE} OUTPUT_QUIET ERROR_QUIET)
 

cmake/in-files/cloudsmith-upload.sh.in

@@ -193,6 +193,7 @@ if [ "$TRAVIS" ] || [ "$CIRCLECI" ]; then
     cd build_tar
     tar -xf $tarball_tar
     rm *.tar
+    rm -rf root
     cp ../metadata.xml .
     tar -cf build_tarfile.tar *
     tar -tf build_tarfile.tar

po/POTFILES.in

@@ -0,0 +1,33 @@
+src/squiddio_pi.h
+src/squiddio_pi.cpp
+src/squiddioPrefsDialogBase.cpp
+src/squiddioPrefsDialogBase.h
+src/squiddio_pi_thread.h
+src/squiddio_pi_thread.cpp
+src/squiddioKaps.cpp
+src/sJSON.cpp
+src/sJSON.h
+src/icons.h
+src/icons.cpp
+src/logs.cpp
+src/logs.h
+src/NavObjectCollection.h
+src/NavObjectCollection.cpp
+src/Poi.h
+src/Poi.cpp
+src/PoiMan.h
+src/PoiMan.cpp
+src/Layer.h
+src/pugixml.hpp
+src/pugixml.cpp
+src/ocpn_types.h
+src/pugiconfig.hpp
+src/Hyperlink.h
+src/gpxdocument.h
+src/wxJSON/jsonval.cpp
+src/wxJSON/jsonreader.cpp
+src/wxJSON/json_defs.h
+src/wxJSON/jsonreader.h
+src/wxJSON/jsonval.h
+src/wxJSON/jsonwriter.cpp
+src/wxJSON/jsonwriter.h

po/POTFILES.in.test

@@ -0,0 +1,33 @@
+src/squiddio_pi.h
+src/squiddio_pi.cpp
+src/squiddioPrefsDialogBase.cpp
+src/squiddioPrefsDialogBase.h
+src/squiddio_pi_thread.h
+src/squiddio_pi_thread.cpp
+src/squiddioKaps.cpp
+src/sJSON.cpp
+src/sJSON.h
+src/icons.h
+src/icons.cpp
+src/logs.cpp
+src/logs.h
+src/NavObjectCollection.h
+src/NavObjectCollection.cpp
+src/Poi.h
+src/Poi.cpp
+src/PoiMan.h
+src/PoiMan.cpp
+src/Layer.h
+src/pugixml.hpp
+src/pugixml.cpp
+src/ocpn_types.h
+src/pugiconfig.hpp
+src/Hyperlink.h
+src/gpxdocument.h
+src/wxJSON/jsonval.cpp
+src/wxJSON/jsonreader.cpp
+src/wxJSON/json_defs.h
+src/wxJSON/jsonreader.h
+src/wxJSON/jsonval.h
+src/wxJSON/jsonwriter.cpp
+src/wxJSON/jsonwriter.h