autotools: switch to autotools buildsystem

3 files changed, 170 insertions, 168 deletions

diff --git a/share/genbuild.sh b/share/genbuild.sh
index d959877dc8..da50b0d109 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
-
+if [ $# -gt 1 ]; then
+    cd "$2"
+fi
 if [ $# -gt 0 ]; then
     FILE="$1"
     shift
@@ -7,11 +9,11 @@ if [ $# -gt 0 ]; then
         INFO="$(head -n 1 "$FILE")"
     fi
 else
-    echo "Usage: $0 <filename>"
+    echo "Usage: $0 <filename> <srcroot>"
     exit 1
 fi
 
-if [ -e "$(which git)" ]; then
+if [ -e "$(which git)" -a -d ".git" ]; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null 
 
diff --git a/share/qt/Info.plist b/share/qt/Info.plist.in
index f191402e83..d0dd796561 100644
--- a/share/qt/Info.plist
+++ b/share/qt/Info.plist.in
@@ -7,11 +7,11 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleGetInfoString</key>
-  <string>$VERSION, Copyright © 2009-$YEAR The Bitcoin developers</string>
+  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin developers</string>
   <key>CFBundleShortVersionString</key>
-  <string>$VERSION</string>
+  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@</string>
   <key>CFBundleVersion</key>
-  <string>$VERSION</string>
+  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleExecutable</key>
diff --git a/share/setup.nsi b/share/setup.nsi.in
index d5f2ffc3f8..dd37862382 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi.in
@@ -1,162 +1,162 @@
-Name Bitcoin

-

-RequestExecutionLevel highest

-SetCompressor /SOLID lzma

-

-# General Symbol Definitions

-!define REGKEY "SOFTWARE\$(^Name)"

-!define VERSION 0.8.2

-!define COMPANY "Bitcoin project"

-!define URL http://www.bitcoin.org/

-

-# MUI Symbol Definitions

-!define MUI_ICON "../share/pixmaps/bitcoin.ico"

-!define MUI_WELCOMEFINISHPAGE_BITMAP "../share/pixmaps/nsis-wizard.bmp"

-!define MUI_HEADERIMAGE

-!define MUI_HEADERIMAGE_RIGHT

-!define MUI_HEADERIMAGE_BITMAP "../share/pixmaps/nsis-header.bmp"

-!define MUI_FINISHPAGE_NOAUTOCLOSE

-!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM

-!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}

-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup

-!define MUI_STARTMENUPAGE_DEFAULTFOLDER Bitcoin

-!define MUI_FINISHPAGE_RUN $INSTDIR\bitcoin-qt.exe

-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"

-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "../share/pixmaps/nsis-wizard.bmp"

-!define MUI_UNFINISHPAGE_NOAUTOCLOSE

-

-# Included files

-!include Sections.nsh

-!include MUI2.nsh

-

-# Variables

-Var StartMenuGroup

-

-# Installer pages

-!insertmacro MUI_PAGE_WELCOME

-!insertmacro MUI_PAGE_DIRECTORY

-!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup

-!insertmacro MUI_PAGE_INSTFILES

-!insertmacro MUI_PAGE_FINISH

-!insertmacro MUI_UNPAGE_CONFIRM

-!insertmacro MUI_UNPAGE_INSTFILES

-

-# Installer languages

-!insertmacro MUI_LANGUAGE English

-

-# Installer attributes

-OutFile bitcoin-0.8.2-win32-setup.exe

-InstallDir $PROGRAMFILES\Bitcoin

-CRCCheck on

-XPStyle on

-BrandingText " "

-ShowInstDetails show

-VIProductVersion 0.8.2.2

-VIAddVersionKey ProductName Bitcoin

-VIAddVersionKey ProductVersion "${VERSION}"

-VIAddVersionKey CompanyName "${COMPANY}"

-VIAddVersionKey CompanyWebsite "${URL}"

-VIAddVersionKey FileVersion "${VERSION}"

-VIAddVersionKey FileDescription ""

-VIAddVersionKey LegalCopyright ""

-InstallDirRegKey HKCU "${REGKEY}" Path

-ShowUninstDetails show

-

-# Installer sections

-Section -Main SEC0000

-    SetOutPath $INSTDIR

-    SetOverwrite on

-    File ../release/bitcoin-qt.exe

-    File /oname=COPYING.txt ../COPYING

-    File /oname=readme.txt ../doc/README_windows.txt

-    SetOutPath $INSTDIR\daemon

-    File ../src/bitcoind.exe

-    SetOutPath $INSTDIR\src

-    File /r /x *.exe /x *.o ../src\*.*

-    SetOutPath $INSTDIR

-    WriteRegStr HKCU "${REGKEY}\Components" Main 1

-

-    # Remove old wxwidgets-based-bitcoin executable and locales:

-    Delete /REBOOTOK $INSTDIR\bitcoin.exe

-    RMDir /r /REBOOTOK $INSTDIR\locale

-SectionEnd

-

-Section -post SEC0001

-    WriteRegStr HKCU "${REGKEY}" Path $INSTDIR

-    SetOutPath $INSTDIR

-    WriteUninstaller $INSTDIR\uninstall.exe

-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

-    CreateDirectory $SMPROGRAMS\$StartMenuGroup

-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" $INSTDIR\bitcoin-qt.exe

-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk" $INSTDIR\uninstall.exe

-    !insertmacro MUI_STARTMENU_WRITE_END

-    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"

-    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"

-    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"

-    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"

-    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe

-    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe

-    WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1

-    WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1

-    WriteRegStr HKCR "bitcoin" "URL Protocol" ""

-    WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin"

-    WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe

-    WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "%1"'

-SectionEnd

-

-# Macro for selecting uninstaller sections

-!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID

-    Push $R0

-    ReadRegStr $R0 HKCU "${REGKEY}\Components" "${SECTION_NAME}"

-    StrCmp $R0 1 0 next${UNSECTION_ID}

-    !insertmacro SelectSection "${UNSECTION_ID}"

-    GoTo done${UNSECTION_ID}

-next${UNSECTION_ID}:

-    !insertmacro UnselectSection "${UNSECTION_ID}"

-done${UNSECTION_ID}:

-    Pop $R0

-!macroend

-

-# Uninstaller sections

-Section /o -un.Main UNSEC0000

-    Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe

-    Delete /REBOOTOK $INSTDIR\COPYING.txt

-    Delete /REBOOTOK $INSTDIR\readme.txt

-    RMDir /r /REBOOTOK $INSTDIR\daemon

-    RMDir /r /REBOOTOK $INSTDIR\src

-    DeleteRegValue HKCU "${REGKEY}\Components" Main

-SectionEnd

-

-Section -un.post UNSEC0001

-    DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"

-    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk"

-    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk"

-    Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"

-    Delete /REBOOTOK $INSTDIR\uninstall.exe

-    Delete /REBOOTOK $INSTDIR\debug.log

-    Delete /REBOOTOK $INSTDIR\db.log

-    DeleteRegValue HKCU "${REGKEY}" StartMenuGroup

-    DeleteRegValue HKCU "${REGKEY}" Path

-    DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"

-    DeleteRegKey /IfEmpty HKCU "${REGKEY}"

-    DeleteRegKey HKCR "bitcoin"

-    RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup

-    RmDir /REBOOTOK $INSTDIR

-    Push $R0

-    StrCpy $R0 $StartMenuGroup 1

-    StrCmp $R0 ">" no_smgroup

-no_smgroup:

-    Pop $R0

-SectionEnd

-

-# Installer functions

-Function .onInit

-    InitPluginsDir

-FunctionEnd

-

-# Uninstaller functions

-Function un.onInit

-    ReadRegStr $INSTDIR HKCU "${REGKEY}" Path

-    !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup

-    !insertmacro SELECT_UNSECTION Main ${UNSEC0000}

-FunctionEnd

+Name @PACKAGE_NAME@
+
+RequestExecutionLevel highest
+SetCompressor /SOLID lzma
+
+# General Symbol Definitions
+!define REGKEY "SOFTWARE\$(^Name)"
+!define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@
+!define COMPANY "Bitcoin project"
+!define URL http://www.bitcoin.org/
+
+# MUI Symbol Definitions
+!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_RIGHT
+!define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp"
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
+!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER @PACKAGE_NAME@
+!define MUI_FINISHPAGE_RUN $INSTDIR\bitcoin-qt.exe
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+# Included files
+!include Sections.nsh
+!include MUI2.nsh
+
+# Variables
+Var StartMenuGroup
+
+# Installer pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+# Installer languages
+!insertmacro MUI_LANGUAGE English
+
+# Installer attributes
+OutFile @abs_top_srcdir@/bitcoin-${VERSION}-win32-setup.exe
+InstallDir $PROGRAMFILES\Bitcoin
+CRCCheck on
+XPStyle on
+BrandingText " "
+ShowInstDetails show
+VIProductVersion ${VERSION}.@CLIENT_VERSION_BUILD@
+VIAddVersionKey ProductName Bitcoin
+VIAddVersionKey ProductVersion "${VERSION}"
+VIAddVersionKey CompanyName "${COMPANY}"
+VIAddVersionKey CompanyWebsite "${URL}"
+VIAddVersionKey FileVersion "${VERSION}"
+VIAddVersionKey FileDescription ""
+VIAddVersionKey LegalCopyright ""
+InstallDirRegKey HKCU "${REGKEY}" Path
+ShowUninstDetails show
+
+# Installer sections
+Section -Main SEC0000
+    SetOutPath $INSTDIR
+    SetOverwrite on
+    File @abs_top_srcdir@/release/bitcoin-qt.exe
+    File /oname=COPYING.txt @abs_top_srcdir@/COPYING
+    File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
+    SetOutPath $INSTDIR\daemon
+    File @abs_top_srcdir@/release/bitcoind.exe
+    SetOutPath $INSTDIR\src
+    File /r @abs_top_srcdir@/@PACKAGE@-@VERSION@/src\*.*
+    SetOutPath $INSTDIR
+    WriteRegStr HKCU "${REGKEY}\Components" Main 1
+
+    # Remove old wxwidgets-based-bitcoin executable and locales:
+    Delete /REBOOTOK $INSTDIR\bitcoin.exe
+    RMDir /r /REBOOTOK $INSTDIR\locale
+SectionEnd
+
+Section -post SEC0001
+    WriteRegStr HKCU "${REGKEY}" Path $INSTDIR
+    SetOutPath $INSTDIR
+    WriteUninstaller $INSTDIR\uninstall.exe
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    CreateDirectory $SMPROGRAMS\$StartMenuGroup
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" $INSTDIR\bitcoin-qt.exe
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk" $INSTDIR\uninstall.exe
+    !insertmacro MUI_STARTMENU_WRITE_END
+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe
+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
+    WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
+    WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
+    WriteRegStr HKCR "bitcoin" "URL Protocol" ""
+    WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin"
+    WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe
+    WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "%1"'
+SectionEnd
+
+# Macro for selecting uninstaller sections
+!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID
+    Push $R0
+    ReadRegStr $R0 HKCU "${REGKEY}\Components" "${SECTION_NAME}"
+    StrCmp $R0 1 0 next${UNSECTION_ID}
+    !insertmacro SelectSection "${UNSECTION_ID}"
+    GoTo done${UNSECTION_ID}
+next${UNSECTION_ID}:
+    !insertmacro UnselectSection "${UNSECTION_ID}"
+done${UNSECTION_ID}:
+    Pop $R0
+!macroend
+
+# Uninstaller sections
+Section /o -un.Main UNSEC0000
+    Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe
+    Delete /REBOOTOK $INSTDIR\COPYING.txt
+    Delete /REBOOTOK $INSTDIR\readme.txt
+    RMDir /r /REBOOTOK $INSTDIR\daemon
+    RMDir /r /REBOOTOK $INSTDIR\src
+    DeleteRegValue HKCU "${REGKEY}\Components" Main
+SectionEnd
+
+Section -un.post UNSEC0001
+    DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk"
+    Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"
+    Delete /REBOOTOK $INSTDIR\uninstall.exe
+    Delete /REBOOTOK $INSTDIR\debug.log
+    Delete /REBOOTOK $INSTDIR\db.log
+    DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
+    DeleteRegValue HKCU "${REGKEY}" Path
+    DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"
+    DeleteRegKey /IfEmpty HKCU "${REGKEY}"
+    DeleteRegKey HKCR "bitcoin"
+    RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
+    RmDir /REBOOTOK $INSTDIR
+    Push $R0
+    StrCpy $R0 $StartMenuGroup 1
+    StrCmp $R0 ">" no_smgroup
+no_smgroup:
+    Pop $R0
+SectionEnd
+
+# Installer functions
+Function .onInit
+    InitPluginsDir
+FunctionEnd
+
+# Uninstaller functions
+Function un.onInit
+    ReadRegStr $INSTDIR HKCU "${REGKEY}" Path
+    !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
+    !insertmacro SELECT_UNSECTION Main ${UNSEC0000}
+FunctionEnd