ni · ni-jfitzger · Jul 15, 2023 · Jul 17, 2023 · Jul 17, 2023 · Jul 18, 2023
@@ -425,6 +425,18 @@ if(WIN32)
   )
 endif()
 
+# Generate version header file
+# This file requires product name and version info that mako does not know, but CMake does
+configure_file(
+  source/server/version.h.in
+  ${service_output_dir}/version.h
+  @ONLY)
+
+target_sources(ni_grpc_device_server
+  PUBLIC "${service_output_dir}/version.h"
+)
+
+
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
   target_sources(ni_grpc_device_server
     PRIVATE "source/server/linux/syslog_logging.cpp"

diff --git a/generated/nidaqmx/nidaqmx_library.cpp b/generated/nidaqmx/nidaqmx_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-DAQMX Metadata
 //---------------------------------------------------------------------
 #include "nidaqmx_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nicaiu.dll";

@@ -4,6 +4,7 @@
 // Service implementation for the NI-DCPower Metadata
 //---------------------------------------------------------------------
 #include "nidcpower_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nidcpower_64.dll";
@@ -169,6 +170,11 @@ NiDCPowerLibrary::NiDCPowerLibrary() : shared_library_(kLibraryName)
   function_pointers_.UnlockSession = reinterpret_cast<UnlockSessionPtr>(shared_library_.get_function_pointer("niDCPower_UnlockSession"));
   function_pointers_.WaitForEvent = reinterpret_cast<WaitForEventPtr>(shared_library_.get_function_pointer("niDCPower_WaitForEvent"));
   function_pointers_.WaitForEventWithChannels = reinterpret_cast<WaitForEventWithChannelsPtr>(shared_library_.get_function_pointer("niDCPower_WaitForEventWithChannels"));
+  function_pointers_.SetRuntimeEnvironment = reinterpret_cast<SetRuntimeEnvironmentPtr>(shared_library_.get_function_pointer("niDCPower_SetRuntimeEnvironment"));
+
+  if (function_pointers_.SetRuntimeEnvironment) {
+    this->SetRuntimeEnvironment(nidevice_grpc::kNiDeviceGrpcFileVersion, nidevice_grpc::kNiDeviceGrpcOriginalFileName, "", "");
+  }
 }
 
 NiDCPowerLibrary::~NiDCPowerLibrary()
@@ -1366,4 +1372,12 @@ ViStatus NiDCPowerLibrary::WaitForEventWithChannels(ViSession vi, ViConstString
   return function_pointers_.WaitForEventWithChannels(vi, channelName, eventId, timeout);
 }
 
+ViStatus NiDCPowerLibrary::SetRuntimeEnvironment(ViConstString environment, ViConstString environmentVersion, ViConstString reserved1, ViConstString reserved2)
+{
+  if (!function_pointers_.SetRuntimeEnvironment) {
+    throw nidevice_grpc::LibraryLoadException("Could not find niDCPower_SetRuntimeEnvironment.");
+  }
+  return function_pointers_.SetRuntimeEnvironment(environment, environmentVersion, reserved1, reserved2);
+}
+
 }  // namespace nidcpower_grpc
