Bumping up version numbers of SIX and CSM plugin. Fixing how SIX library filenames were getting set - they include the version number again.

Author: asylvest

six/modules/c++/cphd/wscript

@@ -7,5 +7,5 @@ options = configure = distclean = lambda p: None
 
 def build(bld):
     modArgs = globals()
-    modArgs['SIX_VERSION'] = bld.env['SIX_VERSION']
+    modArgs['VERSION'] = bld.env['SIX_VERSION']
     bld.module(**modArgs)

six/modules/c++/scene/wscript

@@ -7,5 +7,5 @@ options = configure = distclean = lambda p: None
 
 def build(bld):
     modArgs = globals()
-    modArgs['SIX_VERSION'] = bld.env['SIX_VERSION']
+    modArgs['VERSION'] = bld.env['SIX_VERSION']
     bld.module(**modArgs)

six/modules/c++/six.convert/wscript

@@ -7,6 +7,6 @@ options = configure = distclean = lambda p: None
 
 def build(bld):
     modArgs = globals()
-    modArgs['SIX_VERSION'] = bld.env['SIX_VERSION']
+    modArgs['VERSION'] = bld.env['SIX_VERSION']
     bld.module(**modArgs)
 

six/modules/c++/six.sicd/wscript

@@ -9,7 +9,7 @@ options = configure = distclean = lambda p: None
 
 def build(bld):
     modArgs = globals()
-    modArgs['SIX_VERSION'] = bld.env['SIX_VERSION']
+    modArgs['VERSION'] = bld.env['SIX_VERSION']
     bld.module(**modArgs)
 
     # install the schemas

six/modules/c++/six.sidd/wscript

@@ -7,7 +7,7 @@ options = configure = distclean = lambda p: None
 
 def build(bld):
     modArgs = globals()
-    modArgs['SIX_VERSION'] = bld.env['SIX_VERSION']
+    modArgs['VERSION'] = bld.env['SIX_VERSION']
     bld.module(**modArgs)
 
     # install the schemas

six/modules/c++/six/wscript

@@ -7,5 +7,5 @@ options = configure = distclean = lambda p: None
 
 def build(bld):
     modArgs = globals()
-    modArgs['SIX_VERSION'] = bld.env['SIX_VERSION']
+    modArgs['VERSION'] = bld.env['SIX_VERSION']
     bld.module(**modArgs)

six/modules/wscript

@@ -5,7 +5,7 @@ def options(opt):
     opt.recurse()
 
 def configure(conf):
-    conf.env['SIX_VERSION'] = '2.2.7'
+    conf.env['SIX_VERSION'] = '2.2.8'
 
     # This allows us to build XML_DATA_CONTENT statically so that users don't
     # have to set NITF_PLUGIN_PATH

six/projects/csm/source/SICDSensorModel.cpp

@@ -35,7 +35,7 @@ namespace six
 {
 namespace CSM
 {
-const csm::Version SICDSensorModel::VERSION(1, 1, 3);
+const csm::Version SICDSensorModel::VERSION(1, 1, 4);
 const char SICDSensorModel::NAME[] = "SICD_SENSOR_MODEL";
 
 SICDSensorModel::SICDSensorModel(const csm::Isd& isd,

six/projects/csm/source/SIDDSensorModel.cpp

@@ -35,7 +35,7 @@ namespace six
 {
 namespace CSM
 {
-const csm::Version SIDDSensorModel::VERSION(1, 1, 3);
+const csm::Version SIDDSensorModel::VERSION(1, 1, 4);
 const char SIDDSensorModel::NAME[] = "SIDD_SENSOR_MODEL";
 
 SIDDSensorModel::SIDDSensorModel(const csm::Isd& isd,

six/projects/csm/source/SIXPlugin.cpp

@@ -37,8 +37,8 @@ namespace six
 namespace CSM
 {
 const char SIXPlugin::PLUGIN_NAME[] = "SIX";
-const char SIXPlugin::MANUFACTURER[] = "MDAUS";
-const char SIXPlugin::RELEASE_DATE[] = "20161223";
+const char SIXPlugin::MANUFACTURER[] = "Radiant Solutions";
+const char SIXPlugin::RELEASE_DATE[] = "20180818";
 const size_t SIXPlugin::SICD_MODEL_INDEX;
 const size_t SIXPlugin::SIDD_MODEL_INDEX;