mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-04 07:07:45 +01:00
build: remove WINDOWS_BITS from build system
We no longer build/ship 32 bit windows executables.
This commit is contained in:
parent
988eaf2fcb
commit
abc147de95
3 changed files with 5 additions and 19 deletions
|
@ -25,7 +25,7 @@ BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
|
||||||
BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
|
BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
|
||||||
BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT)
|
BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT)
|
||||||
BITCOIN_WALLET_BIN=$(top_builddir)/src/$(BITCOIN_WALLET_TOOL_NAME)$(EXEEXT)
|
BITCOIN_WALLET_BIN=$(top_builddir)/src/$(BITCOIN_WALLET_TOOL_NAME)$(EXEEXT)
|
||||||
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
|
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win64-setup$(EXEEXT)
|
||||||
|
|
||||||
empty :=
|
empty :=
|
||||||
space := $(empty) $(empty)
|
space := $(empty) $(empty)
|
||||||
|
|
|
@ -525,12 +525,6 @@ case $host in
|
||||||
if test "x$CXXFLAGS_overridden" = "xno"; then
|
if test "x$CXXFLAGS_overridden" = "xno"; then
|
||||||
CXXFLAGS="$CXXFLAGS -w"
|
CXXFLAGS="$CXXFLAGS -w"
|
||||||
fi
|
fi
|
||||||
case $host in
|
|
||||||
i?86-*) WINDOWS_BITS=32 ;;
|
|
||||||
x86_64-*) WINDOWS_BITS=64 ;;
|
|
||||||
*) AC_MSG_ERROR("Could not determine win32/win64 for installer") ;;
|
|
||||||
esac
|
|
||||||
AC_SUBST(WINDOWS_BITS)
|
|
||||||
|
|
||||||
dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
|
dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
|
||||||
dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
|
dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Name "@PACKAGE_NAME@ (@WINDOWS_BITS@-bit)"
|
Name "@PACKAGE_NAME@ (64-bit)"
|
||||||
|
|
||||||
RequestExecutionLevel highest
|
RequestExecutionLevel highest
|
||||||
SetCompressor /SOLID lzma
|
SetCompressor /SOLID lzma
|
||||||
|
@ -28,9 +28,7 @@ SetCompressor /SOLID lzma
|
||||||
# Included files
|
# Included files
|
||||||
!include Sections.nsh
|
!include Sections.nsh
|
||||||
!include MUI2.nsh
|
!include MUI2.nsh
|
||||||
!if "@WINDOWS_BITS@" == "64"
|
|
||||||
!include x64.nsh
|
!include x64.nsh
|
||||||
!endif
|
|
||||||
|
|
||||||
# Variables
|
# Variables
|
||||||
Var StartMenuGroup
|
Var StartMenuGroup
|
||||||
|
@ -48,12 +46,8 @@ Var StartMenuGroup
|
||||||
!insertmacro MUI_LANGUAGE English
|
!insertmacro MUI_LANGUAGE English
|
||||||
|
|
||||||
# Installer attributes
|
# Installer attributes
|
||||||
OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win@WINDOWS_BITS@-setup-unsigned.exe
|
OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win64-setup-unsigned.exe
|
||||||
!if "@WINDOWS_BITS@" == "64"
|
|
||||||
InstallDir $PROGRAMFILES64\Bitcoin
|
InstallDir $PROGRAMFILES64\Bitcoin
|
||||||
!else
|
|
||||||
InstallDir $PROGRAMFILES\Bitcoin
|
|
||||||
!endif
|
|
||||||
CRCCheck on
|
CRCCheck on
|
||||||
XPStyle on
|
XPStyle on
|
||||||
BrandingText " "
|
BrandingText " "
|
||||||
|
@ -94,7 +88,7 @@ Section -post SEC0001
|
||||||
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
||||||
CreateDirectory $SMPROGRAMS\$StartMenuGroup
|
CreateDirectory $SMPROGRAMS\$StartMenuGroup
|
||||||
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
|
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
|
||||||
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1
|
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, 64-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1
|
||||||
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
|
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
|
||||||
!insertmacro MUI_STARTMENU_WRITE_END
|
!insertmacro MUI_STARTMENU_WRITE_END
|
||||||
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
|
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
|
||||||
|
@ -138,7 +132,7 @@ Section -un.post UNSEC0001
|
||||||
DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
|
DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
|
||||||
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
|
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
|
||||||
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
|
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
|
||||||
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk"
|
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, 64-bit).lnk"
|
||||||
Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"
|
Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"
|
||||||
Delete /REBOOTOK $INSTDIR\uninstall.exe
|
Delete /REBOOTOK $INSTDIR\uninstall.exe
|
||||||
Delete /REBOOTOK $INSTDIR\debug.log
|
Delete /REBOOTOK $INSTDIR\debug.log
|
||||||
|
@ -160,7 +154,6 @@ SectionEnd
|
||||||
# Installer functions
|
# Installer functions
|
||||||
Function .onInit
|
Function .onInit
|
||||||
InitPluginsDir
|
InitPluginsDir
|
||||||
!if "@WINDOWS_BITS@" == "64"
|
|
||||||
${If} ${RunningX64}
|
${If} ${RunningX64}
|
||||||
; disable registry redirection (enable access to 64-bit portion of registry)
|
; disable registry redirection (enable access to 64-bit portion of registry)
|
||||||
SetRegView 64
|
SetRegView 64
|
||||||
|
@ -168,7 +161,6 @@ Function .onInit
|
||||||
MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system."
|
MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system."
|
||||||
Abort
|
Abort
|
||||||
${EndIf}
|
${EndIf}
|
||||||
!endif
|
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
# Uninstaller functions
|
# Uninstaller functions
|
||||||
|
|
Loading…
Add table
Reference in a new issue