mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Windows installer: Change HAVE_64BIT_OS to HAVE_64BIT_BUILD

Browse source 
https://bugzilla.mozilla.org/show_bug.cgi?id=598615
This commit is contained in:
Dan Stillman 2024-08-10 02:14:40 -04:00
parent b564924c7c
commit 6e155de3e1
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.sh
View file

@ -765,7 +765,7 @@ if [ $BUILD_WIN == 1 ]; then
if [ "$arch" = "win32" ]; then if [ "$arch" = "win32" ]; then
"`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /V1 "`cygpath -w \"$BUILD_DIR/win_installer/uninstaller.nsi\"`" "`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /V1 "`cygpath -w \"$BUILD_DIR/win_installer/uninstaller.nsi\"`"
elif [[ "$arch" = "win-x64" ]] || [[ "$arch" = "win-arm64" ]]; then elif [[ "$arch" = "win-x64" ]] || [[ "$arch" = "win-arm64" ]]; then
"`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /DHAVE_64BIT_OS /V1 "`cygpath -w \"$BUILD_DIR/win_installer/uninstaller.nsi\"`" "`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /DHAVE_64BIT_BUILD /V1 "`cygpath -w \"$BUILD_DIR/win_installer/uninstaller.nsi\"`"
fi fi
mv "$BUILD_DIR/win_installer/helper.exe" "$APPDIR/uninstall" mv "$BUILD_DIR/win_installer/helper.exe" "$APPDIR/uninstall"
@ -799,7 +799,7 @@ if [ $BUILD_WIN == 1 ]; then
if [ "$arch" = "win32" ]; then if [ "$arch" = "win32" ]; then
"`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /V1 "`cygpath -w \"$BUILD_DIR/win_installer/installer.nsi\"`" "`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /V1 "`cygpath -w \"$BUILD_DIR/win_installer/installer.nsi\"`"
elif [[ "$arch" = "win-x64" ]] || [[ "$arch" = "win-arm64" ]]; then elif [[ "$arch" = "win-x64" ]] || [[ "$arch" = "win-arm64" ]]; then
"`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /DHAVE_64BIT_OS /V1 "`cygpath -w \"$BUILD_DIR/win_installer/installer.nsi\"`" "`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /DHAVE_64BIT_BUILD /V1 "`cygpath -w \"$BUILD_DIR/win_installer/installer.nsi\"`"
fi fi
mv "$BUILD_DIR/win_installer/setup.exe" "$INSTALLER_STAGE_DIR" mv "$BUILD_DIR/win_installer/setup.exe" "$INSTALLER_STAGE_DIR"

12
app/win/installer/common.nsh
View file

@ -959,7 +959,7 @@ Var Trash
!define KEY_SET_VALUE 0x0002 !define KEY_SET_VALUE 0x0002
!define KEY_WOW64_64KEY 0x0100 !define KEY_WOW64_64KEY 0x0100
!ifndef HAVE_64BIT_OS !ifndef HAVE_64BIT_BUILD
!define CREATE_KEY_SAM ${KEY_SET_VALUE} !define CREATE_KEY_SAM ${KEY_SET_VALUE}
!else !else
!define CREATE_KEY_SAM ${KEY_SET_VALUE}|${KEY_WOW64_64KEY} !define CREATE_KEY_SAM ${KEY_SET_VALUE}|${KEY_WOW64_64KEY}
@ -2118,7 +2118,7 @@ FunctionEnd
; Set the registry to the 32 bit registry for 64 bit installations or to ; Set the registry to the 32 bit registry for 64 bit installations or to
; the 64 bit registry for 32 bit installations at the beginning so it can ; the 64 bit registry for 32 bit installations at the beginning so it can
; easily be set back to the correct registry view when finished. ; easily be set back to the correct registry view when finished.
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
SetRegView 32 SetRegView 32
!else !else
SetRegView 64 SetRegView 64
@ -2187,7 +2187,7 @@ FunctionEnd
${If} ${RunningX64} ${If} ${RunningX64}
${AndIf} "$R0" == "false" ${AndIf} "$R0" == "false"
; Set the registry to the correct view. ; Set the registry to the correct view.
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
SetRegView 64 SetRegView 64
!else !else
SetRegView 32 SetRegView 32
@ -4150,7 +4150,7 @@ FunctionEnd
Push $R6 Push $R6
Push $R5 Push $R5
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
${Unless} ${RunningX64} ${Unless} ${RunningX64}
${OrUnless} ${AtLeastWin7} ${OrUnless} ${AtLeastWin7}
MessageBox MB_OK|MB_ICONSTOP "$R9" IDOK MessageBox MB_OK|MB_ICONSTOP "$R9" IDOK
@ -4199,7 +4199,7 @@ FunctionEnd
SetSilent silent SetSilent silent
ReadINIStr $R8 $R7 "Install" "InstallDirectoryName" ReadINIStr $R8 $R7 "Install" "InstallDirectoryName"
${If} $R8 != "" ${If} $R8 != ""
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
StrCpy $INSTDIR "$PROGRAMFILES64\$R8" StrCpy $INSTDIR "$PROGRAMFILES64\$R8"
!else !else
StrCpy $INSTDIR "$PROGRAMFILES32\$R8" StrCpy $INSTDIR "$PROGRAMFILES32\$R8"
@ -4768,7 +4768,7 @@ FunctionEnd
${LogMsg} "OS Name : Unable to detect" ${LogMsg} "OS Name : Unable to detect"
${EndIf} ${EndIf}
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
${LogMsg} "Target CPU : x64" ${LogMsg} "Target CPU : x64"
!else !else
${LogMsg} "Target CPU : x86" ${LogMsg} "Target CPU : x86"

