Reset35: Restore merging of #35 + fixes

.circleci/config.yml

@@ -26,35 +26,25 @@ jobs:
        - checkout
        - run: ci/circleci-build-flatpak.sh
        - run: ci/circleci-upload.sh
-   build-fedora:
+   build-mingw:
      docker:
          - image: fedora:29
      environment:
-       - OCPN_TARGET:  fedora
+       - OCPN_TARGET:  mingw
      steps:
        - run: su -c "dnf install -q -y git openssh-clients openssh-server"
        - checkout
-       - run: ci/circleci-build-fedora.sh
+       - run: ci/circleci-build-mingw.sh
        - run: ci/circleci-upload.sh
-   build-mingw:
-     docker:
-         - image: fedora:29
+   build-macos:
+     macos:
+       xcode: "10.0.0"
      environment:
-       - OCPN_TARGET:  mingw
+       - OCPN_TARGET:  macos
      steps:
-       - run: su -c "dnf install -q -y git openssh-clients openssh-server"
        - checkout
-       - run: ci/circleci-build-mingw.sh
+       - run: ci/circleci-build-macos.sh
        - run: ci/circleci-upload.sh
-#   build-macos:
-#     macos:
-#       xcode: "10.0.0"
-#     environment:
-#       - OCPN_TARGET:  macos
-#     steps:
-#       - checkout
-#       - run: ci/circleci-build-macos.sh
-#       - run: ci/circleci-upload.sh
 
 workflows:
   version: 2
@@ -63,20 +53,24 @@ workflows:
       - build-debian:
           filters:
             branches:
-              only: master
+              ignore: 
+                - devel
+                - tmp
       - build-flatpak:
           filters:
             branches:
-              only: master
-      - build-fedora:
+              ignore: 
+                - devel
+                - tmp
+      - build-macos:
           filters:
             branches:
-              only: master
- #     - build-macos:
- #         filters:
- #           branches:
- #             only: master
+              ignore: 
+                - devel
+                - tmp
       - build-mingw:
           filters:
             branches:
-              only: master
+              ignore: 
+                - devel
+                - tmp

.gitignore

@@ -2,7 +2,7 @@ cscope.files
 tags
 index.sh
 include/version.h
-build/
+build
 Debug
 cmake
 CMakeFiles

CMakeLists.txt

@@ -23,23 +23,65 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
 
 PROJECT(squiddio_pi)
-SET(PARENT "opencpn")
 
 SET(PACKAGE_NAME squiddio_pi)
-SET(PACKAGE_FILE_NAME "opencpn-plugin-squiddio")
 SET(VERBOSE_NAME Squiddio)
 SET(TITLE_NAME SQUIDDIO)
 SET(CPACK_PACKAGE_CONTACT "Mauro Calvi")
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "12")
-SET(PLUGIN_VERSION_DATE "2019/10/10")
+SET(VERSION_PATCH "4")
+SET(VERSION_DATE "19/05/2019")
 SET(OCPN_MIN_VERSION "ov50")
 
