Merge branch 'release/v14.1.0' into stable

SGL-UT · Aug 16, 2023 · c6e4cf8 · c6e4cf8
2 parents d094e7a + 564bf99
commit c6e4cf8
Show file tree

Hide file tree

Showing 18 changed files with 312 additions and 25 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -88,8 +88,8 @@ variables:
       - /^tag_.*$/
       - stable
       - /^release\/v[0-9.]*$/
-      - /^bugfix/ci_*$/
-      - /^feature/ci_*$/
+      - /^bugfix\/ci_.*$/
+      - /^feature\/ci_.*$/
     variables:
       - $BLD_ONLY_VS2019 != "True"
 
@@ -258,6 +258,8 @@ deb10_build:
   script:
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_debian_10 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - mkdir -p build
     - cd build
     - cmake -DCMAKE_INSTALL_PREFIX=install -DPYTHON_EXECUTABLE=/usr/bin/python3 $CMAKE_ARG_DEFAULT
@@ -276,6 +278,9 @@ deb10_op1_build:
   script:
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_debian_10 pkg_max
+    # source gnsstk's and optional dependencies' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
+    - for tks in ${PACKAGE_CONFIG_2}; do source /etc/profile.d/${tks}_enable.sh; done
     # Link optional library
     - ./optional_package_add.sh $PACKAGE_CONFIG_1
     - mkdir -p build
@@ -296,6 +301,9 @@ deb10_op2_build:
   script:
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_debian_10 pkg_max
+    # source gnsstk's and optional dependencies' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
+    - for tks in ${PACKAGE_CONFIG_2}; do source /etc/profile.d/${tks}_enable.sh; done
     # Link optional libraries
     - ./optional_package_add.sh $PACKAGE_CONFIG_2
     - mkdir -p build
@@ -316,6 +324,8 @@ deb11_build:
   script:
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - mkdir -p build
     - cd build
     - cmake -DCMAKE_INSTALL_PREFIX=install $CMAKE_ARG_DEFAULT
@@ -333,7 +343,11 @@ deb11_op1_build:
   image: $DOCKER_REGISTRY/sgl/debian-11:pkgbuild
   script:
     # Install dependencies from latest CI first.
+    - apt-get install -y libhdf5-dev
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_max
+    # source gnsstk's and optional dependencies' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
+    - for tks in ${PACKAGE_CONFIG_2}; do source /etc/profile.d/${tks}_enable.sh; done
     # Link optional libraries
     - ./optional_package_add.sh $PACKAGE_CONFIG_1
     - mkdir -p build
@@ -353,8 +367,10 @@ deb11_op2_build:
   image: $DOCKER_REGISTRY/sgl/debian-11:pkgbuild
   script:
     # Install dependencies from latest CI first.
-    - apt-get install -y libhdf5-dev
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_max
+    # source gnsstk's and optional dependencies' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
+    - for tks in ${PACKAGE_CONFIG_2}; do source /etc/profile.d/${tks}_enable.sh; done
     # Link optional libraries
     - ./optional_package_add.sh $PACKAGE_CONFIG_2
     - mkdir -p build
@@ -375,6 +391,8 @@ ubu20_build:
   script:
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_ubuntu_20.04 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - mkdir -p build
     - cd build
     - cmake -DCMAKE_INSTALL_PREFIX=install -DPYTHON_EXECUTABLE=/usr/bin/python3 $CMAKE_ARG_DEFAULT
@@ -580,6 +598,8 @@ deb10_test:
   image: $DOCKER_REGISTRY/sgl/debian-10:pkgbuild
   script:
     - bash debian/install_required_deps_debian.sh package_debian_10 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd build
     - ctest -j 4
   artifacts:
@@ -598,6 +618,9 @@ deb10_op2_test:
   image: $DOCKER_REGISTRY/sgl/debian-10:pkgbuild
   script:
     - bash debian/install_required_deps_debian.sh package_debian_10 pkg_max
+    # source gnsstk's and optional dependencies' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
+    - for tks in ${PACKAGE_CONFIG_2}; do source /etc/profile.d/${tks}_enable.sh; done
     - cd build
     - ctest -j 4
   artifacts:
@@ -616,6 +639,8 @@ deb11_test:
   image: $DOCKER_REGISTRY/sgl/debian-11:pkgbuild
   script:
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd build
     - ctest -j 4
   artifacts:
@@ -633,7 +658,11 @@ deb11_op2_test:
     - docker-executor
   image: $DOCKER_REGISTRY/sgl/debian-11:pkgbuild
   script:
+    - apt-get install -y libhdf5-dev
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_max
+    # source gnsstk's and optional dependencies' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
+    - for tks in ${PACKAGE_CONFIG_2}; do source /etc/profile.d/${tks}_enable.sh; done
     - cd build
     - ctest -j 4
   artifacts:
@@ -652,6 +681,8 @@ ubu20_test:
   image: $DOCKER_REGISTRY/sgl/ubuntu-20.04:pkgbuild
   script:
     - bash debian/install_required_deps_debian.sh package_ubuntu_20.04 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd build
     - ctest -j 4
   artifacts:
