shell_integration/windows: Add a manually-increased build number

Since this isn't yet built together with the rest, we can't reliably
use the client version without having to rebuilt the extension manually
on each release. But it would still be nice to be able to tell if a user
has the right version or not loaded, so instead just tag each update of
the DLLs with a separate release version.

This means that every time we update those binaries we'll have to manually
increment the number in the header, but worst case we'll forget from time
to time but we'll be able to know if we didn't, and know if we can rely on
the number or not.

diff --git a/shell_integration/windows/OCContextMenu/OCContextMenu.rc b/shell_integration/windows/OCContextMenu/OCContextMenu.rc
index 9ad518061424fe2665118758f57bd8f0ee15ec8f..5025d081ffb2a242e2342c8e956bca568075b9ac 100644 (file)
Binary files a/shell_integration/windows/OCContextMenu/OCContextMenu.rc and b/shell_integration/windows/OCContextMenu/OCContextMenu.rc differ

diff --git a/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj b/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj
index 023d2d0ca251f1e64ac5add2d05bd1fbd170a7d9..f2d10253131d6c751b796bd1088c9a9f33c5c87a 100644 (file)
--- a/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj
+++ b/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj
@@ -127,6 +127,9 @@
       <Optimization>Disabled</Optimization>
       <PrecompiledHeader />
     </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -140,6 +143,9 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />

diff --git a/shell_integration/windows/OCOverlays/OCOverlay.rc b/shell_integration/windows/OCOverlays/OCOverlay.rc
index 71d453fc64f7d63cab1d9275fd518520af046c25..4e6dd6ac79f3885d24dccb3fe69ff48320fa8fe7 100644 (file)
Binary files a/shell_integration/windows/OCOverlays/OCOverlay.rc and b/shell_integration/windows/OCOverlays/OCOverlay.rc differ

diff --git a/shell_integration/windows/OCOverlays/OCOverlays.vcxproj b/shell_integration/windows/OCOverlays/OCOverlays.vcxproj
index 0ce4c6144134677e18e3e6f842e3406e0d236665..0776b037198d145670afa113715d3019ccf150b1 100644 (file)
--- a/shell_integration/windows/OCOverlays/OCOverlays.vcxproj
+++ b/shell_integration/windows/OCOverlays/OCOverlays.vcxproj
@@ -119,6 +119,9 @@
       <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -157,6 +160,9 @@
       <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="DllMain.cpp" />

diff --git a/shell_integration/windows/OCUtil/OCUtil.vcxproj b/shell_integration/windows/OCUtil/OCUtil.vcxproj
index 014a85601129cbc43b4a3d75c7732fa8819f3d00..8757da476b62bf5059f62a2f0c9b1002460cfdb0 100644 (file)
--- a/shell_integration/windows/OCUtil/OCUtil.vcxproj
+++ b/shell_integration/windows/OCUtil/OCUtil.vcxproj
@@ -155,6 +155,7 @@
     <ClInclude Include="CommunicationSocket.h" />
     <ClInclude Include="FileUtil.h" />
     <ClInclude Include="RegistryUtil.h" />
+    <ClInclude Include="Version.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CommunicationSocket.cpp" />

diff --git a/shell_integration/windows/OCUtil/Version.h b/shell_integration/windows/OCUtil/Version.h
new file mode 100644 (file)
index 0000000..a98cb62
--- /dev/null
+++ b/shell_integration/windows/OCUtil/Version.h
@@ -0,0 +1,11 @@
+#pragma once
+
+// This is the number that will end up in the version window of the DLLs.
+// Increment this version before committing a new build if you are today's shell_integration build master.
+#define OCEXT_BUILD_NUM 42
+
+#define STRINGIZE2(s) #s
+#define STRINGIZE(s) STRINGIZE2(s)
+
+#define OCEXT_VERSION 1,0,0,OCEXT_BUILD_NUM
+#define OCEXT_VERSION_STRING STRINGIZE(OCEXT_VERSION)