diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a6ff8798..7b248941b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,9 @@ cmake_minimum_required( VERSION 2.8.5 ) project( GPSTK ) -set( GPSTK_VERSION_MAJOR "2" ) -set( GPSTK_VERSION_MINOR "12" ) -set( GPSTK_VERSION_PATCH "2" ) +set( GPSTK_VERSION_MAJOR "3" ) +set( GPSTK_VERSION_MINOR "0" ) +set( GPSTK_VERSION_PATCH "0" ) set( GPSTK_VERSION "${GPSTK_VERSION_MAJOR}.${GPSTK_VERSION_MINOR}.${GPSTK_VERSION_PATCH}" ) # Test data file source directory diff --git a/ChangeLog.md b/ChangeLog.md index 914614c41..e7a2a12bd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,16 @@ +Version 3.0.0 Tuesday, February 11, 2020 + + Modifications by Author + --------------------- + Andy Kuck (1): + Add Conda Recipe + + Bryan Parsons (1): + Merge branch 'ci_conda' into 'master' + + + ################################################# + Version 2.12.2 Wednesday, January 15, 2020 Modifications by Author diff --git a/Doxyfile b/Doxyfile index c7a147421..0ad49bae6 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 = 2.12.2 +PROJECT_NUMBER = 3.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/NEWS.md b/NEWS.md index 98565f053..38219a7cf 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,8 +3,11 @@ NEWS GPS Toolkit News ------------------------------------------------------------------------------ + February 11, 2020 . . Release Candidate for Version 3.0.0 is frozen in the + repository + January 15, 2020 . . . Release Candidate for Version 2.12.2 is frozen in the - repository + repository October 9, 2019 . . . Release Candidate for Version 2.12.1 is frozen in the repository diff --git a/RELNOTES.md b/RELNOTES.md index f05bff2f4..c10b4a0d9 100755 --- a/RELNOTES.md +++ b/RELNOTES.md @@ -1,62 +1,82 @@ -GPSTk 2.12.2 Release Notes +GPSTk 3.0.0 Release Notes ======================== -Updates since v2.12.1 + * Major version bump triggered by migration of MDH code from SGLTk into its own repository - MDHTk + +Updates since v2.12.2 --------------------- **Build System and Test Suite** - * Updated build code to build static libraries on Windows, Static and Dynamic on all other platforms. + * Added conda recipes for compiling GPSTK conda packages. + **Gitlab CI** - * Updating the CI Pipeline to use docker workers rather than VM workers. REASON: Docker images are more isolated and less accidental state carried between pipelines. + * Added job to the CI pipeline to verify that those recipes compile. **Library Changes** - * Updated SVN-PRN References - Updating PRN 4 assignments. REASON: PRN 4 was taken away from SVN 36 and later re-assigned to SVN 74 - * Added atmospheric loading to geomatics library. Includes a store for coefficients for multiple sites, a computeDisplacement routine and a new test in ext/apps/geomatics/iers_test/test_tides.cpp. REASON: This is needed in precise positioning, PPP and differential - * Change in core/lib/GNSSEph/OrbElemStore findOrbElem selection logic. REASON: In the event the time of interest corresponds EXACTLY to a key in the map, it will now return that element instead of the previous element. The previous logic was an attempt to more closely replicate the user experience by delaying cutovers between message sets until after transmission was complete. However, this has proven to be confusing to users and would be very difficult to extend generally across all multi-GNSS message structures. - -*New Library Classes* - * ext/lib/Geomatics/AtmLoadTides.* - -**SWIG Bindings & Python** - * Added a flag to the gpstk setup.py file to ensure that the python module is installed as an egg directory. REASON: Some users were reporting problems with the python installation that traced back to the fact that the gpstk python module was being installed as a compressed egg file rather than an egg directory. Apparently, if the zip_safe flag is not specified, SetupTools will attempt to guess the best solution and some users were seeing it choose the archive file rather than directory. Setting the flag to false, should cause all users to see the expanded directory. - * Python 3.6 Functionality has been added, while still supporting Python 2.7. REASON: Python 2.7 will be deprecated as of January 2020 - - -**Test Changes** - -*New/Updated Tests* - * core/tests/FileHandling/Rinex3Obs_T.cpp - * core/tests/AppFrame/CMakeLists.txt - * core/tests/GNSSCore/CMakeLists.txt - * core/tests/Rinextools/CMakeLists.txt - * core/tests/checktools/CMakeLists.txt - * core/tests/difftools/CMakeLists.txt - * core/tests/filetools/CMakeLists.txt - * core/tests/mergetools/CMakeLists.txt - * core/tests/positioning/CMakeLists.txt - * core/tests/testsuccexp.cmake - * ext/apps/geomatics/rstats_test/CMakeLists.txt - * ext/tests/GNSSEph/CMakeLists.txt - * ext/tests/geomatics/CMakeLists.txt - * ext/tests/geomatics/CMakeLists.txt - - -**Truth Data Changes** - -*Updated Truth Data* - * data/EarthTides_IERS.exp - * data/testocean.blq - -*New Data Files* - * data/mixed211.05o - * data/testatm.atl + * Added parityStatus flag to PackedNavBits. REASON: Needed to support proper conversion of raw receiver files to MDH. -Fixes since v2.11 +Fixes since v2.12.2 -------------------- - * Fixed Issue 375 - FileHunter cannot follow links. - * Fixed Issue 394 - Rinex3ObsData does not properly handle header records - When processing the sample data in the RINEX 2.11 document (mixed obs), I found that Rinex3ObsData was not reading header records properly when encountering epoch flag 4 ("header records follow"). Instead, the header reacords are being attached to the subsequent object read. - * Fixed Issue 399 - Xvt.hpp does not compile on Debian 8 with HealthStatus:: on line 102 - * Fixed an issue with PRSolve - which failed when given a dual frequency solution descriptor where code1 is valid only on freq1, and code2 is valid only on freq2. Example: GAL:15:BI + * Fixed a bug that prevented some compiler arguments to be passed through build.sh + + + Removed Code due to Deprecation + ------------------------------- + * /apps + * /clocktools + * rmoutlier + * dallandev + * ffp + * mallandev + * nallandev + * oallandev + * ohadamarddev + * ORDPhaseParser + * pff + * scale + * tallandev + * TIAPhaseParser + * trunc + * allanplot.py + * /differential + * vecsol + * /filetools + * GloDump + * rinexthin + * /positioning + * posInterp + * /lib + * /Geodyn + * ASConstant.hpp + * AtmosphericDrag + * CiraExpotentialDrag + * EarthBody + * EarthOceanTide + * EarthPoleTide + * EarthSolidTide + * EGM96GravityModel + * EquationOfMotion.hpp + * ForceModel.hpp + * ForceModelList + * HarrisPriesterDrag + * IERS + * IERSConventions + * Integrator.hpp + * JGM3GravityModel + * KeplerOrbit + * MoonForce + * Msise00Drag + * PvtStore + * ReferenceFrames + * RelativityEffect + * RungeKuttaFehlberg + * SatOrbit + * SatOrbitPropogator + * SolarRadiationPressure + * Spacecraft + * SphericalHarmonicGravity + * SunForce + * UTCTime diff --git a/debian/changelog b/debian/changelog index 74c86051f..2c8460cbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +gpstk (3.0.0-1) stable; urgency=medium + + * Build for stretch + + -- Bryan Parsons Tue, 11 Feb 2020 11:02:39 -0600 + +gpstk (3.0.0-1~bpo9+2) stable; urgency=medium + + * Build for wheezy-backports + + -- Bryan Parsons Tue, 11 Feb 2020 11:01:47 -0600 + +gpstk (3.0.0-1~bpo9+3) stable; urgency=medium + + * Update to upstream version 3.0.0 + * Build for jessie-backports + + -- Bryan Parsons Tue, 11 Feb 2020 10:46:54 -0600 + gpstk (2.12.2-1) stable; urgency=medium * Update to upstream version 2.12.2 diff --git a/debian/control b/debian/control index 83a871184..650a48467 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: libgpstk2.12 (>= ${binary:Version}), python-gpstk, ${misc:Depends}, ${shlibs:Depends}, ${python:Depends} +Depends: libgpstk3.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,8 +24,8 @@ Description: GPS Toolkit (GPSTk) - command line tools Package: libgpstk-dev Section: libdevel Architecture: any -Depends: libgpstk2.12 (= ${binary:Version}), ${misc:Depends} -Description: GPS Toolkit (GPSTk) - Headers +Depends: libgpstk3.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 Laboratories (ARL) at The University of Texas at Austin. @@ -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: libgpstk2.12 +Package: libgpstk3.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: libgpstk2.12-dbg +Package: libgpstk3.0-dbg Architecture: any Section: debug Priority: extra -Depends: libgpstk2.12 (= ${binary:Version}), ${misc:Depends} +Depends: libgpstk3.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 @@ -70,4 +70,3 @@ Description: GPS Toolkit (GPSTk) - Python bindings The primary goals of the GPSTk 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/libgpstk2.12.install b/debian/libgpstk3.0.install similarity index 100% rename from debian/libgpstk2.12.install rename to debian/libgpstk3.0.install diff --git a/swig/sphinx/conf.py b/swig/sphinx/conf.py index 1348f4ded..813aef380 100755 --- a/swig/sphinx/conf.py +++ b/swig/sphinx/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '2.12' +version = '3.0' # The full version, including alpha/beta/rc tags. -release = '2.12.2' +release = '3.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.