#293 Add version to TCNOpen dll

git-svn-id: https://svn.code.sf.net/p/tcnopen/trdp/trunk@2127 3b5a3598-5f4e-4449-9e63-bd40438bfec0
westermo · Nov 14, 2019 · ab1a29d · ab1a29d
1 parent dc3e0f2
commit ab1a29d
Show file tree

Hide file tree

Showing 6 changed files with 187 additions and 0 deletions.
diff --git a/trdp/VSExpress2015/TRDP_DLL/TRDP_DLL.rc b/trdp/VSExpress2015/TRDP_DLL/TRDP_DLL.rc
@@ -0,0 +1,64 @@
+// Microsoft Visual C++ generated resource script.
+//
+#pragma code_page(65001)
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "TRDP_DLL.rc2"
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Swedish (Sweden) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
+LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""TRDP_DLL.rc2""\r\n"
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Swedish (Sweden) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/trdp/VSExpress2015/TRDP_DLL/TRDP_DLL.rc2 b/trdp/VSExpress2015/TRDP_DLL/TRDP_DLL.rc2
@@ -0,0 +1,84 @@
+/**********************************************************************************************************************/
+/**
+ * @file            TRDP_DLL.rc2
+ *
+ * @brief           Resource file for TRDP DLL
+ *
+ * @details         This file contain resource information that is not updated by editor.
+ *
+ * @note            Project: TCNOpen TRDP prototype stack & FDF/DbD
+ *
+ * @author          Anders �berg, Bombardier Transportation GmbH
+ *
+ * @remarks This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ *          If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *          Copyright Bombardier Transportation Inc. or its subsidiaries and others, 2019. All rights reserved.
+ *
+ *
+ * $Id$
+ *
+ *      A� 2019-11-14: Ticket #293 Add version to TCNOpen dll 
+ */
+#pragma code_page(65001)
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+#include "winres.h"
+#include "trdp_private.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#define STR_HELPER(x) #x
+#define VERSION_STRING(v,r,u,e) STR_HELPER(v) "." STR_HELPER(r) "." STR_HELPER(u) "." STR_HELPER(e)
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United Kingdom) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION TRDP_VERSION, TRDP_RELEASE, TRDP_UPDATE, TRDP_EVOLUTION
+ PRODUCTVERSION TRDP_VERSION, TRDP_RELEASE, TRDP_UPDATE, TRDP_EVOLUTION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080904b0"
+        BEGIN
+            VALUE "CompanyName", "Open source @ Sourceforge"
+            VALUE "FileDescription", "TCNOpen library"
+            VALUE "FileVersion", TRDP_VERSION_STR
+            VALUE "InternalName", "TRDP_DLL.dll"
+            VALUE "LegalCopyright", "Copyright (C) 2019"
+            VALUE "OriginalFilename", "TRDP_DLL.dll"
+            VALUE "ProductName", "TCNOpen"
+            VALUE "ProductVersion", TRDP_VERSION_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x809, 1200
+    END
+END
+
+#endif    // English (United Kingdom) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
diff --git a/trdp/VSExpress2015/TRDP_DLL/TRDP_DLL.vcxproj b/trdp/VSExpress2015/TRDP_DLL/TRDP_DLL.vcxproj
@@ -156,6 +156,9 @@
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
     <PostBuildEvent />
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\src\common;..\..\src\api;..\..\src\vos\api</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -224,6 +227,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
+    <None Include="TRDP_DLL.rc2" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\tau_ctrl.c" />
@@ -305,6 +309,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSim|Win32'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\src\vos\windows_sim\vos_private.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TRDP_DLL.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/trdp/VSExpress2015/TRDP_DLL/TRDP_DLL.vcxproj.filters b/trdp/VSExpress2015/TRDP_DLL/TRDP_DLL.vcxproj.filters
@@ -70,9 +70,13 @@
     <ClInclude Include="..\..\src\vos\windows\vos_private.h">
       <Filter>vos_windows</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
+    <None Include="TRDP_DLL.rc2">
+      <Filter>Resource</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="vos_windowsSim">
@@ -81,5 +85,13 @@
     <Filter Include="vos_windows">
       <UniqueIdentifier>{5492f8a2-1247-4412-8615-9c0928efc84a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Resource">
+      <UniqueIdentifier>{c6b7a3dd-a23a-409f-867d-0bdcaae26d33}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TRDP_DLL.rc">
+      <Filter>Resource</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/trdp/VSExpress2015/TRDP_DLL/resource.h b/trdp/VSExpress2015/TRDP_DLL/resource.h
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by TRDP_DLL.rc
+//
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/trdp/src/common/trdp_private.h b/trdp/src/common/trdp_private.h
@@ -17,6 +17,7 @@
 /*
  * $Id$
  *
+ *      AÖ 2019-11-14: Ticket #293 Add version to TCNOpen dll
  *      SB 2019-08-15: Ticket #269: tau_initTTI: leave standard MC fails
  *      BL 2019-06-17: Ticket #264 Provide service oriented interface
  *      BL 2019-06-17: Ticket #162 Independent handling of PD and MD to reduce jitter
@@ -63,6 +64,9 @@
 #define TRDP_EVOLUTION  2u              /* Evolution > 0 denotes trunk! */
 #endif
 
+/* Version as a string, this can also be for example 1.2.3.4.RC1 */
+#define TRDP_VERSION_STR "2.0.2.2"
+
 #ifdef HIGH_PERF_INDEXED
 #   define TRDP_TIMER_GRANULARITY          500u                     /**< granularity in us - we allow 0.5ms now!      */
 #else