@@ -839,6 +870,8 @@ deb11_user_install:
   image: $DOCKER_REGISTRY/sgl/debian-11:pkgbuild
   script:
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd build
     - export gnsstk=`pwd`/install
     - cmake -DCMAKE_INSTALL_PREFIX=$gnsstk ../
@@ -858,6 +891,8 @@ ubu20_user_install:
   image: $DOCKER_REGISTRY/sgl/ubuntu-20.04:pkgbuild
   script:
     - bash debian/install_required_deps_debian.sh package_ubuntu_20.04 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd build
     - export gnsstk=`pwd`/install
     - cmake -DCMAKE_INSTALL_PREFIX=$gnsstk ../
@@ -966,6 +1001,8 @@ deb11_system_install:
   image: $DOCKER_REGISTRY/sgl/debian-11:pkgbuild
   script:
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd build
     - export gnsstk=/usr/local
     - cmake -DCMAKE_INSTALL_PREFIX=$gnsstk ../
@@ -982,6 +1019,8 @@ ubu20_system_install:
   image: $DOCKER_REGISTRY/sgl/ubuntu-20.04:pkgbuild
   script:
     - bash debian/install_required_deps_debian.sh package_ubuntu_20.04 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd build
     - export gnsstk=/usr/local
     - cmake -DCMAKE_INSTALL_PREFIX=$gnsstk ../
@@ -1023,6 +1062,8 @@ package_debian_10:
     - rm -f .gitmodules
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_debian_10 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     # Remove any directories left over from the above script.
     - rm -rf packages
     # Mark the debian log so that this package is a backport.
@@ -1055,6 +1096,8 @@ package_debian_11:
     - rm -f .gitmodules
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     # Remove any directories left over from the above script.
     - rm -rf packages
     # Mark the debian log so that this package is a backport.
@@ -1083,6 +1126,8 @@ package_ubuntu_20.04:
     - rm -f .gitmodules
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_ubuntu_20.04 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     # Remove any directories left over from the above script.
     - rm -rf packages
     # Mark the debian log so that this package is a backport.
