Skip to content

Commit

Permalink
Release v4.6.0 of libsbp
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Mobarak committed Aug 4, 2022
1 parent 38d3431 commit 946e4d4
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 50 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ jobs:
toolchain: stable
override: true

- name: Fetch Tags
run: git fetch --tags --prune --force

- name: Build ${{ matrix.os }} binaries
id: build
run: ./scripts/ci_build_rust.bash
Expand Down
7 changes: 0 additions & 7 deletions HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,6 @@ inside the container (so you don't have to setup git inside the docker container
This will ensure that version information for language libraries
will be generated cleanly.

If running the release macOS you may need to install
llvm though brew (recommend installing llvm 6 with `brew instal llvm@6`)
then add it to your path with `export PATH=$(brew --prefix llvm@6)/bin:$PATH`.
You can also use Nixpkgs to setup a complete build environment for
running a release. [Install Nixpkgs](https://nixos.org/nix/download.html)
and then run `nix-shell` prior to running `make all`.

3. Run make targets for each language and re-tag. For python:

```shell
Expand Down
4 changes: 2 additions & 2 deletions c/include/libsbp/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
/** Protocol major version. */
#define SBP_MAJOR_VERSION 4
/** Protocol minor version. */
#define SBP_MINOR_VERSION 5
#define SBP_MINOR_VERSION 6
/** Protocol patch version. */
#define SBP_PATCH_VERSION 0

/** Full SBP version string. */
#define SBP_VERSION "4.5.1-alpha"
#define SBP_VERSION "4.6.0"

/** Is this a staging branch? */
#define SBP_STAGING 0
Expand Down
30 changes: 0 additions & 30 deletions default.nix

This file was deleted.

Binary file modified docs/sbp.pdf
Binary file not shown.
3 changes: 3 additions & 0 deletions generator/sbpg/targets/resources/rust/sbp2json_cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ serde_json = "1.0.82"
clap = { version = "3.1.15", features = ["derive"] }
mimalloc = { version = "0.1", default-features = false }

[build-dependencies]
vergen = { version = "7", default-features = false, features = ["git"] }

[dependencies.dencode]
version = "0.3.0"
default-features = false
Expand Down
2 changes: 1 addition & 1 deletion haskell/sbp.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: sbp
version: 4.5.1-alpha
version: 4.6.0
synopsis: SwiftNav's SBP Library
homepage: https://github.com/swift-nav/libsbp
license: MIT
Expand Down
2 changes: 1 addition & 1 deletion javascript/sbp/RELEASE-VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.5.1-alpha
4.6.0
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sbp",
"version": "4.5.1-alpha",
"version": "4.6.0",
"description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/",
"files": [
"javascript/*",
Expand Down
2 changes: 1 addition & 1 deletion python/sbp/RELEASE-VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.5.1-alpha
4.6.0
2 changes: 1 addition & 1 deletion rust/sbp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

[package]
name = "sbp"
version = "4.5.1-alpha"
version = "4.6.0"
description = "Rust native implementation of SBP (Swift Binary Protocol) for communicating with devices made by Swift Navigation"
authors = ["Swift Navigation <[email protected]>"]
repository = "https://github.com/swift-nav/libsbp"
Expand Down
5 changes: 4 additions & 1 deletion rust/sbp2json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

[package]
name = "sbp2json"
version = "4.5.1-alpha"
version = "4.6.0-unreleased"
description = "Rust native implementation of SBP (Swift Binary Protocol) to JSON conversion tools"
authors = ["Swift Navigation <[email protected]>"]
edition = "2018"
Expand All @@ -26,6 +26,9 @@ serde_json = "1.0.82"
clap = { version = "3.1.15", features = ["derive"] }
mimalloc = { version = "0.1", default-features = false }

[build-dependencies]
vergen = { version = "7", default-features = false, features = ["git"] }

[dependencies.dencode]
version = "0.3.0"
default-features = false
Expand Down
5 changes: 5 additions & 0 deletions rust/sbp2json/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
use vergen::{vergen, Config};

fn main() {
vergen(Config::default()).unwrap();
}
2 changes: 1 addition & 1 deletion rust/sbp2json/src/bin/json2json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

/// Convert "compact" SBP JSON data to an "exploded" form
#[derive(Debug, Parser)]
#[clap(name = "json2json", verbatim_doc_comment, version)]
#[clap(name = "json2json", verbatim_doc_comment, version = env!("VERGEN_GIT_SEMVER"))]
struct Options {
/// Path to input file
input: Option<PathBuf>,
Expand Down
2 changes: 1 addition & 1 deletion rust/sbp2json/src/bin/json2sbp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

/// Convert SBP JSON data to binary SBP.
#[derive(Debug, Parser)]
#[clap(name = "json2sbp", verbatim_doc_comment, version)]
#[clap(name = "json2sbp", verbatim_doc_comment, version = env!("VERGEN_GIT_SEMVER"))]
struct Options {
/// Path to input file
input: Option<PathBuf>,
Expand Down
2 changes: 1 addition & 1 deletion rust/sbp2json/src/bin/sbp2json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

/// Convert binary SBP data to JSON.
#[derive(Debug, Parser)]
#[structopt(name = "sbp2json", verbatim_doc_comment, version)]
#[structopt(name = "sbp2json", verbatim_doc_comment, version = env!("VERGEN_GIT_SEMVER"))]
pub struct Options {
/// Path to input file
input: Option<PathBuf>,
Expand Down

0 comments on commit 946e4d4

Please sign in to comment.