[Pkg-owncloud-commits] [owncloud-client] 149/175: NSIS: Force an update of the shell_extension #3320

[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 7a7bf4c561fb082a76fee5d34d3d9a7a283de457
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Wed Jun 10 16:23:37 2015 +0200

    NSIS: Force an update of the shell_extension #3320
    
    Since our DLLs version number aren't bumped, a same file size could
    cause a DLL not to be installed to replace an old one.
    This eventually can cause a crash of explorer if an incompatible version
    of OCUtil.dll is installed alone.
    
    Fix the issue by defining LIBRARY_IGNORE_VERSION. This also makes sure
    that installing an old version of the client over a more recent one
    if we decide to add version numbers to those DLLs.
---
 cmake/modules/NSIS.template.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 0f33386..e9da62c 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -479,6 +479,7 @@ SectionEnd
       CreateDirectory "$INSTDIR\shellext"
       !define LIBRARY_COM
       !define LIBRARY_SHELL_EXTENSION
+      !define LIBRARY_IGNORE_VERSION
       ${If} ${RunningX64}
          !define LIBRARY_X64
          !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCUtil_x64.dll" "$INSTDIR\shellext\OCUtil_x64.dll" "$INSTDIR\shellext"
@@ -492,6 +493,7 @@ SectionEnd
       ${Endif}
       !undef LIBRARY_COM
       !undef LIBRARY_SHELL_EXTENSION
+      !undef LIBRARY_IGNORE_VERSION
    ${MementoSectionEnd}
 !endif
 
@@ -650,6 +652,7 @@ Section Uninstall
    !ifdef OPTION_SECTION_SC_SHELL_EXT
       !define LIBRARY_COM
       !define LIBRARY_SHELL_EXTENSION
+      !define LIBRARY_IGNORE_VERSION
       ${If} ${HasSection} SEC_SHELL_EXT
         DetailPrint "Uninstalling x64 overlay DLLs"
         !define LIBRARY_X64
@@ -665,6 +668,7 @@ Section Uninstall
       ${EndIf}
       !undef LIBRARY_COM
       !undef LIBRARY_SHELL_EXTENSION
+      !undef LIBRARY_IGNORE_VERSION
   !endif
 
    ;Start menu shortcut

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