libsbp release 2.6.0

+ CMake build tweaks

+ Resolve javascript package vulnerability

+ Version bumps

+ Update haskell generator to template sbp.cabal: some kind of snafu broke the templating of sbp.cabal, restore this.

Author: silverjam

.travis.yml

@@ -31,7 +31,7 @@ matrix:
         - sudo apt-get install python3.5 python3.5-dev
         - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
         - sudo pip install tox
-        - git clone -b pmiettinen/esd-1156-numba-deployment https://github.com/swift-nav/piksi_tools.git ../piksi_tools
+        - git clone -b master https://github.com/swift-nav/piksi_tools.git ../piksi_tools
       script: |
         pushd haskell
         docker build -t sbp2json .

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [2.6.0](https://github.com/swift-nav/libsbp/tree/v2.6.0)
+
+[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.5.5...v2.6.0)
+
+**Merged pull requests:**
+
+- Remove unused build\_test\_data.py \[ESD-1086\] [\#693](https://github.com/swift-nav/libsbp/pull/693)
+- Integrate numba into setuptools \[ESD-1156\] [\#687](https://github.com/swift-nav/libsbp/pull/687)
+- Added three new messages for gridded atmospheric SSR corrections. [\#686](https://github.com/swift-nav/libsbp/pull/686)
+
 ## [2.5.5](https://github.com/swift-nav/libsbp/tree/v2.5.5) (2019-05-16)
 
 [Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.5.4...v2.5.5)

HOWTO.md

@@ -97,7 +97,7 @@ Ubuntu 16.04.
 2. This will bump versions in the following files:
    - `python/sbp/RELEASE-VERSION`
    - `docs/sbp.pdf`
-   - `haskell/sbp.cabal.m4`
+   - `haskell/sbp.cabal`
    - `package.json`
    - `c/include/libsbp/version.h`
    - `package-lock.json` -- you can typically revert all the changes in this

c/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.12)
 project(libsbp)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@@ -15,6 +15,7 @@ if(MSVC)
     set(LIBSBP_CFLAGS "/Wall" CACHE STRING "Compile flags for libsbp.")
 else()
     set(LIBSBP_CFLAGS "-Wall -Werror" CACHE STRING "Compile flags for libsbp.")
+    link_directories("/usr/local/lib")
 endif()
 
 add_subdirectory(src)

c/include/libsbp/version.h

@@ -23,9 +23,9 @@
 /** Protocol major version. */
 #define SBP_MAJOR_VERSION 2
 /** Protocol minor version. */
-#define SBP_MINOR_VERSION 5
+#define SBP_MINOR_VERSION 6
 /** Protocol patch version. */
-#define SBP_PATCH_VERSION 5
+#define SBP_PATCH_VERSION 0
 
 /** \} */
 

c/test/CMakeLists.txt

@@ -21,7 +21,12 @@ else (CMAKE_CROSSCOMPILING)
     set_target_properties(test_libsbp PROPERTIES
             C_STANDARD 99
             C_STANDARD_REQUIRED ON)
-    target_include_directories(test_libsbp PRIVATE ${PROJECT_SOURCE_DIR}/include/libsbp/)
+
+    if(MSVC)
+      target_include_directories(test_libsbp PRIVATE ${PROJECT_SOURCE_DIR}/include/libsbp/)
+    else()
+      target_include_directories(test_libsbp PRIVATE ${PROJECT_SOURCE_DIR}/include/libsbp/ /usr/local/include/)
+    endif()
 
     add_custom_command(
       TARGET test_libsbp POST_BUILD

docs/sbp.pdf

@@ -190,7 +190,7 @@ def render_cabal(output_dir, package_specs, release):
     module_name = camel_case(name)
     full_module_name = ".".join([module_prefix, module_name])
     modules.append(full_module_name)
-  destination_filename = "%s/sbp.cabal.m4" % output_dir
+  destination_filename = "%s/sbp.cabal" % output_dir
   py_template = JENV.get_template(CABAL_TEMPLATE_NAME)
   with open(destination_filename, 'w') as f:
     f.write(py_template.render(modules=sorted(modules),

generator/sbpg/targets/haskell.py

@@ -63,6 +63,22 @@ executable sbp2json
                      , sbp
   default-language:    Haskell2010
 
+executable sbp2prettyjson
+  hs-source-dirs:      main
+  main-is:             SBP2PRETTYJSON.hs
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall
+  build-depends:       aeson-pretty
+                     , base
+                     , basic-prelude
+                     , binary-conduit
+                     , bytestring
+                     , cmdargs
+                     , conduit
+                     , conduit-extra
+                     , resourcet
+                     , sbp
+  default-language:    Haskell2010
+
 executable json2sbp
   hs-source-dirs:      main
   main-is:             JSON2SBP.hs

generator/sbpg/targets/resources/sbp-template.cabal

@@ -1,5 +1,5 @@
 name:                  sbp
-version:               2.4.7
+version:               2.6.0
 synopsis:              SwiftNav's SBP Library
 homepage:              https://github.com/swift-nav/libsbp
 license:               LGPL-3
@@ -153,4 +153,4 @@ test-suite test
                      , tasty
                      , tasty-hunit
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall
-  default-language:    Haskell2010
+  default-language:    Haskell2010