From 70ae11fcad958446cc8a731765aaccc07ab27abe Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Mon, 27 Jun 2016 15:02:56 +0200
Subject: [PATCH] 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.
---
 .../windows/OCContextMenu/OCContextMenu.rc    | Bin 4660 -> 4772 bytes
 .../OCContextMenu/OCContextMenu.vcxproj       |   6 ++++++
 .../windows/OCOverlays/OCOverlay.rc           | Bin 5672 -> 5784 bytes
 .../windows/OCOverlays/OCOverlays.vcxproj     |   6 ++++++
 .../windows/OCUtil/OCUtil.vcxproj             |   1 +
 shell_integration/windows/OCUtil/Version.h    |  11 +++++++++++
 6 files changed, 24 insertions(+)
 create mode 100644 shell_integration/windows/OCUtil/Version.h

diff --git a/shell_integration/windows/OCContextMenu/OCContextMenu.rc b/shell_integration/windows/OCContextMenu/OCContextMenu.rc
index 9ad518061424fe2665118758f57bd8f0ee15ec8f..5025d081ffb2a242e2342c8e956bca568075b9ac 100644
GIT binary patch
delta 190
zcmdm@vP5;lg2~?)MR>y)QW=UEiWxE)@)`0rPW{R*>CfQI;K~re5W*185C&ugF$6Ps
zGWaw2O`gu7id%N`Ne)(Kb)1@kh6MwS3<4VE$KXEsBbWAOE}l<}Bxn$wY{DnB*o2P-
E02N~>d;kCd

delta 104
zcmZ3Yx<zHef{kZhvGW=-=r9;SvEk(N9IB`yn|V1|nfa9%3>ox*${^Tq@<uN4$q%^2
THmC4>V#F%BgimPk5<V6HzG@a^

diff --git a/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj b/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj
index 023d2d0ca..f2d102531 100644
--- 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
GIT binary patch
delta 187
zcmZ3XGedX6g2~?)MR>y)QW=UEiWxE)@)`0rPBr9_^k;BpaAk;K2w{k42m`W$7=jr*
z8T=XiCST@J#Uty_E4f*Y_YIReP6L1j1_O-^0vhMX;69mANOZG-zyU^LHEd=SQfC1G
DG*BhA

delta 95
zcmbQCyFzEef{ka?cz6vNbQlbv*l;p8uPUm@W=~#LW_~3GLk2ydG6*)DoX@Yjd4a$x
PMnN<Q2Bpn~Lh394bvh8s

diff --git a/shell_integration/windows/OCOverlays/OCOverlays.vcxproj b/shell_integration/windows/OCOverlays/OCOverlays.vcxproj
index 0ce4c6144..0776b0371 100644
--- 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 014a85601..8757da476 100644
--- 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
index 000000000..a98cb62ac
--- /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)
-- 
2.30.2