[Pkg-owncloud-commits] [owncloud-client] 306/332: NSIS: First steps at installing the shell extension

[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 f06019ab8111f89045dc4f2d1bbfabc3e04c982c
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed Aug 6 10:40:55 2014 +0200

    NSIS: First steps at installing the shell extension
---
 admin/win/nsi/l10n/pofiles/messages.pot |  8 ++++++++
 cmake/modules/NSIS.template.in          | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/admin/win/nsi/l10n/pofiles/messages.pot b/admin/win/nsi/l10n/pofiles/messages.pot
index 072a151..dc40b1c 100644
--- a/admin/win/nsi/l10n/pofiles/messages.pot
+++ b/admin/win/nsi/l10n/pofiles/messages.pot
@@ -85,6 +85,14 @@ msgstr "Choose the maintenance option to perform."
 msgid "Installing ${APPLICATION_NAME} essentials."
 msgstr "Installing ${APPLICATION_NAME} essentials."
 
+#. OPTION_SECTION_SC_SHELL_EXT_SECTION
+msgid "Status icons for Windows Explorer"
+msgstr "Status icons for Windows Explorer"
+
+#. OPTION_SECTION_SC_SHELL_EXT_DetailPrint
+msgid "Installing status icons for Windows Explorer"
+msgstr "Installing status icons for Windows Explorer"
+
 #. OPTION_SECTION_SC_START_MENU_SECTION
 msgid "Start Menu Program Shortcut"
 msgstr "Start Menu Program Shortcut"
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index de13cd8..530b772 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -16,6 +16,7 @@
   !define OPTION_LICENSE_AGREEMENT
 !endif
 !define OPTION_UAC_PLUGIN_ENHANCED
+!define OPTION_SECTION_SC_SHELL_EXT
 !define OPTION_SECTION_SC_START_MENU
 !define OPTION_SECTION_SC_DESKTOP
 !define OPTION_SECTION_SC_QUICK_LAUNCH
@@ -94,6 +95,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !include WordFunc.nsh  ;Used by VersionCompare macro function.
 !include FileFunc.nsh  ;Used to read out parameters
 !include UAC.nsh ;Used by the UAC elevation to install as user or admin.
+!include x64.nsh ;Used to determine the right arch for the shell extensions
 
 ;-----------------------------------------------------------------------------
 ; Memento selections stored in registry.
@@ -374,7 +376,6 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${BUILD_PATH}\src\lib${APPLICATION_SHORTNAME}sync.dll"
    File "${BUILD_PATH}\csync\src\libocsync.dll"
 
-
    File "${BUILD_PATH}\src\mirall_*.qm"
    ; Make sure only to copy qt, not qt_help, etc
    File "${MING_SHARE}\qt5\translations\qt_??.qm"
@@ -456,6 +457,22 @@ SectionEnd
 
 SectionGroup $SectionGroup_Shortcuts
 
+!ifdef OPTION_SECTION_SC_SHELL_EXT
+   ${MementoSection} $OPTION_SECTION_SC_SHELL_EXT_SECTION SEC_SHELL_EXT
+      SectionIn 1 2
+      SetDetailsPrint textonly
+      DetailPrint $OPTION_SECTION_SC_SHELL_EXT_DetailPrint
+      SetOutPath "$INSTDIR/shellext"
+      ${If} ${RunningX64}
+         ExecWait '"${BUILD_PATH}/vcredist_x64.exe" /qn'
+         File ${SOURCE_PATH}\*_x64.dll
+      ${Else}
+         ExecWait '"${BUILD_PATH}/vcredist_x86.exe" /qn'
+         File ${SOURCE_PATH}\*_x86.dll
+      ${EndIf}
+   ${MementoSectionEnd}
+!endif
+
 !ifdef OPTION_SECTION_SC_START_MENU
    ${MementoSection} $OPTION_SECTION_SC_START_MENU_SECTION SEC_START_MENU
       SectionIn 1 2 3

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