Merge pull request #437 from jongough/updates_1.6

Updates 1.6

.circleci/config.yml

@@ -7,6 +7,7 @@ jobs:
         - OCPN_TARGET=stretch-armhf
         - DOCKER_IMAGE=jongough/raspbian-stretch:latest
         - BUILD_FLAGS=-j3
+        - BUILD_ENV=raspbian
         steps:
         - checkout
         - run: chmod a+x ./ci/*.sh
@@ -20,6 +21,22 @@ jobs:
         - OCPN_TARGET=buster-armhf
         - DOCKER_IMAGE=jongough/raspbian-buster:plugin_build_tooling_current
         - BUILD_FLAGS=-j3
+        - BUILD_ENV=raspbian
+        steps:
+        - checkout
+        - run: chmod a+x ./ci/*.sh
+        - run:
+            command: ci/circleci-build-raspbian-armhf.sh
+            no_output_timeout: 30m
+        - run: ci/cloudsmith-upload.sh
+    build-armhf-bionic-64:
+        machine: true
+        environment:
+        - OCPN_TARGET=bionic-arm64
+        - OCPN_BRANCH=master
+        - DOCKER_IMAGE=arm64v8/ubuntu:18.04
+        - BUILD_FLAGS=-j3
+        - BUILD_ENV=ubuntu
         steps:
         - checkout
         - run: chmod a+x ./ci/*.sh
@@ -213,6 +230,15 @@ workflows:
                     - tmp
                 tags:
                     only: /.*/
+# Currently circleci does not build armf64 correctly due to no suitable docker image
+#        - build-armhf-bionic-64:
+#            filters:
+#                branches:
+#                    ignore:
+#                    - devel
+#                    - tmp
+#                tags:
+#                    only: /.*/
         - build-trusty:
             filters:
                 branches:

.travis.yml

@@ -2,22 +2,35 @@ language: cpp
 
 matrix:
   include:
+# The following 2 env: sections are now being done in circleci but are left here for examples
+#  - env:
+#    - OCPN_TARGET=stretch-armhf
+#    - DOCKER_IMAGE=raspbian/stretch
+#    - BUILD_FLAGS="-j2"
+#    - BUILD_ENV=raspbian
+#    services:
+#    - docker
+#    before_script:
+#    - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part1.sh
+#    script:
+#    - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part2.sh
+#  - env:
+#    - OCPN_TARGET=buster-armhf
+#    - DOCKER_IMAGE=jongough/raspbian-buster:plugin_build_tooling_current
+#    - BUILD_FLAGS=-j2
+#    - BUILD_ENV=raspbian
+#    services:
+#    - docker
+#    before_script:
+#    - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part1.sh
+#    script:
+#    - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part2.sh
+# The following env: section is for arm64 and cannot yet be run in circleci
   - env:
-    - OCPN_TARGET=stretch-armhf
-    - OCPN_BRANCH=master
-    - DOCKER_IMAGE=raspbian/stretch
-    - BUILD_FLAGS="-j2"
-    services:
-    - docker
-    before_script:
-    - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part1.sh
-    script:
-    - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part2.sh
-  - env:
-    - OCPN_TARGET=buster-armhf
-    - OCPN_BRANCH=master
-    - DOCKER_IMAGE=opencpn/raspbian-buster:plugin_build_tooling
-    - BUILD_FLAGS="-j2"
+    - OCPN_TARGET=bionic-armh64
+    - DOCKER_IMAGE=arm64v8/ubuntu:18.04
+    - BUILD_FLAGS=-j2
+    - BUILD_ENV=ubuntu
     services:
     - docker
     before_script:

CMakeLists.txt

@@ -23,10 +23,10 @@ set(PACKAGE_CONTACT "Jon Gough")
 set(PACKAGE "ocpn_draw")
 
 SET(VERSION_MAJOR "1")
-SET(VERSION_MINOR "6")
-SET(VERSION_PATCH "95")
+SET(VERSION_MINOR "8")
+SET(VERSION_PATCH "0")
 set(VERSION_TWEAK "0")
-SET(VERSION_DATE "29/05/2020")
+SET(VERSION_DATE "04/06/2020")
 SET(OCPN_MIN_VERSION "ov50")
 SET(OCPN_API_VERSION_MAJOR "1")
 SET(OCPN_API_VERSION_MINOR "16")

appveyor.yml

@@ -1,4 +1,4 @@
-clone_folder: c:\project\ocpn_draw_pi
+clone_folder: c:\project\testplugin_pi
 shallow_clone: false
 clone_depth: 10
 
@@ -38,7 +38,7 @@ install:
   - set
 
 before_build:
-  - cd c:\project\ocpn_draw_pi
+  - cd c:\project\testplugin_pi
   - cd buildwin
   - ps: Start-FileDownload https://downloads.sourceforge.net/project/opencpnplugins/opencpn_packaging_data/PVW32Con.exe
   - cd ..

cmake/PluginConfigure.cmake

@@ -7,6 +7,8 @@ message(STATUS "*** Staging to build ${PACKAGE_NAME} ***")
 message(STATUS "CIRCLECI: ${CIRCLECLI}, Env CIRCLECI: $ENV{CIRCLECI}")
 message(STATUS "TRAVIS: ${TRAVIS}, Env TRAVIS: $ENV{TRAVIS}")
 
+set(GIT_REPOSITORY "")
+
 if($ENV{CIRCLECI})
     set(GIT_REPOSITORY "$ENV{CIRCLE_PROJECT_USERNAME}/$ENV{CIRCLE_PROJECT_REPONAME}")
     set(GIT_REPOSITORY_BRANCH "$ENV{CIRCLE_BRANCH}")

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

@@ -3,14 +3,15 @@
 #
 # Upload the .tar.gz and .xml artifacts to cloudsmith
 #
-# Builds are uploaded the either the stable or the unstable
-# repo. If there is a tag pointing to current commit it goes
-# to stable, otherwise to unstable.
+# Builds are uploaded to one of PROD, BETA or ALPHA repositories
+# The repository depends on the branch and use of tag to determine which repo.
+# ALPHA: Non-master branch no tag
+# BETA: Non-master branch with annotated tag
+# BETA: Master branch no tag
+# PROD: Master branch with annotated tag
 #
-# If the environment variable CLOUDSMITH_PROD_REPO exists it is
-# used as the production repo, defaulting to the hardcoded PROD_REPO
-# value. Likewise for CLOUDSMITH_BETA_REPO and BETA_REPO and
-# CLOUDSMIT_ALPHA_RERP and ALPHA_REPO
+# If this script is used on CIRCLECI, TRAVIS or APPVEYOR it will upload the correct files to the chosen repository
+# If this script is used locally it will build the correct artifacts but will not do the upload
 #
 
 set -xe
@@ -49,7 +50,7 @@ else
 fi
 
 set +x
-if [ -z "$CLOUDSMITH_API_KEY" && !$LOCAL_BUILD ]; then
+if [ -z "$CLOUDSMITH_API_KEY" ] && [ "$LOCAL_BUILD" = "false" ]; then
     echo 'Cannot deploy to cloudsmith, missing $CLOUDSMITH_API_KEY'
     exit 0
 fi

cmake/in-files/pkg_version.sh.in

@@ -1,3 +1,7 @@
+#
+# File is 'sourced' in script files to ensure the correct environment variables are created
+#
+
 VERSION=${PACKAGE_VERSION}.${PKG_RELEASE}
 VERSION_DATE="${GIT_COMMIT_DATE}"
 PKG_TARGET=${PKG_TARGET}