+SET(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+SET(PKG_RELEASE "1")
+SET(PKG_API_VERSION "1.16")
+SET(PKG_AUTHOR "Mauro Calvi")
+SET(PKG_NVR ${PACKAGE_NAME}-${PACKAGE_VERSION}-${PKG_RELEASE})
+SET(PKG_BASE_URL
+  "https://dl.cloudsmith.io/public/mauro-calvi/squiddio-pi/raw/files")
+
+
+INCLUDE("cmake/PluginSetup.cmake")
+set(PLUGIN_NAME squiddio-plugin-${PKG_TARGET}-${PKG_TARGET_VERSION})
+
+if (OCPN_FLATPAK)
+    find_program(TAR NAMES gtar tar)
+    if (NOT TAR)
+        message(FATAL_ERROR "tar not found, required for OCPN_FLATPAK")
+    endif ()
+    configure_file(
+        ${CMAKE_SOURCE_DIR}/squiddio-plugin.xml.in
+        ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.xml
+    )
+    add_custom_target(flatpak-build ALL
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/flatpak
+        COMMAND /usr/bin/flatpak-builder --force-clean
+            ${CMAKE_CURRENT_BINARY_DIR}/app
+            org.opencpn.OpenCPN.Plugin.squiddio.yaml
+    )
+    add_custom_target("flatpak-pkg")
+    add_custom_command(
+        TARGET flatpak-pkg
+        COMMAND ${TAR}
+            -czf ${PKG_NVR}_${PKG_TARGET_NVR}.tar.gz
+            --transform 's|.*/files/|squiddio-flatpak-${PACKAGE_VERSION}/|'
+            ${CMAKE_CURRENT_BINARY_DIR}/app/files
+    )
+    return ()
+endif()
+
+
+
 #SET(CMAKE_BUILD_TYPE Debug)
 
+# Prefer libGL.so to libOpenGL.so, see CMP0072
+set(OpenGL_GL_PREFERENCE "LEGACY")
+
 INCLUDE("cmake/PluginConfigure.cmake")
+set(CMAKE_CXX_STANDARD 11)
 
 SET(SRC_SQUIDDIO
     src/squiddio_pi.h
@@ -142,6 +184,7 @@ SET(SRC_NMEA0183
     )
 INCLUDE_DIRECTORIES(nmea0183)
 INCLUDE_DIRECTORIES(src/wxJSON)
+INCLUDE_DIRECTORIES(api-16)
 
 ADD_DEFINITIONS(-DTIXML_USE_STL)
 IF(UNIX)
@@ -167,3 +210,7 @@ INCLUDE("cmake/PluginInstall.cmake")
 INCLUDE("cmake/PluginLocalization.cmake")
 INCLUDE("cmake/PluginPackage.cmake")
 
+configure_file(
+  ${CMAKE_SOURCE_DIR}/squiddio-plugin.xml.in
+  ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.xml
+)

appveyor.yml

@@ -1,9 +1,10 @@
+clone_folder: c:\project\squiddio_pi
+shallow_clone: false
+clone_depth: 10
 
 image:
 - Visual Studio 2017
 
-clone_folder: c:\project\squiddio_pi
-shallow_clone: false
 platform: 
 # - x64
   - Win32
@@ -12,6 +13,7 @@ configuration: Release
 test: OFF
 
 install:
+  # VS2015 and earlier version - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86'
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
 
 # sent environment variables for wxWidgets
@@ -22,10 +24,8 @@ install:
 
 # install dependencies:
   - choco install poedit
-  - 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
+  # 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
 
@@ -41,9 +41,15 @@ before_build:
   - cmake -T v141_xp ..
 
 build_script:
-  - cmake --build . --target package --config release
+  - cmake -G "Visual Studio 15 2017"   ..
+  - cmake --build . --target install --config Release
+  - cmake --build . --target package --config Release
+  - choco install git
+  - python -m ensurepip
+  - python -m pip install -q setuptools
+  - python -m pip install -q cloudsmith-cli
+  - bash ../ci/appveyor-upload.sh
 
-# Artifacts Configuration    #
 artifacts:
   path: 'build\*.exe'
   name: installer

buildosx/InstallOSX/squiddio_pi.pkgproj.in

@@ -774,7 +774,18 @@
 		<key>PROJECT_COMMENTS</key>
 		<dict>
 			<key>NOTES</key>
-			<data>ITY5bfgEHsABqkzibS60y9W3so4eht4ociqAE7H0gnFA/3h3aVXyaZZvUhSQF8XwaWgTDfgxJOvPvOsY+mYNN5GOOSFd0YwRxKA8ys8TPqB2T2MkQ5lt9+5pJ52VkJ8cR1Ro688k5NEZmavke29QHVuzOfaNWPqAx1Xfkp/Vnbw1ApB5mQiNwQKtfkI8dZDtP/IFYHSF8+2gRuCe9i/Ed+yUfpojRSb15X/qs2+l57VOKrR//J21iqZ+hYRQKzfqs6QOyb2B822ABJuI6kESzVWg2vtO1mI4XD3dv6BIaWnzHiwIk8nbI0TAuYTR/Yze4jACqSa6ud9I1KLT3trbw9ZFRODiFniSGIjqEpZG5S1FMK7TLK0+a8Lk5GHqDJn5T+mVxljSPO3rcMtWqa51uar4FFyUVgPL1bBd5FgsRkRNulV5O6I89rDmtgoc0UzUBy7WrO/JrT2AEoe4WiYM7BYxjRHTcW1+dHGr/y1CU3sIvcR/0BdZuTDfET5NV5zl6AabJUcyi5M7p2wmW0In2OAJzCWuRGthTmAx9xeUiXAbNzSCpkozKSZDRJnTLpvyBm4RzsqiWZKoKgFRP2AFpkh6E23e9REdKih5nTkD19aEKj7uXFViEojAQ13RqcchksQyzZ33u0mgJ2i2aX0x8eFG8qbYXMgB6t7pMrmq9tY=
+			<data>
+			PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M
+			IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv
+			c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l
+			cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7
+			IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250
+			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
+			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
+			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzguNTEiPgo8c3R5bGUg
+			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
+			Pgo8L2JvZHk+CjwvaHRtbD4K
 			</data>
 		</dict>
 		<key>PROJECT_PRESENTATION</key>
@@ -1438,7 +1449,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-				<string>${PACKAGE_FILE_NAME}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${OCPN_MIN_VERSION}</string>
+			<string>${VERBOSE_NAME}-Plugin_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}</string>
 			<key>REFERENCE_FOLDER_PATH</key>
 			<string>.</string>
 		</dict>