Skip to content

Commit

Permalink
Merge branch 'release/v14.1.1' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
gloppyuser committed Dec 19, 2023
2 parents c6e4cf8 + 253cf49 commit 79a70c4
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 26 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cmake_policy( VERSION 3.7.2 )
project( GNSSTK_APPS )
set( GNSSTK_APPS_VERSION_MAJOR "14" )
set( GNSSTK_APPS_VERSION_MINOR "1" )
set( GNSSTK_APPS_VERSION_PATCH "0" )
set( GNSSTK_APPS_VERSION_PATCH "1" )
set( GNSSTK_APPS_VERSION "${GNSSTK_APPS_VERSION_MAJOR}.${GNSSTK_APPS_VERSION_MINOR}.${GNSSTK_APPS_VERSION_PATCH}" )
set( CPACK_PACKAGE_VERSION_MAJOR ${GNSSTK_APPS_VERSION_MAJOR} )
set( CPACK_PACKAGE_VERSION_MINOR ${GNSSTK_APPS_VERSION_MINOR} )
Expand Down
12 changes: 6 additions & 6 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ ref/usersguide/ @johnk @renfrob @rain
# ---------------------

# Core apps
core/apps/ @johnk @btolman
core/apps/positioning/ @btolman @renfrob
core/apps/Rinextools/ @btolman @renfrob
core/apps/ @johnk @magliocca @evillalba
core/apps/positioning/ @magliocca @renfrob @malik @evillalba
core/apps/Rinextools/ @magliocca @renfrob @evillalba

# Core tests
core/tests/ @johnk @anthony @renfrob

# Ext -- unsupported & unmaintained, not part of the API
ext/ @johnk @dbarber
ext/apps/filetools/ @btolman @renfrob
ext/apps/geomatics/ @btolman
ext/apps/filetools/ @magliocca @renfrob
ext/apps/geomatics/ @magliocca @butcher
ext/apps/rfw/ @johnk @renfrob

# Other
data/ @dbarber @kuck
deprecated/ @dbarber @kuck
examples/ @johnk @btolman @renfrob
examples/ @johnk @magliocca @renfrob


[CPP Reviewers]
Expand Down
12 changes: 12 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# Version 14.1.1 Monday December 18, 2023

Modifications by Author
-----------------------
Sarah Magliocca <[email protected]> (1):
Replacing Brian Tolman as a CODEOWNER with GNSS Geospatial PO and others

Taben Malik <[email protected]> (1):
Making gnsstk-apps_enable.sh source commands POSIX compliant.



# Version 14.1.0 Monday August 14, 2023

Modifications by Author
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "GPS ToolKit Software Library"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 14.1.0
PROJECT_NUMBER = 14.1.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
18 changes: 5 additions & 13 deletions RELNOTES.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
GNSSTk-APPs 14.1.0 Release Notes
GNSSTk-APPs 14.1.1 Release Notes
========================

* This release includes the following:
* Fixing WhereSat.cpp to no longer filter out almanac subframes.
* Fixing expected time offset output in gnsstk data submodule repo.
* Co-installation of major versions of debian packages.
* This release includes updates to the build system and GitLab CICD.

Updates since v14.0.0
Updates since v14.1.0
---------------------

**Build System and Test Suite**
* Update create debian/ubuntu major version coinstallable package
* Update gnsstk-apps_enable.sh source commands to be POSIX compliant.

**Gitlab CI**
* Fix deb11 optional pipeline jobs

Fixes since v14.0.0
--------------------
* Fix expected time offset output.
* Fix WhereSat.cpp to no longer filter out almanac subframes when loading data allowing the use-alm flag to function properly
* Update codeowners file to replace contributors that left
2 changes: 2 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Update gnsstk-apps_enable.sh source commands to be POSIX compliant.
* Update codeowners file to replace contributors that left
8 changes: 8 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
gnsstk-apps (14.1.1-1) focal; urgency=low

* Updated to version 14.1.1
* Update gnsstk-apps_enable.sh source commands to be POSIX compliant.
* Update codeowners file to replace contributors that left

-- David Barber <[email protected]> Mon, 18 Dec 2023 13:52:48 -0600

gnsstk-apps (14.1.0-1) focal; urgency=low

* Updated to version 14.1.0
Expand Down
7 changes: 3 additions & 4 deletions debian/gnsstk-apps_enable.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/bin/bash
# This file should be sourced and not executed as bash script. Ex. source /etc/profile.d/gnsstk-apps_enable.sh
GNSSTK_APPS_VER=__VER__

Expand All @@ -9,11 +8,11 @@ FILE=/etc/toolkits.conf

if [ -f "$FILE" ]; then
echo "found $FILE so sourcing it"
set -o allexport && source $FILE && set +o allexport
set -o allexport && . $FILE && set +o allexport
fi

echo "gnsstk-apps major version being used is $GNSSTK_APPS_VER"
source /usr/share/gnsstk__VER__-apps/enable
. /usr/share/gnsstk__VER__-apps/enable

echo -e "\nThe following env variables have been set or are already set"
env | grep 'LD_LIBRARY_PATH\|CPLUS_INCLUDE_PATH\|PYTHONPATH\|^PATH'
env | grep 'LD_LIBRARY_PATH\|CPLUS_INCLUDE_PATH\|PYTHONPATH\|^PATH'
6 changes: 5 additions & 1 deletion rpm_files/SPECS/gnsstk-apps.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%define name gnsstk-apps
%define version 14.1.0
%define version 14.1.1
%define release 1

Summary: GNSS Toolkit
Expand Down Expand Up @@ -53,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT


%changelog
* Mon Dec 18 2023 David Barber <[email protected]>
- Updated for v14.1.1 release
- Update codeowners file to replace contributors that left
- Update gnsstk-apps_enable.sh source commands to be POSIX compliant.
* Mon Aug 14 2023 David Barber <[email protected]>
- Updated for v14.1.0 release
- Update create debian/ubuntu major version coinstallable package
Expand Down

0 comments on commit 79a70c4

Please sign in to comment.