Update package version and resource files

dexX7 · dexX7 · commit 30fdde4833ac · 2015-07-01T04:39:53.000+02:00
The resource files and installer script define file properties, as well as steps taken during the installation on Windows.

The Omni Core version is set via configure.ac, and picked up for the setup and resource descriptions.

The versioning scheme itself hasn't changed, and the current version is still "0.0.10.0-dev".
diff --git a/.gitignore b/.gitignore
@@ -39,6 +39,9 @@ src/config/stamp-h1
 share/setup.nsi
 share/qt/Info.plist
 
+# Omni Core Windows installer script
+src/omnicore/res/omnicore-setup-win.nsi
+
 src/univalue/gen
 
 src/qt/*.moc
diff --git a/Makefile.am b/Makefile.am
@@ -17,7 +17,10 @@ OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
 OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
 OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
 
-DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
+DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md) \
+  $(wildcard src/omnicore/*.md) \
+  $(wildcard src/omnicore/doc/*.md) \
+  $(wildcard src/omnicore/doc/release-notes/*.md)
 
 WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
   $(top_srcdir)/share/pixmaps/nsis-header.bmp \
@@ -53,7 +56,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
-	@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \
+	@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/src/omnicore/res/omnicore-setup-win.nsi || \
 	  echo error: could not build $@
 	@echo built $@
 
diff --git a/configure.ac b/configure.ac
@@ -6,7 +6,12 @@ define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2015)
-AC_INIT([Omni Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/OmniLayer/omnicore/issues],[omnicore],[http://www.omnilayer.org/])
+define(_OMNICORE_VERSION_MILESTONE, 0)
+define(_OMNICORE_VERSION_MAJOR, 0)
+define(_OMNICORE_VERSION_MINOR, 10)
+define(_OMNICORE_VERSION_PATCH, 0)
+define(_OMNICORE_VERSION_STATUS, dev)
+AC_INIT([Omni Core],[_OMNICORE_VERSION_MILESTONE._OMNICORE_VERSION_MAJOR._OMNICORE_VERSION_MINOR._OMNICORE_VERSION_PATCH-_OMNICORE_VERSION_STATUS],[https://github.com/OmniLayer/omnicore/issues],[omnicore],[http://www.omnilayer.org/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -870,6 +875,17 @@ AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD)
 AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE)
 AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
 
+AC_DEFINE(OMNICORE_VERSION_MILESTONE, _OMNICORE_VERSION_MILESTONE, [Omni Core milestone])
+AC_DEFINE(OMNICORE_VERSION_MAJOR, _OMNICORE_VERSION_MAJOR, [Omni Core major version])
+AC_DEFINE(OMNICORE_VERSION_MINOR, _OMNICORE_VERSION_MINOR, [Omni Core minor version])
+AC_DEFINE(OMNICORE_VERSION_PATCH, _OMNICORE_VERSION_PATCH, [Omni Core patch version])
+AC_DEFINE(OMNICORE_VERSION_STATUS, _OMNICORE_VERSION_STATUS, [Omni Core release status])
+AC_SUBST(OMNICORE_VERSION_MILESTONE, _OMNICORE_VERSION_MILESTONE)
+AC_SUBST(OMNICORE_VERSION_MAJOR, _OMNICORE_VERSION_MAJOR)
+AC_SUBST(OMNICORE_VERSION_MINOR, _OMNICORE_VERSION_MINOR)
+AC_SUBST(OMNICORE_VERSION_PATCH, _OMNICORE_VERSION_PATCH)
+AC_SUBST(OMNICORE_VERSION_STATUS, _OMNICORE_VERSION_STATUS)
+
 AC_SUBST(RELDFLAGS)
 AC_SUBST(LIBTOOL_APP_LDFLAGS)
 AC_SUBST(USE_UPNP)
@@ -883,6 +899,7 @@ AC_SUBST(BUILD_TEST_QT)
 AC_SUBST(MINIUPNPC_CPPFLAGS)
 AC_SUBST(MINIUPNPC_LIBS)
 AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
+AC_CONFIG_FILES([src/omnicore/res/omnicore-setup-win.nsi])
 AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/tests-config.sh],[chmod +x qa/pull-tester/tests-config.sh])
 
diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
@@ -17,13 +17,13 @@
   <string>APPL</string>
 
   <key>CFBundleGetInfoString</key>
-  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers and the Omni Core developers</string>
+  <string>@OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@-@OMNICORE_VERSION_STATUS@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers and the Omni Core developers</string>
 
   <key>CFBundleShortVersionString</key>
-  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>
+  <string>@OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@</string>
 
   <key>CFBundleVersion</key>
-  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>
+  <string>@OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@</string>
 
   <key>CFBundleSignature</key>
   <string>????</string>
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -308,7 +308,7 @@ omnicored_SOURCES = bitcoind.cpp
 #
 
 if TARGET_WINDOWS
-omnicored_SOURCES += bitcoind-res.rc
+omnicored_SOURCES += omnicore/res/omnicored-res.rc
 endif
 
 omnicored_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
@@ -345,7 +345,7 @@ bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
 bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
 if TARGET_WINDOWS
-omnicore_cli_SOURCES += bitcoin-cli-res.rc
+omnicore_cli_SOURCES += omnicore/res/omnicore-cli-res.rc
 endif
 omnicore_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -374,7 +374,7 @@ RES_IMAGES = \
 
 RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png)
 
-BITCOIN_RC = qt/res/bitcoin-qt-res.rc
+BITCOIN_RC = omnicore/res/omnicore-qt-res.rc
 
 BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \
   -I$(builddir)/qt/forms
diff --git a/src/init.cpp b/src/init.cpp
@@ -403,7 +403,8 @@ std::string HelpMessage(HelpMessageMode mode)
 
 std::string LicenseInfo()
 {
-    return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +
+    return FormatParagraph(strprintf(_("Copyright (C) 2013-%i The Omni Core Developers"), COPYRIGHT_YEAR)) + "\n" +
+           FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +
            "\n" +
            FormatParagraph(_("This is experimental software.")) + "\n" +
            "\n" +
diff --git a/src/omnicore/COPYING.md b/src/omnicore/COPYING.md
diff --git a/src/omnicore/res/omnicore-cli-res.rc b/src/omnicore/res/omnicore-cli-res.rc
@@ -0,0 +1,36 @@
+#include <windows.h>                // needed for VERSIONINFO
+#include "../version.h"             // Omni Core version information
+#include "../../clientversion.h"    // Bitcoin Core version information
+
+#define VER_PRODUCTVERSION     OMNICORE_VERSION_MILESTONE,OMNICORE_VERSION_MAJOR,OMNICORE_VERSION_MINOR,OMNICORE_VERSION_PATCH
+#define VER_PRODUCTVERSION_STR STRINGIZE(OMNICORE_VERSION_MILESTONE) "." STRINGIZE(OMNICORE_VERSION_MAJOR) "." STRINGIZE(OMNICORE_VERSION_MINOR) "." STRINGIZE(OMNICORE_VERSION_PATCH) "-" STRINGIZE(OMNICORE_VERSION_STATUS)
+#define VER_FILEVERSION        VER_PRODUCTVERSION
+#define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_APP
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4" // U.S. English - multilingual (hex)
+        BEGIN
+            VALUE "CompanyName",        "Omni Foundation"
+            VALUE "FileDescription",    "Omni Core CLI (OSS RPC client for Bitcoin and the Omni Layer)"
+            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "InternalName",       "omnicore-cli"
+            VALUE "LegalCopyright",     COPYRIGHT_STR
+            VALUE "LegalTrademarks1",   "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
+            VALUE "OriginalFilename",   "omnicore-cli.exe"
+            VALUE "ProductName",        "Omni Core CLI"
+            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal)
+    END
+END
diff --git a/src/omnicore/res/omnicore-qt-res.rc b/src/omnicore/res/omnicore-qt-res.rc
@@ -0,0 +1,39 @@
+#include <windows.h>                // needed for VERSIONINFO
+#include "../version.h"             // Omni Core version information
+#include "../../clientversion.h"    // Bitcoin Core version information
+
+IDI_ICON1 ICON DISCARDABLE "../../qt/res/icons/bitcoin.ico"
+IDI_ICON2 ICON DISCARDABLE "../../qt/res/icons/bitcoin_testnet.ico"
+
+#define VER_PRODUCTVERSION     OMNICORE_VERSION_MILESTONE,OMNICORE_VERSION_MAJOR,OMNICORE_VERSION_MINOR,OMNICORE_VERSION_PATCH
+#define VER_PRODUCTVERSION_STR STRINGIZE(OMNICORE_VERSION_MILESTONE) "." STRINGIZE(OMNICORE_VERSION_MAJOR) "." STRINGIZE(OMNICORE_VERSION_MINOR) "." STRINGIZE(OMNICORE_VERSION_PATCH) "-" STRINGIZE(OMNICORE_VERSION_STATUS)
+#define VER_FILEVERSION        VER_PRODUCTVERSION
+#define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_APP
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4" // U.S. English - multilingual (hex)
+        BEGIN
+            VALUE "CompanyName",        "Omni Foundation"
+            VALUE "FileDescription",    "Omni Core (OSS GUI client for Bitcoin and the Omni Layer)"
+            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "InternalName",       "omnicore-qt"
+            VALUE "LegalCopyright",     COPYRIGHT_STR
+            VALUE "LegalTrademarks1",   "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
+            VALUE "OriginalFilename",   "omnicore-qt.exe"
+            VALUE "ProductName",        "Omni Core"
+            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal)
+    END
+END
diff --git a/src/omnicore/res/omnicore-setup-win.nsi.in b/src/omnicore/res/omnicore-setup-win.nsi.in
@@ -0,0 +1,182 @@
+Name "@PACKAGE_NAME@ (@WINDOWS_BITS@-bit)"
+
+RequestExecutionLevel highest
+SetCompressor /SOLID lzma
+
+# General Symbol Definitions
+!define REGKEY "SOFTWARE\$(^Name)"
+!define PRODUCTVERSION @OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@
+!define VERSION @OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@-@OMNICORE_VERSION_STATUS@
+!define COMPANY "Omni Foundation"
+!define URL http://www.omnilayer.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\omnicore-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
+!if "@WINDOWS_BITS@" == "64"
+!include x64.nsh
+!endif
+
+# 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@/omnicore-${VERSION}-win@WINDOWS_BITS@-setup.exe
+!if "@WINDOWS_BITS@" == "64"
+InstallDir "$PROGRAMFILES64\Omni Core"
+!else
+InstallDir "$PROGRAMFILES\Omni Core"
+!endif
+CRCCheck on
+XPStyle on
+BrandingText " "
+ShowInstDetails show
+VIProductVersion ${PRODUCTVERSION}
+VIAddVersionKey ProductName "Omni Core"
+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/omnicore-qt.exe
+    File /oname=copying.txt @abs_top_srcdir@/src/omnicore/COPYING.md
+    File /oname=readme.txt @abs_top_srcdir@/src/omnicore/README.md
+    File /oname=release-notes.txt @abs_top_srcdir@/src/omnicore/doc/release-notes.md
+    SetOutPath $INSTDIR\daemon
+    File @abs_top_srcdir@/release/omnicored.exe
+    File @abs_top_srcdir@/release/omnicore-cli.exe
+    SetOutPath $INSTDIR\doc
+    File /r @abs_top_srcdir@/src/omnicore/doc\*.*
+    SetOutPath $INSTDIR
+    WriteRegStr HKCU "${REGKEY}\Components" Main 1
+
+    # Remove old wxwidgets-based-bitcoin executable and locales:
+    Delete /REBOOTOK $INSTDIR\omnicore.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\$(^Name).lnk" $INSTDIR\omnicore-qt.exe
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).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\omnicore-qt.exe
+    WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\omnicore-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\omnicore-qt.exe
+    Delete /REBOOTOK $INSTDIR\copying.txt
+    Delete /REBOOTOK $INSTDIR\readme.txt
+    Delete /REBOOTOK $INSTDIR\release-notes.txt
+    RMDir /r /REBOOTOK $INSTDIR\daemon
+    RMDir /r /REBOOTOK $INSTDIR\doc
+    DeleteRegValue HKCU "${REGKEY}\Components" Main
+SectionEnd
+
+Section -un.post UNSEC0001
+    DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
+    Delete /REBOOTOK "$SMSTARTUP\Omni Core.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
+!if "@WINDOWS_BITS@" == "64"
+    ${If} ${RunningX64}
+      ; disable registry redirection (enable access to 64-bit portion of registry)
+      SetRegView 64
+    ${Else}
+      MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system."
+      Abort
+    ${EndIf}
+!endif
+FunctionEnd
+
+# Uninstaller functions
+Function un.onInit
+    ReadRegStr $INSTDIR HKCU "${REGKEY}" Path
+    !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
+    !insertmacro SELECT_UNSECTION Main ${UNSEC0000}
+FunctionEnd
diff --git a/src/omnicore/res/omnicored-res.rc b/src/omnicore/res/omnicored-res.rc
diff --git a/src/omnicore/version.cpp b/src/omnicore/version.cpp
diff --git a/src/omnicore/version.h b/src/omnicore/version.h

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,8 @@ std::string HelpMessage(HelpMessageMode mode)`
`403`	`403`
`404`	`404`	`std::string LicenseInfo()`
`405`	`405`	`{`
`406`		`- return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +`
	`406`	`+ return FormatParagraph(strprintf(_("Copyright (C) 2013-%i The Omni Core Developers"), COPYRIGHT_YEAR)) + "\n" +`
	`407`	`+ FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +`
`407`	`408`	`"\n" +`
`408`	`409`	`FormatParagraph(_("This is experimental software.")) + "\n" +`
`409`	`410`	`"\n" +`