Explicit version elements

sieukrem · Oct 3, 2024 · 46dd1c3 · 46dd1c3
1 parent 2b5bfba
commit 46dd1c3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
 
     - name: Build with MSBuild
       run: |
-        msbuild jN.vcxproj /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /p:VersionDefinitions="VERSION_MA=${{steps.nbgv.outputs.VersionMajor}}3 VERSION_MI=${{steps.nbgv.outputs.VersionMinor}} REVISION=${{steps.nbgv.outputs.BuildNumber}} VERSION_REVISION=${{steps.nbgv.outputs.VersionRevision}}"
+        msbuild jN.vcxproj /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /p:VersionMajor=${{steps.nbgv.outputs.VersionMajor}} /p:VersionMinor=${{steps.nbgv.outputs.VersionMinor}} /p:BuildNumberF=${{steps.nbgv.outputs.BuildNumber}} /p:VersionRevision=${{steps.nbgv.outputs.VersionRevision}}"
     
     - name: Create zip file
       run: |

diff --git a/VersionInfo.h b/VersionInfo.h
@@ -24,9 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VERSION_MI 2
 #endif
 
-#ifndef REVISION
-// increment revision in case of modification
-#define REVISION 185
+#ifndef BUILD_NUMBER
+// increment BUILD_NUMBER in case of modification
+#define BUILD_NUMBER 185
 #endif
 
 #ifndef VERSION_REVISION
@@ -35,5 +35,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define xstr(s) str(s)
 #define str(s) #s
-#define _VERSION_STR VERSION_MA ## . ## VERSION_MI ## . ## REVISION
+#define _VERSION_STR VERSION_MA ## . ## VERSION_MI ## . ## BUILD_NUMBER  ## . ## VERSION_REVISION
 
diff --git a/jN.vcxproj b/jN.vcxproj
@@ -22,7 +22,10 @@
     <ProjectGuid>{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}</ProjectGuid>
     <RootNamespace>NppPluginTemplate</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <VersionDefinitions2>$(VersionDefinitions.replace(' ',';'))</VersionDefinitions2>
+    <VersionMajor>0</VersionMajor>
+    <VersionMinor>0</VersionMinor>
+    <BuildNumber>0</BuildNumber>
+    <VersionRevision>0</VersionRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -68,7 +71,7 @@
       <Optimization>MaxSpeed</Optimization>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions);$(VersionDefinitions2)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -106,7 +109,7 @@
       <Optimization>MaxSpeed</Optimization>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions);$(VersionDefinitions2)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -143,7 +146,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions);$(VersionDefinitions2)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -179,7 +182,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions);$(VersionDefinitions2)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -240,7 +243,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res.rc">
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);$(VersionDefinitions2)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);VERSION_MA=$(VersionMajor);VERSION_MI=$(VersionMinor);BUILD_NUMBER=$(BuildNumber);VERSION_REVISION=$(VersionRevision)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>

diff --git a/res.rc b/res.rc
@@ -11,8 +11,8 @@ BEGIN
 END
 
 1 VERSIONINFO
-FILEVERSION VERSION_MA,VERSION_MI,REVISION,VERSION_REVISION
-PRODUCTVERSION VERSION_MA,VERSION_MI,REVISION,VERSION_REVISION
+FILEVERSION VERSION_MA,VERSION_MI,BUILD_NUMBER,VERSION_REVISION
+PRODUCTVERSION VERSION_MA,VERSION_MI,BUILD_NUMBER,VERSION_REVISION
 FILEOS 0x40004 
 FILETYPE 0x1
 {