diff --git a/CMakeLists.txt b/CMakeLists.txt index dea2353ea..8f83b7292 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ cmake_minimum_required( VERSION 2.8.5 ) project( GPSTK ) -set( GPSTK_VERSION_MAJOR "3" ) -set( GPSTK_VERSION_MINOR "1" ) +set( GPSTK_VERSION_MAJOR "4" ) +set( GPSTK_VERSION_MINOR "0" ) set( GPSTK_VERSION_PATCH "0" ) set( GPSTK_VERSION "${GPSTK_VERSION_MAJOR}.${GPSTK_VERSION_MINOR}.${GPSTK_VERSION_PATCH}" ) diff --git a/ChangeLog.md b/ChangeLog.md index 57c7e7ac6..36fd64f75 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,59 @@ +Version 4.0.0 Monday March 30, 2020 + + Modifications by Author + Andrew Kuck (3): + Awful hack to get inheritance back. + Fixed artifact path for conda package build. + Removed NEWS.md + + Andy Kuck (21): + Seperate python RPM Generation in CI + Merge branch 'ci_seperate_rpm' into 'master' + Merge branch 'issue_264' into 'master' + Merge branch 'issue_248_must_die' into 'master' + Merge branch 'issue_405' into 'master' + Swig missing return statements + Merge branch 'ci_bad_return_code' into 'master' + Add CI Check for building on Debian 7 + Merge branch 'ci_deb7_check' into 'master' + Merge branch 'issue_412_SVNumXRef' into 'master' + Merge branch 'issue_406' into 'master' + Fix versioned include directory installation. + Merge branch 'issue_410' into 'master' + Merge branch 'issue_413' into 'master' + Removed deprecated throw statements. + Update Conda Package Artifacts. + Merge branch 'ci_conda_package' into 'master' + Merge branch 'issue_402_QZSS_2' into 'master' + CI Updates for Completeness + Merge branch 'ci_uniformity' into 'master' + Merge branch '416-optimization-on-linux' into 'master' + + Brian Tolman (1): + optimation O2 is 50 to 100 percent slower than O3, go back to O3, ref commit cd40eed4d5 + + johnk (10): + Correct the velocity computation in OrbElem and provide a test + Remove the fabs call for printing raw data + Add missing final setting of G value to AlmOrbit + BDSEphemeris: Fix test for GEO to assume i0 is in radians rather than semicircles, and fix div computation + Add comments to explain CommonTime's internal representation so we can finally put this blasted thing to bed + Eliminate unnecessary use of references that were causing seg faults under debian 10 + Remove deprecated exception specifications from gpstk, leaving behind a minimal doxygen comment in their places + Merge remote-tracking branch 'origin/master' into issue_406 + Change noexcept to throw() in hopes that the older compilers will stop complaining + Add conversion from string back to SatID::SatelliteSystem + + renfrob (6): + Moving PRN 18 from SVN 34 to SVN 75 + Tweaks to recognize QZSS PRNs. + Updating tests for computeBeginValid() to include QZSS + Adding means to inspect valid SatelliteSystems in the store. + Tweaking PRN numbering to accomodate QZSS + Merge gpstk updates + + ################################################# + Version 3.1.0 Tuesday March 03, 2020 Modifications by Author diff --git a/Doxyfile b/Doxyfile index b00fdde50..f22f50be8 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = "GPS ToolKit Software Library" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 3.1.0 +PROJECT_NUMBER = 4.0.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 diff --git a/RELNOTES.md b/RELNOTES.md index 0726266b8..f15f3714f 100755 --- a/RELNOTES.md +++ b/RELNOTES.md @@ -1,26 +1,35 @@ -GPSTk 3.1.0 Release Notes +GPSTk 4.0.0 Release Notes ======================== - * This version was created in response to additional Navigation message processing capability. + * This major version number release was due to some API breaking call signature changes. -Updates since v3.0.0 +Updates since v3.1.0 --------------------- -**Build System and Test Suite** - * Adjusted build.sh to better support specifying a python3 executable. - **Gitlab CI** - * Windows CI testing was added back. - * Added package building and testing for redhat and debian to master branch pipelines. + * Conda packages are now correctly preserved as build artifacts. + * Master branch now run both build & test on debian 7, debian 8, and debian 10. **Library Changes** - * OrbAlm/OrbAlmGen updated to support direct loading of the engineering unit values. (Better support for Nav Messages) - * NavFilter framework updated to include classes that abstract access to the storage of the subframe data. - * Modified YumaAlamancStore and SEMAlmanacStore to inherit from OrbAlmStore (instead of GPSAlmanacStore). + * Changed a calling signature in OrbElemRinex + * Add string conversions to-from SatID.SatelliteSystem + * Remove exception specifications from function/method prototypes and definitions + * SVNumXRef - PRN 18 removed from SVN 34 and assigned to SVN 75 -Fixes since v3.0.0 +Fixes since v3.1.0 -------------------- - * Fixed a bug revealed by GPS III where endValid times was calculated incorrectly in OrbElemRinex + * Fix to recognized QZSS navigation message data set cutovers. + * Fix an installation bug when using versioned header directories. + * Fix slight errors in svXvt velocity computation. + * Update svXvt to set Xvt.health when available. + * Fix BrcKeplerOrbit to use relativity correction and initial URE value of 0. + * Fix AlmOrbit to add missing final value of G. + * Fix BDSEphemeris to use GEO equations only above 7 degrees. + * Change OrbitEph to use CGCS2000 ellipsoid for BeiDou when computing relativity correction + * Fix bug in timeconvert app breaking after year 2038 + * Fix incorrect interval in output header from RinEdit if thinning option is used. + * Fix memory leak during OrbElmStore deallocation. Removed Code due to Deprecation ------------------------------- + NEWS.md diff --git a/debian/changelog b/debian/changelog index 8fb367291..cecfdc83d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +gpstk (4.0.0-1) stable; urgency=low + + * Updated to version 4.0.0 + * Modify RPM packages to seperate python installation from C++ + apps/libs. + * Fix slight errors in svXvt velocity computation. + * Update svXvt to set Xvt.health when available. + * Fix BrcKeplerOrbit to use relativity correction and initial URE + value of 0. + * Fix AlmOrbit to add missing final value of G. + * Fix BDSEphemeris to use GEO equations only above 7 degrees. + * Change OrbitEph to use CGCS2000 ellipsoid for BeiDou when computing + relativity correction + * Fix misleading comment on CommonTime.m_day + * Fix test failures observed running on Debian 10. + * Add CI checks to ensure continued compatibility with Debian 7. + * Update SVNumXRef to move PRN 18 from SVN 34 to SVN 75 + * Remove deprecated dynamic exception specifications. + * Add string conversions to-from SatID.SatelliteSystem + * Updated call signatures in OrbElemRinex to support downstream + callers. + * Update CMAKE to optimize at level O3 on linux by default. + * Fix bug in timeconvert app breaking after year 2038 + * Fix incorrect interval in output header from RinEdit if thinning + option is used. + * Fix memory leak during OrbElmStore deallocation. + + -- Andrew Kuck Mon, 30 Mar 2020 15:06:22 -0500 + gpstk (3.1.0-1) stable; urgency=low * Updated to version 3.1.0 diff --git a/debian/control b/debian/control index 5ab5ef954..85f05491a 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: https://github.com/SGL-UT/GPSTk.git Package: gpstk-bin Architecture: any -Depends: libgpstk3.1 (>= ${binary:Version}), python-gpstk, ${misc:Depends}, ${shlibs:Depends}, ${python:Depends} +Depends: libgpstk4.0 (>= ${binary:Version}), python-gpstk, ${misc:Depends}, ${shlibs:Depends}, ${python:Depends} Description: GPS Toolkit (GPSTk) - command line tools The GPS Toolkit (GPSTk) is an open-source (LGPL) project sponsored by the Space and Geophysics Laboratory (SGL), part of the Applied Research @@ -24,7 +24,7 @@ Description: GPS Toolkit (GPSTk) - command line tools Package: libgpstk-dev Section: libdevel Architecture: any -Depends: libgpstk3.1 (= ${binary:Version}), ${misc:Depends} +Depends: libgpstk4.0 (= ${binary:Version}), ${misc:Depends} Description: GPS Toolkit (GPSTk) - Headers The GPS Toolkit (GPSTk) is an open-source (LGPL) project sponsored by the Space and Geophysics Laboratory (SGL), part of the Applied Research @@ -33,7 +33,7 @@ Description: GPS Toolkit (GPSTk) - Headers * provide applications for use by the GNSS and satellite navigation community. * provide a core library to facilitate the development of GNSS applications. -Package: libgpstk3.1 +Package: libgpstk4.0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: GPS Toolkit (GPSTk) - Shared Libraries @@ -44,11 +44,11 @@ Description: GPS Toolkit (GPSTk) - Shared Libraries * provide applications for use by the GNSS and satellite navigation community. * provide a core library to facilitate the development of GNSS applications. -Package: libgpstk3.1-dbg +Package: libgpstk4.0-dbg Architecture: any Section: debug Priority: extra -Depends: libgpstk3.1 (= ${binary:Version}), ${misc:Depends} +Depends: libgpstk4.0 (= ${binary:Version}), ${misc:Depends} Description: GPS Toolkit (GPSTk) - Shared Library Debugging Symbols The GPS Toolkit (GPSTk) is an open-source (LGPL) project sponsored by the Space and Geophysics Laboratory (SGL), part of the Applied Research diff --git a/debian/libgpstk3.1.install b/debian/libgpstk4.0.install similarity index 100% rename from debian/libgpstk3.1.install rename to debian/libgpstk4.0.install diff --git a/rpm_files/SPECS/gpstk.spec b/rpm_files/SPECS/gpstk.spec index aeb36f8e3..47b2288e4 100644 --- a/rpm_files/SPECS/gpstk.spec +++ b/rpm_files/SPECS/gpstk.spec @@ -1,6 +1,6 @@ %define name gpstk -%define version 3.1.0 -%define release 2 +%define version 4.0.0 +%define release 1 Summary: GPS Toolkit Name: %{name} @@ -54,6 +54,26 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 30 2020 Andrew Kuck +- Updated for v4.0.0 release +- Update CMAKE to optimize at level O3 on linux by default. +- Updated call signatures in OrbElemRinex to support downstream callers. +- Add string conversions to-from SatID.SatelliteSystem +- Remove deprecated dynamic exception specifications. +- Update SVNumXRef to move PRN 18 from SVN 34 to SVN 75 +- Add CI checks to ensure continued compatibility with Debian 7. +- Fix test failures observed running on Debian 10. +- Fix misleading comment on CommonTime.m_day +- Change OrbitEph to use CGCS2000 ellipsoid for BeiDou when computing relativity correction +- Fix BDSEphemeris to use GEO equations only above 7 degrees. +- Fix AlmOrbit to add missing final value of G. +- Fix BrcKeplerOrbit to use relativity correction and initial URE value of 0. +- Update svXvt to set Xvt.health when available. +- Fix slight errors in svXvt velocity computation. +- Modify RPM packages to seperate python installation from C++ apps/libs. +- Fix bug in timeconvert app breaking after year 2038 +- Fix incorrect interval in output header from RinEdit if thinning option is used. +- Fix memory leak during OrbElmStore deallocation. * Tue Mar 03 2020 Andrew Kuck - Split single RPM into core and python packages for v3.1.0 release 2 * Tue Mar 03 2020 Andrew Kuck diff --git a/rpm_files/SPECS/gpstk_py27.spec b/rpm_files/SPECS/gpstk_py27.spec index 3d17731a6..bf634b9a5 100644 --- a/rpm_files/SPECS/gpstk_py27.spec +++ b/rpm_files/SPECS/gpstk_py27.spec @@ -1,6 +1,6 @@ %define name python-gpstk -%define version 3.1.0 -%define release 2 +%define version 4.0.0 +%define release 1 Summary: GPS Toolkit Name: %{name} @@ -61,6 +61,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 30 2020 Andrew Kuck +- Updated for v4.0.0 release * Tue Mar 03 2020 Andrew Kuck - Split single RPM into core and python packages for v3.1.0 release 2 * Tue Mar 03 2020 Andrew Kuck diff --git a/rpm_files/SPECS/gpstk_py36.spec b/rpm_files/SPECS/gpstk_py36.spec index a7b86dfad..ba9e172bb 100644 --- a/rpm_files/SPECS/gpstk_py36.spec +++ b/rpm_files/SPECS/gpstk_py36.spec @@ -1,6 +1,6 @@ %define name python3-gpstk -%define version 3.1.0 -%define release 2 +%define version 4.0.0 +%define release 1 Summary: GPS Toolkit Name: %{name} @@ -60,6 +60,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 30 2020 Andrew Kuck +- Updated for v4.0.0 release * Tue Mar 03 2020 Andrew Kuck - Split single RPM into core and python packages for v3.1.0 release 2 * Tue Mar 03 2020 Andrew Kuck diff --git a/swig/sphinx/conf.py b/swig/sphinx/conf.py index ebb46137b..8ca8cd94d 100755 --- a/swig/sphinx/conf.py +++ b/swig/sphinx/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '3.1' +version = '4.0' # The full version, including alpha/beta/rc tags. -release = '3.1.0' +release = '4.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.