Merge branch 'master' into develop/update-coda-oss

ReleaseNotes.md

@@ -1,6 +1,7 @@
 # NITRO (NITF i/o) Release Notes
 
-## WIP: [Version 2.?.?](https://github.com/mdaus/nitro/releases/tag/NITRO-2.?.?); ??? ??, 2022
+## [Version 2.10.9](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.9); May 3, 2022
+* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-05-03](https://github.com/mdaus/coda-oss/releases/tag/2022-05-03)
 * the large unused **archive** directory has been removed; contents are in [archive/java](https://github.com/mdaus/nitro/tree/archive/java)
 and [archive/mex](https://github.com/mdaus/nitro/tree/archive/mex).
 * the large unused **docs** directory has been removed; contents are in [archive/docs](https://github.com/mdaus/nitro/tree/archive/docs).

modules/c++/nitf/include/nitf/Version.hpp

@@ -29,7 +29,7 @@
 
 #define NITF_VERSION_MAJOR	2
 #define NITF_VERSION_MINOR	10
-#define NITF_VERSION_PATCH	8
+#define NITF_VERSION_PATCH	9
 #define NITF_VERSION_BUILD		0
 #define NITF_VERSION CODA_OSS_MAKE_VERSION_MMPB(NITF_VERSION_MAJOR, NITF_VERSION_MINOR, NITF_VERSION_PATCH, NITF_VERSION_BUILD)
 

modules/c/cgm/wscript

@@ -26,10 +26,11 @@ def build(bld):
 
     # Convenience target
     # We do this mainly so that from the top-level wscript we can choose what to build
-    tests = bld.path.ant_glob(os.path.join('tests', '*.c'))
-    test_targets = []
-    for test in tests:
-        test_targets.append(os.path.splitext(str(test))[0])
-
-    bld(features='add_targets', target='cgm-c-tests',
-        targets_to_add=test_targets)
+    if not Options.options.libs_only:
+        tests = bld.path.ant_glob(os.path.join('tests', '*.c'))
+        test_targets = []
+        for test in tests:
+            test_targets.append(os.path.splitext(str(test))[0])
+
+        bld(features='add_targets', target='cgm-c-tests',
+            targets_to_add=test_targets)

modules/c/nrt/include/nrt/Version.h

@@ -1,5 +1,5 @@
 #pragma once
 
 #if !defined(NRT_LIB_VERSION)
-#define NRT_LIB_VERSION "2.10.8"
+#define NRT_LIB_VERSION "2.10.9"
 #endif

modules/c/nrt/wscript

@@ -35,11 +35,11 @@ def build(bld):
         except:{}
 
     # Convenience target
-    # We do this mainly so that from the top-level wscript we can choose what to build
-    tests = bld.path.ant_glob(os.path.join('unittests', '*.c'))
-    test_targets = []
-    for test in tests:
-        test_targets.append(os.path.splitext(str(test))[0])
-
-    bld(features='add_targets', target='nrt-unittests',
-        targets_to_add=test_targets)
+    if not Options.options.libs_only: # We do this mainly so that from the top-level wscript we can choose what to build
+        tests = bld.path.ant_glob(os.path.join('unittests', '*.c'))
+        test_targets = []
+        for test in tests:
+            test_targets.append(os.path.splitext(str(test))[0])
+    
+        bld(features='add_targets', target='nrt-unittests',
+            targets_to_add=test_targets)