Version 6.9 Community Edition Update

.gitignore

@@ -9,6 +9,7 @@ jar
 .classpath
 .cproject
 .csettings
+.pydevproject
 *~
 *.[ao]
 /TAGS
@@ -112,6 +113,7 @@ src/api/dcps/java/saj/manifest/
 install/VC
 install/HDE
 install/RTS
+install/DRE
 install/DEMOS
 install/STE
 etc/idlpp/SACPP
@@ -137,8 +139,11 @@ release_info/RELEASE
 install/*.HDE*.opensplice.xml
 install/*.RTS*.opensplice.xml
 install/*.STE*.opensplice.xml
+install/*.DRE*.opensplice.xml
+src/services/ddsi2/code
 examples/tmp/demo/ishapes-java5/generated
 etc/protobuf/SAJ5/DescriptorProtos.java
+etc/protobuf
 src/tools/cm/dataadapter/code/org/opensplice/cmdataadapter/protobuf/ProtobufDataAdapterImpl.java
 src/tools/cm/dataadapter/manifest
 src/tools/protobuf/generated
@@ -161,3 +166,10 @@ examples/protobuf/java5/standalone/generated/
 src/api/streams/sacpp/include/ccpp_streams_if.h
 src/api/streams/sacpp/include/streams_dcps.h
 src/api/streams/sacpp/include/streams_dcpsSplDcps.h
+src/api/dcps/sacs/code/DDS/AssemblyAttributes.cs
+src/api/dcps/java/cj_y2038_ready/manifest
+src/api/face/java/manifest
+examples/**/target
+examples/**/*.jar
+src/api/dcps/java**/target
+src/api/dcps/java**/*.jar

MPC/config/build_ospl_dcpsisocpp2.mpb

@@ -6,8 +6,8 @@ project : ospl_build_lib, dcps_typesupport_base, ospl_base, ospl_ddsuser {
 
     specific(prop:windows) {
         splice_ts_flags += -P OS_API,cpp_dcps_if.h
-    }
 
+    }
 
     sharedname = dcpsisocpp2
     // Always put $BOOST_ROOT on 'in case' users want to rebuild. DO NOT remove the trailing /.
@@ -18,12 +18,16 @@ feature(isocpp2_cxx11) {
     specific (make) {
         extracppflags += -std=c++0x
     }
+    specific (prop:windows) {
+        macros += OSPL_USE_CXX11
+    }
 }
 
 feature(!src_co) {
     includes += isocpp2/generated
     includes += $(OSPL_HOME)/include/dcps/C++/SACPP
     includes += $(OSPL_HOME)/include/dcps/C++/isocpp2
+    includes += isocpp2/generatedIoTData
 
     specific (make) {
         obj_dir = .objisocpp2/
@@ -37,8 +41,14 @@ feature(!src_co) {
         $(OSPL_HOME)/etc/idl/dds_namedQosTypes.idl
     }
 
+    TypeSupport_Files {
+        splice_ts_flags += -l isocpp2 -d isocpp2/generatedIoTData
+        $(OSPL_HOME)/etc/idl/dds_IoTData.idl
+    }
+
     // Put the headers and inline code into the include dir
     postbuild = <%cp%>  .<%slash%>isocpp2<%slash%>generated<%slash%>*.h <%quote%>$(OSPL_HOME)<%slash%>include<%slash%>dcps<%slash%>C++<%slash%>SACPP<%quote%>
+    postbuild += <%cp%>  .<%slash%>isocpp2<%slash%>generatedIoTData<%slash%>*.h* <%quote%>$(OSPL_HOME)<%slash%>include<%slash%>dcps<%slash%>C++<%slash%>isocpp2<%slash%>org<%slash%>opensplice<%slash%>dds<%slash%>iot<%quote%>
     recurse = 1
     Source_Files {
         isocpp2
@@ -58,6 +68,7 @@ feature(src_co) {
     includes += $(OSPL_HOME_NORMALIZED)/src/api/dcps/c++/sacpp/include
     includes += $(OSPL_HOME_NORMALIZED)/src/api/dcps/c++/sacpp/bld/$(SPLICE_TARGET)
     includes += include
+    includes += $(OSPL_HOME_NORMALIZED)/src/api/dcps/isocpp2/bld/$(SPLICE_TARGET)
 
     // idlpp code generation
     TypeSupport_Files {
@@ -66,6 +77,11 @@ feature(src_co) {
         $(OSPL_HOME_NORMALIZED)/etc/idl/dds_dcps_builtintopics.idl
         $(OSPL_HOME_NORMALIZED)/etc/idl/dds_namedQosTypes.idl
     }
+
+    TypeSupport_Files {
+        splice_ts_flags += -l isocpp2 -d $(OSPL_HOME_NORMALIZED)/src/api/dcps/isocpp2/bld/$(SPLICE_TARGET)
+        $(OSPL_HOME)/etc/idl/dds_IoTData.idl
+    }
     recurse = 1
     Source_Files {
         code

MPC/config/csharp.mpb

@@ -20,7 +20,16 @@ project {
         // add '.' as a reference path as it is relative. Please specify
         // an absolute path." on C# project load into the IDE
         libpaths -= .
-    }
+  }
+  // needed to expand the env var into an actual value
+  expand(ospl_dotnet) {
+    $DOTNET
+  }
+
+  specific(prop:windows) {
+    TargetFrameworkVersion = $(ospl_dotnet)
+  }
+
 }
 // force platform to 32 bit when compiling for a 32 bit platform
 // default AnyCPU gives problems when compiled on a 64 bit architecture see OSPL-6171

MPC/config/default.features

@@ -71,6 +71,8 @@ ospl_os_host_solaris = 0
 // Compilers (and other variations)
 ospl_compiler_studio = 0
 ospl_compiler_gcc = 0
+ospl_gcc_5 = 0
+ospl_gcc_6 = 0
 
 // VxWorks 6.5, 6.6, and 6.7 have libs under target/usr/lib, so set to 1
 ospl_vxworks_libs_in_target_usr_lib=0
@@ -102,7 +104,9 @@ cortexa9t_neon_WRlinux5_gcc = 0
 cortexa9t_yocto = 0
 armv7l_linux = 0
 armv7a_vfp_neon_linux = 0
+armv7a_lafp_neon_linux = 0
 armv7at2_vfp_neon_WRlinux7_gcc = 0
+aarch64_zynqmp_linux = 0
 intel_atom_WRlinux5_gcc = 0
 x86_WRlinux7_gcc = 0
 x86_64_WRlinux7_gcc = 0

MPC/config/ospl_dcpsisocpp2.mpb

@@ -14,6 +14,9 @@ feature(isocpp2_cxx11) {
   specific (make) {
     extracppflags += -std=c++0x
   }
+  specific (prop:windows) {
+     macros += OSPL_USE_CXX11
+  }
 }
 
 feature(!src_co) {

MPC/config/splice_targets.mpb

@@ -168,12 +168,18 @@ feature (ospl_os_linux, ospl_arch_PPCe5500) {
     }
 }
 
-feature (ospl_os_linux, ospl_arch_armhf) {
+feature (ospl_os_linux, ospl_arch_armhf, ospl_gcc_5) {
     specific (make) {
         compilers = arm-linux-gnueabihf-gcc-5
     }
 }
 
+feature (ospl_os_linux, ospl_arch_armhf, ospl_gcc_6) {
+    specific (make) {
+        compilers = arm-linux-gnueabihf-gcc-6
+    }
+}
+
 feature (ospl_os_qnx, ospl_arch_x86) {
     specific (make) {
         compilers = x86-qcc
@@ -603,12 +609,24 @@ feature(armv7a_vfp_neon_linux) {
     }
 }
 
+feature(armv7a_lafp_neon_linux) {
+    specific (make) {
+        compilers = arm-lafp-linux-gnueabi-gcc
+    }
+}
+
 feature(armv7at2_vfp_neon_WRlinux7_gcc) {
     specific (make) {
         compilers = armv7at2-vfp-neon-WRlinux7-gcc
     }
 }
 
+feature(aarch64_zynqmp_linux, cross_compile) {
+    specific (make) {
+        compilers = aarch64-linux-gnu-gcc
+    }
+}
+
 feature(cortexa9t_neon_WRlinux5_gcc) {
     specific (make) {
         compilers = cortexa9t-neon-wrswrap-linux-gnueabi-gcc

MPC/templates/user_makedll.mpt

@@ -45,6 +45,19 @@ arm-linux-gnueabihf-gcc-5 {
   visopt    = -fvisibility=hidden -fvisibility-inlines-hidden
 }
 
+arm-linux-gnueabihf-gcc-6 {
+  cc        = arm-linux-gnueabihf-gcc-6
+  cxx       = arm-linux-gnueabihf-g++-6
+  linkflags   =
+  pic       = -fpic
+  shflags   = -shared
+  platforms = plat_armhf_linux
+  pchcreate = "-o "
+  pchnobj   = 1
+  checkopt  = -Wall -Wextra -pedantic -fsyntax-only
+  visopt    = -fvisibility=hidden -fvisibility-inlines-hidden
+}
+
 powerpc-fsl-linux-gcc {
   cc        = powerpc-fsl-linux-gcc
   cxx       = powerpc-fsl-linux-g++
@@ -175,6 +188,17 @@ arm7a-vfp-neon-linux-gcc {
 
 }
 
+arm-lafp-linux-gnueabi-gcc {
+  cc        = arm-lafp-linux-gnueabi-gcc
+  cxx       = arm-lafp-linux-gnueabi-g++
+  platforms = armv7a_lafp_neon_linux
+  compilerflags = -march=armv7-a -mtune=cortex-a9 -marm -mfloat-abi=hard -mfpu=neon --sysroot=$(SDKTARGETSYSROOT)
+  linker    = arm-lafp-linux-gnueabi-ld
+  pic       = -fPIC
+  shflags   = -shared
+
+}
+
 armv7at2-vfp-neon-WRlinux7-gcc {
   cc        = arm-wrs-linux-gnueabi-gcc
   cxx       = arm-wrs-linux-gnueabi-g++
@@ -459,6 +483,18 @@ clang {
   covopt    = -fprofile-arcs -ftest-coverage
 }
 
+aarch64-linux-gnu-gcc {
+  cc        = aarch64-linux-gnu-gcc
+  cxx       = aarch64-linux-gnu-g++
+  pic       = -fPIC
+  shflags   = -shared
+  platforms = armv7l_linux
+  pchcreate = "-o "
+  pchnobj   = 1
+  checkopt  = -Wall -Wextra -pedantic -fsyntax-only
+  visopt    = -fvisibility=hidden -fvisibility-inlines-hidden
+}
+
 // ***********************************************************************
 // Platform Section
 // ***********************************************************************
@@ -498,7 +534,7 @@ plat_PPCe5500_linux {
 
 plat_armhf_linux {
   gnumake       = 1
-  compile_flags = 
+  compile_flags =
   ldlibs = -lpthread
 }
 
@@ -558,6 +594,13 @@ armv7a-vfp-neon_linux_gcc{
   ldlibs        = -lpthread
 }
 
+armv7a_lafp_neon_linux{
+  gnumake       = 1
+  cputype       = arm
+  linkflags     = -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -mfloat-abi=hard --sysroot=$(SDKTARGETSYSROOT)
+  ldlibs        = -lpthread
+}
+
 armv7at2-vfp-neon_WRlinux7_gcc{
   gnumake       = 1
   cputype       = arm