@@ -166,6 +166,7 @@ class NiDCPowerLibrary : public nidcpower_grpc::NiDCPowerLibraryInterface {
   ViStatus UnlockSession(ViSession vi, ViBoolean* callerHasLock);
   ViStatus WaitForEvent(ViSession vi, ViInt32 eventId, ViReal64 timeout);
   ViStatus WaitForEventWithChannels(ViSession vi, ViConstString channelName, ViInt32 eventId, ViReal64 timeout);
+  ViStatus SetRuntimeEnvironment(ViConstString environment, ViConstString environmentVersion, ViConstString reserved1, ViConstString reserved2);
 
  private:
   using AbortPtr = decltype(&niDCPower_Abort);
@@ -316,6 +317,7 @@ class NiDCPowerLibrary : public nidcpower_grpc::NiDCPowerLibraryInterface {
   using UnlockSessionPtr = ViStatus (*)(ViSession vi, ViBoolean* callerHasLock);
   using WaitForEventPtr = decltype(&niDCPower_WaitForEvent);
   using WaitForEventWithChannelsPtr = decltype(&niDCPower_WaitForEventWithChannels);
+  using SetRuntimeEnvironmentPtr = ViStatus (*)(ViConstString environment, ViConstString environmentVersion, ViConstString reserved1, ViConstString reserved2);
 
   typedef struct FunctionPointers {
     AbortPtr Abort;
@@ -466,6 +468,7 @@ class NiDCPowerLibrary : public nidcpower_grpc::NiDCPowerLibraryInterface {
     UnlockSessionPtr UnlockSession;
     WaitForEventPtr WaitForEvent;
     WaitForEventWithChannelsPtr WaitForEventWithChannels;
+    SetRuntimeEnvironmentPtr SetRuntimeEnvironment;
   } FunctionLoadStatus;
 
   nidevice_grpc::SharedLibrary shared_library_;

@@ -163,6 +163,7 @@ class NiDCPowerLibraryInterface {
   virtual ViStatus UnlockSession(ViSession vi, ViBoolean* callerHasLock) = 0;
   virtual ViStatus WaitForEvent(ViSession vi, ViInt32 eventId, ViReal64 timeout) = 0;
   virtual ViStatus WaitForEventWithChannels(ViSession vi, ViConstString channelName, ViInt32 eventId, ViReal64 timeout) = 0;
+  virtual ViStatus SetRuntimeEnvironment(ViConstString environment, ViConstString environmentVersion, ViConstString reserved1, ViConstString reserved2) = 0;
 };
 
 }  // namespace nidcpower_grpc

@@ -165,6 +165,7 @@ class NiDCPowerMockLibrary : public nidcpower_grpc::NiDCPowerLibraryInterface {
   MOCK_METHOD(ViStatus, UnlockSession, (ViSession vi, ViBoolean* callerHasLock), (override));
   MOCK_METHOD(ViStatus, WaitForEvent, (ViSession vi, ViInt32 eventId, ViReal64 timeout), (override));
   MOCK_METHOD(ViStatus, WaitForEventWithChannels, (ViSession vi, ViConstString channelName, ViInt32 eventId, ViReal64 timeout), (override));
+  MOCK_METHOD(ViStatus, SetRuntimeEnvironment, (ViConstString environment, ViConstString environmentVersion, ViConstString reserved1, ViConstString reserved2), (override));
 };
 
 }  // namespace unit

diff --git a/generated/nidigitalpattern/nidigitalpattern_library.cpp b/generated/nidigitalpattern/nidigitalpattern_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-Digital Pattern Driver Metadata
 //---------------------------------------------------------------------
 #include "nidigitalpattern_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niDigital_64.dll";

diff --git a/generated/nidmm/nidmm_library.cpp b/generated/nidmm/nidmm_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-DMM Metadata
 //---------------------------------------------------------------------
 #include "nidmm_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nidmm_64.dll";

diff --git a/generated/nifake/nifake_library.cpp b/generated/nifake/nifake_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-FAKE Metadata
 //---------------------------------------------------------------------
 #include "nifake_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nifake_64.dll";

diff --git a/generated/nifake_extension/nifake_extension_library.cpp b/generated/nifake_extension/nifake_extension_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-FAKE-EXTENSION Metadata
 //---------------------------------------------------------------------
 #include "nifake_extension_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nifake_64.dll";

diff --git a/generated/nifake_non_ivi/nifake_non_ivi_library.cpp b/generated/nifake_non_ivi/nifake_non_ivi_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-FAKE-NON-IVI Metadata
 //---------------------------------------------------------------------
 #include "nifake_non_ivi_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nifakenonivi_64.dll";

diff --git a/generated/nifgen/nifgen_library.cpp b/generated/nifgen/nifgen_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-FGEN Metadata
 //---------------------------------------------------------------------
 #include "nifgen_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niFgen_64.dll";

diff --git a/generated/nimxlcterminaladaptor_restricted/nimxlcterminaladaptor_restricted_library.cpp b/generated/nimxlcterminaladaptor_restricted/nimxlcterminaladaptor_restricted_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-MXLCTERMINALADAPTOR-RESTRICTED Metadata
 //---------------------------------------------------------------------
 #include "nimxlcterminaladaptor_restricted_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nimxlcTerminalAdaptor.dll";

diff --git a/generated/nirfmxbluetooth/nirfmxbluetooth_library.cpp b/generated/nirfmxbluetooth/nirfmxbluetooth_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXBLUETOOTH Metadata
 //---------------------------------------------------------------------
 #include "nirfmxbluetooth_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxBT.dll";

diff --git a/generated/nirfmxcdma2k/nirfmxcdma2k_library.cpp b/generated/nirfmxcdma2k/nirfmxcdma2k_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-rfmxcdma2k Metadata
 //---------------------------------------------------------------------
 #include "nirfmxcdma2k_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxCDMA2k.dll";

diff --git a/generated/nirfmxdemod/nirfmxdemod_library.cpp b/generated/nirfmxdemod/nirfmxdemod_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-rfmxdemod Metadata
 //---------------------------------------------------------------------
 #include "nirfmxdemod_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxDemod.dll";

diff --git a/generated/nirfmxgsm/nirfmxgsm_library.cpp b/generated/nirfmxgsm/nirfmxgsm_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXGSM Metadata
 //---------------------------------------------------------------------
 #include "nirfmxgsm_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxGSM.dll";

diff --git a/generated/nirfmxinstr/nirfmxinstr_library.cpp b/generated/nirfmxinstr/nirfmxinstr_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXINSTR Metadata
 //---------------------------------------------------------------------
 #include "nirfmxinstr_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxInstr.dll";

diff --git a/generated/nirfmxinstr_restricted/nirfmxinstr_restricted_library.cpp b/generated/nirfmxinstr_restricted/nirfmxinstr_restricted_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXINSTR-RESTRICTED Metadata
 //---------------------------------------------------------------------
 #include "nirfmxinstr_restricted_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxInstr.dll";

diff --git a/generated/nirfmxlte/nirfmxlte_library.cpp b/generated/nirfmxlte/nirfmxlte_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXLTE Metadata
 //---------------------------------------------------------------------
 #include "nirfmxlte_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxLTE.dll";

diff --git a/generated/nirfmxnr/nirfmxnr_library.cpp b/generated/nirfmxnr/nirfmxnr_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXNR Metadata
 //---------------------------------------------------------------------
 #include "nirfmxnr_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxNR.dll";

diff --git a/generated/nirfmxspecan/nirfmxspecan_library.cpp b/generated/nirfmxspecan/nirfmxspecan_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXSPECAN Metadata
 //---------------------------------------------------------------------
 #include "nirfmxspecan_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxSpecAn.dll";

diff --git a/generated/nirfmxspecan_restricted/nirfmxspecan_restricted_library.cpp b/generated/nirfmxspecan_restricted/nirfmxspecan_restricted_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXSPECAN-RESTRICTED Metadata
 //---------------------------------------------------------------------
 #include "nirfmxspecan_restricted_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxSpecAn.dll";

diff --git a/generated/nirfmxtdscdma/nirfmxtdscdma_library.cpp b/generated/nirfmxtdscdma/nirfmxtdscdma_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-rfmxtdscdma Metadata
 //---------------------------------------------------------------------
 #include "nirfmxtdscdma_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxTDSCDMA.dll";

diff --git a/generated/nirfmxwcdma/nirfmxwcdma_library.cpp b/generated/nirfmxwcdma/nirfmxwcdma_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-rfmxwcdma Metadata
 //---------------------------------------------------------------------
 #include "nirfmxwcdma_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxWCDMA.dll";

diff --git a/generated/nirfmxwlan/nirfmxwlan_library.cpp b/generated/nirfmxwlan/nirfmxwlan_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXWLAN Metadata
 //---------------------------------------------------------------------
 #include "nirfmxwlan_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxWLAN.dll";

diff --git a/generated/nirfmxwlan_restricted/nirfmxwlan_restricted_library.cpp b/generated/nirfmxwlan_restricted/nirfmxwlan_restricted_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFMXWLAN-RESTRICTED Metadata
 //---------------------------------------------------------------------
 #include "nirfmxwlan_restricted_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxWLAN.dll";

diff --git a/generated/nirfsa/nirfsa_library.cpp b/generated/nirfsa/nirfsa_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFSA Metadata
 //---------------------------------------------------------------------
 #include "nirfsa_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFSA_64.dll";

diff --git a/generated/nirfsg/nirfsg_library.cpp b/generated/nirfsg/nirfsg_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-RFSG Metadata
 //---------------------------------------------------------------------
 #include "nirfsg_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFSG_64.dll";

diff --git a/generated/niscope/niscope_library.cpp b/generated/niscope/niscope_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-SCOPE Metadata
 //---------------------------------------------------------------------
 #include "niscope_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niScope_64.dll";

diff --git a/generated/niscope_restricted/niscope_restricted_library.cpp b/generated/niscope_restricted/niscope_restricted_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-SCOPE-RESTRICTED Metadata
 //---------------------------------------------------------------------
 #include "niscope_restricted_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niScope_64.dll";

diff --git a/generated/niswitch/niswitch_library.cpp b/generated/niswitch/niswitch_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-SWITCH Metadata
 //---------------------------------------------------------------------
 #include "niswitch_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niswitch_64.dll";

diff --git a/generated/nisync/nisync_library.cpp b/generated/nisync/nisync_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-SYNC Metadata
 //---------------------------------------------------------------------
 #include "nisync_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nisync.dll";

diff --git a/generated/nitclk/nitclk_library.cpp b/generated/nitclk/nitclk_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-TClk Metadata
 //---------------------------------------------------------------------
 #include "nitclk_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niTClk_64.dll";

diff --git a/generated/nixnet/nixnet_library.cpp b/generated/nixnet/nixnet_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-XNET Metadata
 //---------------------------------------------------------------------
 #include "nixnet_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nixnet.dll";

diff --git a/generated/nixnetsocket/nixnetsocket_library.cpp b/generated/nixnetsocket/nixnetsocket_library.cpp
@@ -4,6 +4,7 @@
 // Service implementation for the NI-XNETSOCKET Metadata
 //---------------------------------------------------------------------
 #include "nixnetsocket_library.h"
+#include "version.h"
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "nixntipstack.dll";

@@ -0,0 +1,11 @@
+#ifndef NIDEVICE_GRPC_VERSION_H
+#define NIDEVICE_GRPC_VERSION_H
+
+namespace nidevice_grpc {
+
+constexpr const char* kNiDeviceGrpcFileVersion = "2.3.0.0";
+constexpr const char* kNiDeviceGrpcOriginalFileName = "ni_grpc_device_server.exe";
+
+}
+
+#endif // NIDEVICE_GRPC_VERSION_H
@@ -1,11 +1,18 @@
 from .functions import functions
+from .functions_addon import functions_override_metadata
 from .attributes import attributes
+from .attributes_addon import attributes_override_metadata
 from .enums import enums
+from .enums_addon import enums_override_metadata
 from .config import config
 
 metadata = {
     "functions" : functions,
     "attributes" : attributes,
     "enums" : enums,
     "config" : config
-}
+}
+
+metadata['functions'].update(functions_override_metadata)
+metadata['attributes'].update(attributes_override_metadata)
+metadata['enums'].update(enums_override_metadata)