@@ -1257,8 +1302,12 @@ deb10_deploy:
   script:
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_debian_10 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd debs
     - sudo apt-get -y install ./*.deb
+    # source gnsstk-apps' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk-apps_enable.sh
     - python3 -c "import gnsstk"
     - timeconvert
   dependencies:
@@ -1274,8 +1323,12 @@ deb11_deploy:
   script:
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_debian_11 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd debs
     - apt-get -y install ./*.deb
+    # source gnsstk-apps' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk-apps_enable.sh
     - python3 -c "import gnsstk"
     - timeconvert
   dependencies:
@@ -1291,8 +1344,12 @@ ubu20_deploy:
   script:
     # Install dependencies from latest CI first.
     - bash debian/install_required_deps_debian.sh package_ubuntu_20.04 pkg_min
+    # source gnsstk's enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk_enable.sh
     - cd debs
     - sudo apt-get -y install ./*.deb
+    # source gnsstk-apps' enable script to set private library install env variables.
+    - source /etc/profile.d/gnsstk-apps_enable.sh
     - python3 -c "import gnsstk"
     - timeconvert
   dependencies:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ cmake_policy( VERSION 3.7.2 )
 
 project( GNSSTK_APPS )
 set( GNSSTK_APPS_VERSION_MAJOR "14" )
-set( GNSSTK_APPS_VERSION_MINOR "0" )
+set( GNSSTK_APPS_VERSION_MINOR "1" )
 set( GNSSTK_APPS_VERSION_PATCH "0" )
 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} )

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,22 @@
+# Version 14.1.0   Monday August 14, 2023
+
+Modifications by Author
+-----------------------
+     David Barber <[email protected]> (5):
+           fix deb11 optional pipeline jobs
+           create debian/ubuntu major version coinstallable package
+           Apply code review updates from gnsstk coinstall MR
+           add uninstall script to debian prerm maintainer script
+           add postinstall script to debian postinst maintainer script
+
+     Sydney Holdampf <[email protected]> (1):
+           Don't filter out almanac subframes when loading data
+
+     Taben Malik <[email protected]> (1):
+           Fix expected time offset output
+
+
+
 # Version 14.0.0   Thursday December 22, 2022
 
 Modifications by Author

diff --git a/Doxyfile b/Doxyfile
@@ -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.0.0
+PROJECT_NUMBER         = 14.1.0
 
 # 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

diff --git a/RELNOTES.md b/RELNOTES.md
@@ -1,21 +1,21 @@
-GNSSTk-APPs 14.0.0 Release Notes
+GNSSTk-APPs 14.1.0 Release Notes
 ========================
 
- * This release introduces a major update to the toolkit apps.
- * It includes the following:
-   * Updating cmake package from using a hyphen to using an underscore.
-   * Adding PRN/SVN mapping support to navdump.
-   * Adding Ubuntu20.04 (focal) support.
+ * 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.
 
-Updates since v13.6.0
+Updates since v14.0.0
 ---------------------
 
 **Build System and Test Suite**
-  * Updated the clean build parameter
+  * Update create debian/ubuntu major version coinstallable package 
 
 **Gitlab CI**
-  * Add ubuntu 20.04 pipeline jobs
+  * Fix deb11 optional pipeline jobs
 
-**Library Changes**
-  * Update replaced hypen with underscore from cmake package name
-  * Add PRN/SVN mapping support to navdump
+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
diff --git a/core/apps/visibility/WhereSat.cpp b/core/apps/visibility/WhereSat.cpp
@@ -429,7 +429,7 @@ process()
       // get the ephemeris source(s)
       // without clock, SP3 doesn't work.
    navLib.addFactory(ndfp); // must be done before setTypeFilter
-   navLib.setTypeFilter({NavMessageType::Ephemeris, NavMessageType::Clock});
+   navLib.setTypeFilter({NavMessageType::Ephemeris, NavMessageType::Almanac, NavMessageType::Clock});
    if (debugLevel)
    {
       cout << "Attempting to read ephemeris data." << endl;

diff --git a/data b/data
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,14 @@
+gnsstk-apps (14.1.0-1) focal; urgency=low
+
+  * Updated to version 14.1.0
+  * Fix expected time offset output.
+  * Fix deb11 optional pipeline jobs
+  * Fix WhereSat.cpp to no longer filter out almanac subframes when
+    loading data allowing the use-alm flag to function properly
+  * Update create debian/ubuntu major version coinstallable package
+
+ -- David Barber <[email protected]>  Mon, 14 Aug 2023 12:45:12 -0500
+
 gnsstk-apps (14.0.0-1) stable; urgency=low
 
   * Updated to version 14.0.0

diff --git a/debian/control b/debian/control
@@ -1,16 +1,16 @@
 Source: gnsstk-apps
 Priority: optional
 Maintainer: David Barber <[email protected]>
-Build-Depends: debhelper (>= 9), cmake, libgnsstk14
+Build-Depends: debhelper (>= 9), cmake, libgnsstk14 (>= 14.2.0)
 Standards-Version: 3.9.5
 Section: libs
 Homepage: http://www.gnsstk.org/
 Vcs-Git: https://github.com/SGL-UT/GNSSTk.git
 Vcs-Browser: https://github.com/SGL-UT/GNSSTk.git
 
-Package: gnsstk-apps
+Package: gnsstk14-apps
 Architecture: any
-Depends: libgnsstk14, ${misc:Depends}, ${shlibs:Depends}
+Depends: libgnsstk14 (>= 14.2.0), ${misc:Depends}, ${shlibs:Depends}
 Description: GNSS Toolkit (GNSSTk) - command line tools
  The GNSS Toolkit (GNSSTk) is an open-source (LGPL) project sponsored by
  the Space and Geophysics Laboratory (SGL), part of the Applied Research

diff --git a/debian/control.in b/debian/control.in
@@ -0,0 +1,20 @@
+Source: gnsstk-apps
+Priority: optional
+Maintainer: David Barber <[email protected]>
+Build-Depends: debhelper (>= 9), cmake, libgnsstk14 (>= 14.2.0)
+Standards-Version: 3.9.5
+Section: libs
+Homepage: http://www.gnsstk.org/
+Vcs-Git: https://github.com/SGL-UT/GNSSTk.git
+Vcs-Browser: https://github.com/SGL-UT/GNSSTk.git
+
+Package: gnsstk__VER__-apps
+Architecture: any
+Depends: libgnsstk14 (>= 14.2.0), ${misc:Depends}, ${shlibs:Depends}
+Description: GNSS Toolkit (GNSSTk) - command line tools
+ The GNSS Toolkit (GNSSTk) is an open-source (LGPL) project sponsored by
+ the Space and Geophysics Laboratory (SGL), part of the Applied Research
+ Laboratories (ARL) at The University of Texas at Austin.
+ The primary goals of the GNSSTk project are to:
+ * provide applications for use by the GNSS and satellite navigation community.
+ * provide a core library to facilitate the development of GNSS applications.
diff --git a/debian/enable b/debian/enable
@@ -0,0 +1,2 @@
+export PATH=/usr/share/gnsstk${GNSSTK_APPS_VER}-apps/bin${PATH:+:${PATH}}
+export CMAKE_PREFIX_PATH=/usr/share/cmake/GNSSTK${GNSSTK_APPS_VER}_Apps${CMAKE_PREFIX_PATH:+:${CMAKE_PREFIX_PATH}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export PATH=/usr/share/gnsstk${GNSSTK_APPS_VER}-apps/bin${PATH:+:${PATH}}
		export CMAKE_PREFIX_PATH=/usr/share/cmake/GNSSTK${GNSSTK_APPS_VER}_Apps${CMAKE_PREFIX_PATH:+:${CMAKE_PREFIX_PATH}}