summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2018-10-01 18:19:38 -0700
committerGary E. Miller <gem@rellim.com>2018-10-01 18:28:45 -0700
commit236aa456d8f148870c80fde47fdea6b685d4d3b1 (patch)
treed32cd4786dc6faec32774e028fbd287c6eda415e
parentcf4f65399f138d8b57b87d3a4ded4ff7424f5b7c (diff)
downloadgpsd-236aa456d8f148870c80fde47fdea6b685d4d3b1.tar.gz
Versions in C and Python were out of sync.
Add notes as reminder for next change.
-rw-r--r--SConstruct1
-rw-r--r--gps/__init__.py7
-rw-r--r--gpsd.h5
3 files changed, 9 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 484858a4..e8cbee51 100644
--- a/SConstruct
+++ b/SConstruct
@@ -51,6 +51,7 @@ import SCons
from leapsecond import conditional_leapsecond_fetch
# Release identification begins here
+# Keep in sync with gps/__init__.py
gpsd_version = "3.18~dev"
# client library version
diff --git a/gps/__init__.py b/gps/__init__.py
index f2882f4b..c7bc1125 100644
--- a/gps/__init__.py
+++ b/gps/__init__.py
@@ -10,9 +10,12 @@ from __future__ import absolute_import # Ensure Python2 behaves like Python 3
from .gps import *
from .misc import *
-api_major_version = 5 # bumped on incompatible changes
-api_minor_version = 0 # bumped on compatible changes
+# Keep in sync with GPSD_PROTO_MAJOR_VERSION and GPSD_PROTO_MINOR_VERSION in
+# gpsd.h
+api_major_version = 3 # bumped on incompatible changes
+api_minor_version = 13 # bumped on compatible changes
+# keep in sync with gpsd_version in SConstruct
__version__ = '3.18~dev'
# The 'client' module exposes some C utility functions for Python clients.
diff --git a/gpsd.h b/gpsd.h
index 74fa9868..a1bd1c31 100644
--- a/gpsd.h
+++ b/gpsd.h
@@ -53,8 +53,9 @@ extern "C" {
* 3.13 gnssid:svid added to SAT
* time added to ATT
*/
-#define GPSD_PROTO_MAJOR_VERSION 3 /* bump on incompatible changes */
-#define GPSD_PROTO_MINOR_VERSION 13 /* bump on compatible changes */
+/* Keep in sync with api_major_version and api_minor gps/__init__.py */
+#define GPSD_PROTO_MAJOR_VERSION 3 /* bump on incompatible changes */
+#define GPSD_PROTO_MINOR_VERSION 13 /* bump on compatible changes */
#define JSON_DATE_MAX 24 /* ISO8601 timestamp with 2 decimal places */