[Pkg-owncloud-commits] [owncloud-client] 65/121: shell_integration/windows: Add a manually-increased build number

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 70ae11fcad958446cc8a731765aaccc07ab27abe
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Mon Jun 27 15:02:56 2016 +0200

    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
 .../windows/OCContextMenu/OCContextMenu.vcxproj       |   6 ++++++
 shell_integration/windows/OCOverlays/OCOverlay.rc     | Bin 5672 -> 5784 bytes
 .../windows/OCOverlays/OCOverlays.vcxproj             |   6 ++++++
 shell_integration/windows/OCUtil/OCUtil.vcxproj       |   1 +
 shell_integration/windows/OCUtil/Version.h            |  11 +++++++++++
 6 files changed, 24 insertions(+)

diff --git a/shell_integration/windows/OCContextMenu/OCContextMenu.rc b/shell_integration/windows/OCContextMenu/OCContextMenu.rc
index 9ad5180..5025d08 100644
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 023d2d0..f2d1025 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 71d453f..4e6dd6a 100644
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 0ce4c61..0776b03 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 014a856..8757da4 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 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git