Skip to content
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

Jump to bottom

bring back dynamic load of VFS plugins #3437

Merged
merged 2 commits into from
Jul 8, 2021
Merged

bring back dynamic load of VFS plugins #3437

merged 2 commits into from
Jul 8, 2021

Conversation

mgallien
Copy link
Collaborator

Signed-off-by: Matthieu Gallien matthieu.gallien@nextcloud.com

@mgallien
Copy link
Collaborator Author

I am not yet done but prefer to show early than late

@mgallien mgallien force-pushed the feature/dynamicLoadVfsPlugins branch 3 times, most recently from 3131b7a to f4897eb Compare June 15, 2021 08:43
@mgallien mgallien marked this pull request as ready for review June 15, 2021 09:11
FlexW
FlexW requested changes Jun 21, 2021
View reviewed changes
src/libsync/CMakeLists.txt Outdated Show resolved Hide resolved
src/libsync/CMakeLists.txt Outdated Show resolved Hide resolved
test/CMakeLists.txt Outdated Show resolved Hide resolved
@mgallien mgallien force-pushed the feature/dynamicLoadVfsPlugins branch 2 times, most recently from 33f0d8d to c40798b Compare June 24, 2021 14:30
@mgallien mgallien requested a review from FlexW June 25, 2021 07:31
FlexW
FlexW reviewed Jun 25, 2021
View reviewed changes
CMakeLists.txt Outdated Show resolved Hide resolved
src/common/vfs.cpp Outdated Show resolved Hide resolved
allexzander
allexzander reviewed Jun 25, 2021
View reviewed changes
admin/win/msi/Nextcloud.wxs Show resolved Hide resolved
src/common/vfs.cpp Outdated Show resolved Hide resolved
src/common/vfs.cpp Outdated Show resolved Hide resolved
src/common/vfs.cpp Outdated Show resolved Hide resolved
src/common/vfs.cpp Outdated Show resolved Hide resolved
src/common/vfs.cpp Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/CMakeLists.txt Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/cfapiwrapper.h
@@ -28,7 +28,7 @@ class VfsCfApi;
namespace CfApiWrapper
{

class OWNCLOUDSYNC_EXPORT ConnectionKey
class NEXTCLOUD_CFAPI_EXPORT ConnectionKey
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mgallien I am having a hard time understanding the reason behind having one more custom define for __declspec. Why adding a duplicate with a custom name NEXTCLOUD_CFAPI_EXPORT? If we want to get rid of OWNCLOUDSYNC_EXPORT, why not rename it to NEXTCLOUDSYNC_EXPORT in a separate PR, and replace all its usage places?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is not possible to use the same because we are building another module and in that case, the macro is expanded to an import instead of an export and compilation will fail
in that case, we import from libsync library and we export from cfapi plugin library (needed for the automated tests)
it is cleaner to use different ones such

src/libsync/vfs/cfapi/vfs_cfapi.cpp Outdated Show resolved Hide resolved
src/libsync/vfs/suffix/CMakeLists.txt Outdated Show resolved Hide resolved
@mgallien mgallien force-pushed the feature/dynamicLoadVfsPlugins branch from aef64a5 to 10f463f Compare June 25, 2021 17:03
@mgallien mgallien requested review from FlexW and allexzander June 25, 2021 17:37
@mgallien mgallien force-pushed the feature/dynamicLoadVfsPlugins branch 2 times, most recently from fc71a94 to 51b966b Compare July 2, 2021 11:58
@mgallien
Copy link
Collaborator Author

mgallien commented Jul 6, 2021

/rebase

@github-actions github-actions bot force-pushed the feature/dynamicLoadVfsPlugins branch from 51b966b to b08a920 Compare July 6, 2021 08:29
@mgallien mgallien force-pushed the feature/dynamicLoadVfsPlugins branch 2 times, most recently from 29023d4 to 3193bb0 Compare July 7, 2021 10:18
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-3437-3193bb03f1fd09aa2038d77d120aa56ea80c5697-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien
Copy link
Collaborator Author

mgallien commented Jul 8, 2021

/rebase

mgallien and others added 2 commits July 8, 2021 08:11
@mgallien
bring back dynamic load of VFS plugins
8ad6f89 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien
Allow installation on Windows version < 1709
7094d69 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
@github-actions github-actions bot force-pushed the feature/dynamicLoadVfsPlugins branch from 3193bb0 to 7094d69 Compare July 8, 2021 08:11
@mgallien mgallien merged commit d6b9ff9 into master Jul 8, 2021
@mgallien mgallien deleted the feature/dynamicLoadVfsPlugins branch July 8, 2021 08:20
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-3437-7094d699e9a684b6fa34f657a80ba9b01fbdaab9-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@FlexW FlexW mentioned this pull request Jul 12, 2021
Merged
@nanaya nanaya mentioned this pull request Jul 22, 2021
Closed
TheCakeIsNaOH added a commit to TheCakeIsNaOH/chocolatey-packages that referenced this pull request Aug 24, 2021
@TheCakeIsNaOH
Nextcloud client do not check windows version anymore.
9cbc0ba 
nextcloud/desktop#3437
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@camilasan camilasan Awaiting requested review from camilasan

@er-vin er-vin Awaiting requested review from er-vin

@FlexW FlexW Awaiting requested review from FlexW

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mgallien @nextcloud-desktop-bot @allexzander @FlexW