versioning: add version resources to FSD and DLL; consolidate versioning to shared.properties

2025-04-22 08:23:05 -05:00 · 2016-04-29 00:23:55 -07:00 · 2016-04-29 00:23:55 -07:00 · b12e0aad47
commit b12e0aad47
parent 1264cae110
9 changed files with 116 additions and 14 deletions
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="WinFsp" Language="1033" Version="$(var.MyVersion)" Manufacturer="Navimatics Corporation" UpgradeCode="82F812D9-4083-4EF1-8BC8-0F1EDA05B46B">
-        <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Description="WinFsp - Windows File System Proxy" />
+    <Product Id="*" Name="$(var.MyProductName)" Manufacturer="$(var.MyCompanyName)" Version="$(var.MyVersion)" Language="1033" UpgradeCode="82F812D9-4083-4EF1-8BC8-0F1EDA05B46B">
+        <Package Description="$(var.MyProductName) - $(var.MyDescription)" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
        <Media Id="1" Cabinet="WinFsp.cab" EmbedCab="yes" />
        <Directory Id="TARGETDIR" Name="SourceDir">
--- a/build/VStudio/installer/winfsp_msi.wixproj
+++ b/build/VStudio/installer/winfsp_msi.wixproj
@ -16,7 +16,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
    <IntermediateOutputPath>$(SolutionDir)build\$(Name).build\$(Configuration)\$(Platform)\</IntermediateOutputPath>
-    <DefineConstants>Debug;MyVersion=$(MyVersion)</DefineConstants>
+    <DefineConstants>Debug;MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion)</DefineConstants>
    <SuppressAllWarnings>False</SuppressAllWarnings>
    <Pedantic>True</Pedantic>
    <SuppressPdbOutput>True</SuppressPdbOutput>
@ -24,7 +24,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
    <IntermediateOutputPath>$(SolutionDir)build\$(Name).build\$(Configuration)\$(Platform)\</IntermediateOutputPath>
-    <DefineConstants>MyVersion=$(MyVersion)</DefineConstants>
+    <DefineConstants>MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion)</DefineConstants>
    <SuppressAllWarnings>False</SuppressAllWarnings>
    <Pedantic>True</Pedantic>
    <SuppressPdbOutput>True</SuppressPdbOutput>
--- a/build/VStudio/shared.properties
+++ b/build/VStudio/shared.properties
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <PropertyGroup>
-        <!--
-            MyVersion contains the current product version. The major and minor parts should be
-            changed manually when appropriate. The build number is automatically calculated as
-            the concatenation of the year and the day of the year.
-
-            The MyVersion variable is used to compute the OutputName property in the wixproj as
-            well as define the MyVersion Wix preprocessor constant, which is used to set the
-            Version in the Product.wxs
-        -->
-        <MyVersion>0.9.$([System.DateTime]::Now.ToString(`yy`))$([System.DateTime]::Now.DayOfYear.ToString(`000`))</MyVersion>
+        <MyProductName>WinFsp</MyProductName>
+        <MyDescription>Windows File System Proxy</MyDescription>
+        <MyCompanyName>Navimatics Corporation</MyCompanyName>
+        <MyCopyright>2015-2016 Bill Zissimopoulos</MyCopyright>
+        <MyVersionMajor>0</MyVersionMajor>
+        <MyVersionMinor>9</MyVersionMinor>
+        <!-- build number: concat 2-digit year with 3-digit day of the year (16-bits until 2066) -->
+        <MyBuildNumber>$([System.DateTime]::Now.ToString(`yy`))$([System.DateTime]::Now.DayOfYear.ToString(`000`))</MyBuildNumber>
+        <MyVersion>$(MyVersionMajor).$(MyVersionMinor).$(MyBuildNumber)</MyVersion>
+        <MyVersionWithCommas>$(MyVersionMajor),$(MyVersionMinor),$(MyBuildNumber),0</MyVersionWithCommas>
    </PropertyGroup>
 </Project>
--- a/build/VStudio/winfsp_dll.vcxproj
+++ b/build/VStudio/winfsp_dll.vcxproj
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="shared.properties" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -38,6 +39,14 @@
    <None Include="..\..\src\dll\library.def" />
    <None Include="..\..\src\dll\ntstatus.i" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\src\dll\version.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_UNICODE;UNICODE;%(PreprocessorDefinitions);MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_UNICODE;UNICODE;%(PreprocessorDefinitions);MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_UNICODE;UNICODE;%(PreprocessorDefinitions);MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_UNICODE;UNICODE;%(PreprocessorDefinitions);MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
--- a/build/VStudio/winfsp_dll.vcxproj.filters
+++ b/build/VStudio/winfsp_dll.vcxproj.filters
@ -61,4 +61,9 @@
      <Filter>Source</Filter>
    </None>
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\src\dll\version.rc">
+      <Filter>Source</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/build/VStudio/winfsp_sys.vcxproj
+++ b/build/VStudio/winfsp_sys.vcxproj
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="shared.properties" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -177,6 +178,14 @@
    <ClInclude Include="..\..\inc\winfsp\fsctl.h" />
    <ClInclude Include="..\..\src\sys\driver.h" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\src\sys\version.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions);MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions);MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_AMD64_=1;AMD64;%(PreprocessorDefinitions);MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64;_AMD64_=1;AMD64;%(PreprocessorDefinitions);MyProductName=$(MyProductName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/build/VStudio/winfsp_sys.vcxproj.filters
+++ b/build/VStudio/winfsp_sys.vcxproj.filters
@ -101,4 +101,9 @@
      <Filter>Include\winfsp</Filter>
    </ClInclude>
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\src\sys\version.rc">
+      <Filter>Source</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/src/dll/version.rc
+++ b/src/dll/version.rc
@ -0,0 +1,37 @@
+#include <winver.h>
+
+#define STR(x)                          STR_(x)
+#define STR_(x)                         #x
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION MyVersionWithCommas
+PRODUCTVERSION MyVersionWithCommas
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0
+#endif
+FILEOS VOS_NT
+FILETYPE VFT_DLL
+FILESUBTYPE 0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", STR(MyCompanyName)
+            VALUE "FileDescription", STR(MyDescription)
+            VALUE "FileVersion", STR(MyVersion)
+            VALUE "InternalName", "winfsp.dll"
+            VALUE "LegalCopyright", STR(MyCopyright)
+            VALUE "OriginalFilename", "winfsp.dll"
+            VALUE "ProductName", STR(MyProductName)
+            VALUE "ProductVersion", STR(MyVersion)
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
--- a/src/sys/version.rc
+++ b/src/sys/version.rc
@ -0,0 +1,37 @@
+#include <winver.h>
+
+#define STR(x)                          STR_(x)
+#define STR_(x)                         #x
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION MyVersionWithCommas
+PRODUCTVERSION MyVersionWithCommas
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0
+#endif
+FILEOS VOS_NT
+FILETYPE VFT_DRV
+FILESUBTYPE VFT2_DRV_SYSTEM
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", STR(MyCompanyName)
+            VALUE "FileDescription", STR(MyDescription)
+            VALUE "FileVersion", STR(MyVersion)
+            VALUE "InternalName", "winfsp.sys"
+            VALUE "LegalCopyright", STR(MyCopyright)
+            VALUE "OriginalFilename", "winfsp.sys"
+            VALUE "ProductName", STR(MyProductName)
+            VALUE "ProductVersion", STR(MyVersion)
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END