Merge pull request #288 from ngageoint/update_version

Update version information
ngageoint · Sep 16, 2019 · 45a172b · 45a172b
2 parents d285cc7 + 3622076
commit 45a172b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 MAINTAINER         = 'adam.sylvester@mdaus.com'
-VERSION            = '1.1.2'
 MODULE_DEPS        = 'six.sicd six.sidd'
 PLUGIN             = 'CSM'
+PLUGIN_VERSION     = '115'
 REMOVEPLUGINPREFIX = True
 
 import sys, os, re
@@ -46,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: