Skip to content

Windows shell extensions for version 3.0 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
misch7 merged 1 commit into from
Aug 21, 2020
Merged

Windows shell extensions for version 3.0 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

This allows you to easily build the desktop client for 64-bit and 32-bit Windows.

## Update: 2020-08-21

Build support for NC 3.0:
- Shell extensions changed by: https://github.com/nextcloud/desktop/pull/2288
- New client-building branches to ease building: stable-2.5, stable-2.6, stable-3.0

## Update: 2020-07-22

Upgrade / new default version:
Expand Down Expand Up @@ -315,14 +321,11 @@ OR:
for them or they're critical for security and privacy:
- all the binaries we produce:
- nextcloud/ocsync.dll
- shellext/OCContextMenu.dll
- shellext/OCOverlays.dll
- shellext/OCUtil.dll
- shellext/NCContextMenu.dll
- shellext/NCOverlays.dll
- nextcloud.exe
- nextcloudcmd.exe
- nextcloudsync.dll
- OCContextMenu.dll
- OCOverlays.dll
- ocsync.dll
- OCUtil.dll
- qt5keychain.dll
Expand Down
20 changes: 8 additions & 12 deletions nextcloud.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,14 +453,12 @@ SectionEnd
!define LIBRARY_IGNORE_VERSION
${If} ${RunningX64}
!define LIBRARY_X64
!insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\OCUtil.dll" "$INSTDIR\shellext\OCUtil.dll" "$INSTDIR\shellext"
!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\OCOverlays.dll" "$INSTDIR\shellext\OCOverlays.dll" "$INSTDIR\shellext"
!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\OCContextMenu.dll" "$INSTDIR\shellext\OCContextMenu.dll" "$INSTDIR\shellext"
!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\NCOverlays.dll" "$INSTDIR\shellext\NCOverlays.dll" "$INSTDIR\shellext"
!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\NCContextMenu.dll" "$INSTDIR\shellext\NCContextMenu.dll" "$INSTDIR\shellext"
!undef LIBRARY_X64
${Else}
!insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\OCUtil.dll" "$INSTDIR\shellext\OCUtil.dll" "$INSTDIR\shellext"
!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\OCOverlays.dll" "$INSTDIR\shellext\OCOverlays.dll" "$INSTDIR\shellext"
!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\OCContextMenu.dll" "$INSTDIR\shellext\OCContextMenu.dll" "$INSTDIR\shellext"
!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\NCOverlays.dll" "$INSTDIR\shellext\NCOverlays.dll" "$INSTDIR\shellext"
!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\NCContextMenu.dll" "$INSTDIR\shellext\NCContextMenu.dll" "$INSTDIR\shellext"
${Endif}
!undef LIBRARY_COM
!undef LIBRARY_SHELL_EXTENSION
Expand Down Expand Up @@ -651,14 +649,12 @@ Section Uninstall
${If} ${HasSection} SEC_SHELL_EXT
DetailPrint "Uninstalling x64 overlay DLLs"
!define LIBRARY_X64
!insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCContextMenu.dll"
!insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCOverlays.dll"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCUtil.dll"
!insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\NCContextMenu.dll"
!insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\NCOverlays.dll"
!undef LIBRARY_X64
DetailPrint "Uninstalling x86 overlay DLLs"
!insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCContextMenu.dll"
!insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCOverlays.dll"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCUtil.dll"
!insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\NCContextMenu.dll"
!insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\NCOverlays.dll"
${EndIf}
!undef LIBRARY_COM
!undef LIBRARY_SHELL_EXTENSION
Expand Down
20 changes: 6 additions & 14 deletions single-build-installer-collect.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,12 @@ start "copy ocsync.dll" /D "%MY_COLLECT_PATH%/" /B /wait cp -af "%MY_INSTALL_PAT
if %ERRORLEVEL% neq 0 goto onError

Rem shell extension dll's for Explorer integration (status icons)
echo "* copy OCContextMenu.dll to %MY_COLLECT_PATH%/shellext/."
start "copy OCContextMenu.dll" /D "%MY_COLLECT_PATH%/" /B /wait cp -af "%MY_INSTALL_PATH%/bin/OCContextMenu.dll" "%MY_COLLECT_PATH%/shellext/"
echo "* move NCContextMenu.dll to %MY_COLLECT_PATH%/shellext/."
start "move NCContextMenu.dll" /D "%MY_COLLECT_PATH%/" /B /wait mv -f "%MY_COLLECT_PATH%/NCContextMenu.dll" "%MY_COLLECT_PATH%/shellext/"
if %ERRORLEVEL% neq 0 goto onError

echo "* copy OCContextMenu.dll to %MY_COLLECT_PATH%/shellext/."
start "copy OCOverlays.dll" /D "%MY_COLLECT_PATH%/" /B /wait cp -af "%MY_INSTALL_PATH%/bin/OCOverlays.dll" "%MY_COLLECT_PATH%/shellext/"
if %ERRORLEVEL% neq 0 goto onError

echo "* copy OCUtil.dll to %MY_COLLECT_PATH%/shellext/."
start "copy OCUtil.dll" /D "%MY_COLLECT_PATH%/" /B /wait cp -af "%MY_INSTALL_PATH%/bin/OCUtil.dll" "%MY_COLLECT_PATH%/shellext/"
echo "* move NCOverlays.dll to %MY_COLLECT_PATH%/shellext/."
start "move NCOverlays.dll" /D "%MY_COLLECT_PATH%/" /B /wait mv -f "%MY_COLLECT_PATH%/NCOverlays.dll" "%MY_COLLECT_PATH%/shellext/"
if %ERRORLEVEL% neq 0 goto onError

Rem exclude system file list
Expand Down Expand Up @@ -221,16 +217,12 @@ if "%USE_CODE_SIGNING%" == "0" (

for %%G in (
"%APP_NAME_SANITIZED%/ocsync.dll"
"shellext/OCContextMenu.dll"
"shellext/OCOverlays.dll"
"shellext/OCUtil.dll"
"shellext/NCContextMenu.dll"
"shellext/NCOverlays.dll"
"%APP_NAME_SANITIZED%.exe"
"%APP_NAME_SANITIZED%cmd.exe"
"%APP_NAME_SANITIZED%sync.dll"
"OCContextMenu.dll"
"OCOverlays.dll"
"ocsync.dll"
"OCUtil.dll"
"qt5keychain.dll"
"%LIBCRYPTO_DLL_FILENAME%"
"%LIBSSL_DLL_FILENAME%"
Expand Down