From c7dc72122db58799f57d44c4c7da6cc193fc95e9 Mon Sep 17 00:00:00 2001 From: JonathanMeans Date: Mon, 16 Sep 2019 09:51:06 -0400 Subject: [PATCH 1/2] Update version information --- six/modules/wscript | 2 +- six/projects/csm/source/SICDSensorModel.cpp | 2 +- six/projects/csm/source/SIDDSensorModel.cpp | 2 +- six/projects/csm/source/SIXPlugin.cpp | 4 ++-- six/projects/csm/wscript | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/six/modules/wscript b/six/modules/wscript index 63645c685..8b632a210 100644 --- a/six/modules/wscript +++ b/six/modules/wscript @@ -5,7 +5,7 @@ def options(opt): opt.recurse() def configure(conf): - conf.env['SIX_VERSION'] = '2.2.9-alpha' + conf.env['SIX_VERSION'] = '2.2.9' # This allows us to build XML_DATA_CONTENT statically so that users don't # have to set NITF_PLUGIN_PATH diff --git a/six/projects/csm/source/SICDSensorModel.cpp b/six/projects/csm/source/SICDSensorModel.cpp index b50ecb92b..25319fe90 100644 --- a/six/projects/csm/source/SICDSensorModel.cpp +++ b/six/projects/csm/source/SICDSensorModel.cpp @@ -35,7 +35,7 @@ namespace six { namespace CSM { -const csm::Version SICDSensorModel::VERSION(1, 1, 4); +const csm::Version SICDSensorModel::VERSION(1, 1, 5); const char SICDSensorModel::NAME[] = "SICD_SENSOR_MODEL"; SICDSensorModel::SICDSensorModel(const csm::Isd& isd, diff --git a/six/projects/csm/source/SIDDSensorModel.cpp b/six/projects/csm/source/SIDDSensorModel.cpp index 18802965b..f57348a82 100644 --- a/six/projects/csm/source/SIDDSensorModel.cpp +++ b/six/projects/csm/source/SIDDSensorModel.cpp @@ -35,7 +35,7 @@ namespace six { namespace CSM { -const csm::Version SIDDSensorModel::VERSION(1, 1, 4); +const csm::Version SIDDSensorModel::VERSION(1, 1, 5); const char SIDDSensorModel::NAME[] = "SIDD_SENSOR_MODEL"; SIDDSensorModel::SIDDSensorModel(const csm::Isd& isd, diff --git a/six/projects/csm/source/SIXPlugin.cpp b/six/projects/csm/source/SIXPlugin.cpp index e47379c68..e424b7ec8 100644 --- a/six/projects/csm/source/SIXPlugin.cpp +++ b/six/projects/csm/source/SIXPlugin.cpp @@ -37,8 +37,8 @@ namespace six namespace CSM { const char SIXPlugin::PLUGIN_NAME[] = "SIX"; -const char SIXPlugin::MANUFACTURER[] = "Radiant Solutions"; -const char SIXPlugin::RELEASE_DATE[] = "20180818"; +const char SIXPlugin::MANUFACTURER[] = "Maxar"; +const char SIXPlugin::RELEASE_DATE[] = "20190916"; const size_t SIXPlugin::SICD_MODEL_INDEX; const size_t SIXPlugin::SIDD_MODEL_INDEX; diff --git a/six/projects/csm/wscript b/six/projects/csm/wscript index 07faaa087..3319f94e7 100644 --- a/six/projects/csm/wscript +++ b/six/projects/csm/wscript @@ -1,5 +1,4 @@ MAINTAINER = 'adam.sylvester@mdaus.com' -VERSION = '1.1.2' MODULE_DEPS = 'six.sicd six.sidd' PLUGIN = 'CSM' REMOVEPLUGINPREFIX = True From 36220767bfa1ab2674b0786d2ee4a721868ea795 Mon Sep 17 00:00:00 2001 From: JonathanMeans Date: Mon, 16 Sep 2019 11:06:29 -0400 Subject: [PATCH 2/2] Update plugin version --- six/projects/csm/wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/six/projects/csm/wscript b/six/projects/csm/wscript index 3319f94e7..1dfacda57 100644 --- a/six/projects/csm/wscript +++ b/six/projects/csm/wscript @@ -1,6 +1,7 @@ MAINTAINER = 'adam.sylvester@mdaus.com' MODULE_DEPS = 'six.sicd six.sidd' PLUGIN = 'CSM' +PLUGIN_VERSION = '115' REMOVEPLUGINPREFIX = True import sys, os, re @@ -45,7 +46,7 @@ def configure(conf): else: raise Errors.WafError('Unsupported platform %s' % sys.platform) - pluginVersion = '114' + pluginVersion = '115' if Options.options.csm_version == '3.0.3': csmVersion = '303' else: