Skip to content

Bugfix/version windows integration improve install #8178

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −1
Open

Bugfix/version windows integration improve install #8178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c13353
sets a version for our windows integration DLLs
mgallien Apr 7, 2025
543cc4a
use standard replace mode for MSI installer
mgallien Apr 7, 2025
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
2 changes: 2 additions & 0 deletions VERSION.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set(MIRALL_VERSION_PATCH 50)
set(MIRALL_VERSION_YEAR 2025)
set(MIRALL_SOVERSION 0)
set(MIRALL_PREVERSION_HUMAN "3.17.0 alpha") # For preversions where PATCH>=50. Use version + alpha, rc1, rc2, etc.
set(WINDOWS_INTEGRATION_VERSION 4)
set(WINDOWS_INTEGRATION_SOVERSION 4)
Copy link
Member

@nilsding nilsding Apr 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

where does the 4 come from?

NCExt/Version.h defines the NCEXT_BUILD_NUM constant with 47 that is part of the NCEXT_VERSION constant

and how does setting these as target properties differ from having it be defined in the .rc files? e.g.

desktop/shell_integration/windows/NCOverlays/NCOverlay.rc

Lines 67 to 68 in 3bdc2eb

FILEVERSION NCEXT_VERSION
PRODUCTVERSION NCEXT_VERSION


# ------------------------------------
# Minimum supported server versions
Expand Down
2 changes: 1 addition & 1 deletion admin/win/msi/Nextcloud.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
https://www.joyofsetup.com/2010/01/16/major-upgrades-now-easier-than-ever/
-->
<MajorUpgrade Schedule="afterInstallInitialize" AllowDowngrades="yes" />
<Property Id="REINSTALLMODE" Value="amus" />
<Property Id="REINSTALLMODE" Value="omus" />
Copy link
Member

Choose a reason for hiding this comment

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

hmm, I wonder if this shouldn't be dmus instead

if I understand the REINSTALLMODE flags correctly:

  • o replaces files if they are an older version (might make downgrades difficult?)
  • d replaces files if the version is different
  • e replaces files if the version is the same as the current one or older
  • a replaces all files regardless


<Media Id="1" Cabinet="$(var.AppShortName).cab" EmbedCab="yes" />

Expand Down
4 changes: 4 additions & 0 deletions shell_integration/windows/NCContextMenu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ set_target_properties(NCContextMenu
${BIN_OUTPUT_DIRECTORY}
RUNTIME_OUTPUT_DIRECTORY
${BIN_OUTPUT_DIRECTORY}
VERSION
${WINDOWS_INTEGRATION_VERSION}
SOVERSION
${WINDOWS_INTEGRATION_SOVERSION}
)

install(TARGETS NCContextMenu
Expand Down
4 changes: 4 additions & 0 deletions shell_integration/windows/NCOverlays/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ set_target_properties(NCOverlays
${BIN_OUTPUT_DIRECTORY}
RUNTIME_OUTPUT_DIRECTORY
${BIN_OUTPUT_DIRECTORY}
VERSION
${WINDOWS_INTEGRATION_VERSION}
SOVERSION
${WINDOWS_INTEGRATION_SOVERSION}
)

install(TARGETS NCOverlays
Expand Down
4 changes: 4 additions & 0 deletions src/libsync/vfs/cfapi/shellext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,10 @@ set_target_properties(CfApiShellExtensions
${BIN_OUTPUT_DIRECTORY}
RUNTIME_OUTPUT_DIRECTORY
${BIN_OUTPUT_DIRECTORY}
VERSION
${WINDOWS_INTEGRATION_VERSION}
SOVERSION
${WINDOWS_INTEGRATION_SOVERSION}
)

install(TARGETS CfApiShellExtensions
Expand Down
Loading