2
app/win/installer/defines.nsi
View file

@ -42,7 +42,7 @@
# ARCH is used when it is necessary to differentiate the x64 registry keys from # ARCH is used when it is necessary to differentiate the x64 registry keys from
# the x86 registry keys (e.g. the uninstall registry key). # the x86 registry keys (e.g. the uninstall registry key).
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
!define ARCH "x86" !define ARCH "x86"
!define MinSupportedVer "64-bit Microsoft Windows 7" !define MinSupportedVer "64-bit Microsoft Windows 7"
!else !else

6
app/win/installer/installer.nsi
View file

@ -105,7 +105,7 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
Name "${BrandFullName}" Name "${BrandFullName}"
OutFile "setup.exe" OutFile "setup.exe"
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
InstallDir "$PROGRAMFILES64\${BrandFullName}\" InstallDir "$PROGRAMFILES64\${BrandFullName}\"
!else !else
InstallDir "$PROGRAMFILES32\${BrandFullName}\" InstallDir "$PROGRAMFILES32\${BrandFullName}\"
@ -928,7 +928,7 @@ Function .onInit
StrCpy $R2 "An older version of Zotero is installed. If you continue, the existing version will be removed.$\n$\nYour Zotero data will not be affected." StrCpy $R2 "An older version of Zotero is installed. If you continue, the existing version will be removed.$\n$\nYour Zotero data will not be affected."
Call UninstallOld Call UninstallOld
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
SetRegView 32 SetRegView 32
StrCpy $R1 "Zotero" StrCpy $R1 "Zotero"
StrCpy $R2 "A 32-bit version of Zotero is installed. If you continue, it will be replaced with a 64-bit version that offers better performance.$\n$\nYour Zotero data will not be affected." StrCpy $R2 "A 32-bit version of Zotero is installed. If you continue, it will be replaced with a 64-bit version that offers better performance.$\n$\nYour Zotero data will not be affected."
@ -936,7 +936,7 @@ Function .onInit
SetRegView 64 SetRegView 64
!endif !endif
!ifndef HAVE_64BIT_OS !ifndef HAVE_64BIT_BUILD
${If} ${RunningX64} ${If} ${RunningX64}
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON2 \ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON2 \
"This installer is for the 32-bit version of Zotero, but you appear to be running a 64-bit version of Windows.$\n$\nFor the best performance, please cancel and download the 64-bit version of Zotero." \ "This installer is for the 32-bit version of Zotero, but you appear to be running a 64-bit version of Windows.$\n$\nFor the best performance, please cancel and download the 64-bit version of Zotero." \

6
app/win/installer/uninstaller.nsi
View file

@ -96,7 +96,7 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
Name "${BrandFullName}" Name "${BrandFullName}"
OutFile "helper.exe" OutFile "helper.exe"
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
InstallDir "$PROGRAMFILES64\${BrandFullName}\" InstallDir "$PROGRAMFILES64\${BrandFullName}\"
!else !else
InstallDir "$PROGRAMFILES32\${BrandFullName}\" InstallDir "$PROGRAMFILES32\${BrandFullName}\"
@ -594,7 +594,7 @@ Function .onInit
Reboot Reboot
Quit ; Nothing initialized so no need to call OnEndCommon Quit ; Nothing initialized so no need to call OnEndCommon
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
SetRegView 64 SetRegView 64
!endif !endif
@ -697,7 +697,7 @@ Function un.onInit
Abort Abort
${EndUnless} ${EndUnless}
!ifdef HAVE_64BIT_OS !ifdef HAVE_64BIT_BUILD
SetRegView 64 SetRegView 64
!endif !endif