Merge pull request #3015 from theuni/win32-version-info
Win32 version info
This commit is contained in:
commit
6865127551
|
@ -125,7 +125,6 @@ AC_PROG_MKDIR_P
|
||||||
AC_PROG_SED
|
AC_PROG_SED
|
||||||
AC_PATH_TOOL(AR, ar)
|
AC_PATH_TOOL(AR, ar)
|
||||||
AC_PATH_TOOL(RANLIB, ranlib)
|
AC_PATH_TOOL(RANLIB, ranlib)
|
||||||
AC_PATH_TOOL(WINDRES, windres)
|
|
||||||
AC_PATH_TOOL(STRIP, strip)
|
AC_PATH_TOOL(STRIP, strip)
|
||||||
AC_PATH_TOOL(GCOV, gcov)
|
AC_PATH_TOOL(GCOV, gcov)
|
||||||
AC_PATH_PROG(LCOV, lcov)
|
AC_PATH_PROG(LCOV, lcov)
|
||||||
|
@ -187,6 +186,11 @@ case $host in
|
||||||
AC_MSG_WARN("makensis not found. Cannot create installer.")
|
AC_MSG_WARN("makensis not found. Cannot create installer.")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_PATH_TOOL(WINDRES, windres, none)
|
||||||
|
if test x$WINDRES = xnone; then
|
||||||
|
AC_MSG_ERROR("windres not found")
|
||||||
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB"
|
CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB"
|
||||||
LEVELDB_TARGET_FLAGS="TARGET_OS=OS_WINDOWS_CROSSCOMPILE"
|
LEVELDB_TARGET_FLAGS="TARGET_OS=OS_WINDOWS_CROSSCOMPILE"
|
||||||
CXXFLAGS="$CXXFLAGS -w"
|
CXXFLAGS="$CXXFLAGS -w"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
|
include Makefile.include
|
||||||
AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
|
AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
|
||||||
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
|
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
|
||||||
-I$(builddir) $(BOOST_INCLUDES)
|
-I$(builddir) $(BOOST_INCLUDES) $(BDB_CPPFLAGS)
|
||||||
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libbitcoin.a
|
noinst_LIBRARIES = libbitcoin.a
|
||||||
|
@ -47,6 +48,10 @@ bitcoind_LDADD = libbitcoin.a leveldb/libleveldb.a leveldb/libmemenv.a \
|
||||||
bitcoind_SOURCES = bitcoind.cpp
|
bitcoind_SOURCES = bitcoind.cpp
|
||||||
#
|
#
|
||||||
|
|
||||||
|
if TARGET_WINDOWS
|
||||||
|
bitcoind_SOURCES += bitcoin-res.rc
|
||||||
|
endif
|
||||||
|
|
||||||
AM_CPPFLAGS += $(BDB_CPPFLAGS)
|
AM_CPPFLAGS += $(BDB_CPPFLAGS)
|
||||||
bitcoind_LDADD += $(BDB_LIBS)
|
bitcoind_LDADD += $(BDB_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
.PHONY: FORCE
|
# Helper for rules and subdir Makefiles to find parent targets.
|
||||||
|
# Flags and other non-target variables should not be set here.
|
||||||
|
|
||||||
LIBBITCOIN=$(top_builddir)/src/libbitcoin.a
|
LIBBITCOIN=$(top_builddir)/src/libbitcoin.a
|
||||||
LIBLEVELDB=$(top_builddir)/src/leveldb/libleveldb.a
|
LIBLEVELDB=$(top_builddir)/src/leveldb/libleveldb.a
|
||||||
LIBMEMENV=$(top_builddir)/src/leveldb/libmemenv.a
|
LIBMEMENV=$(top_builddir)/src/leveldb/libmemenv.a
|
||||||
LIBBITCOINQT=$(top_builddir)/src/qt/libbitcoinqt.a
|
LIBBITCOINQT=$(top_builddir)/src/qt/libbitcoinqt.a
|
||||||
|
|
||||||
INCLUDES += $(BDB_CPPFLAGS)
|
|
||||||
LIBBITCOIN += $(BDB_LIBS)
|
|
||||||
|
|
||||||
$(LIBBITCOIN):
|
$(LIBBITCOIN):
|
||||||
$(MAKE) -C $(top_builddir)/src $(@F)
|
$(MAKE) -C $(top_builddir)/src $(@F)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
#include <windows.h> // needed for VERSIONINFO
|
||||||
|
#include "clientversion.h" // holds the needed client version information
|
||||||
|
|
||||||
|
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
|
||||||
|
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
||||||
|
#define VER_FILEVERSION VER_PRODUCTVERSION
|
||||||
|
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
||||||
|
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers"
|
||||||
|
|
||||||
|
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", "Bitcoin"
|
||||||
|
VALUE "FileDescription", "Bitcoind (OSS daemon/client for Bitcoin)"
|
||||||
|
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||||
|
VALUE "InternalName", "bitcoind"
|
||||||
|
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", "bitcoind.exe"
|
||||||
|
VALUE "ProductName", "Bitcoind"
|
||||||
|
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||||
|
END
|
||||||
|
END
|
||||||
|
|
||||||
|
BLOCK "VarFileInfo"
|
||||||
|
BEGIN
|
||||||
|
VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal)
|
||||||
|
END
|
||||||
|
END
|
|
@ -5,8 +5,10 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
|
||||||
AC_MSG_RESULT([default])
|
AC_MSG_RESULT([default])
|
||||||
else
|
else
|
||||||
echo "#include <$2$3.h>" >conftest.cpp
|
echo "#include <$2$3.h>" >conftest.cpp
|
||||||
newinclpath=`${CXXCPP} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
|
newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
|
||||||
AC_MSG_RESULT([${newinclpath}])
|
AC_MSG_RESULT([${newinclpath}])
|
||||||
|
if test "x${newinclpath}" != "x"; then
|
||||||
eval "$1=\"\$$1\"' -I${newinclpath}'"
|
eval "$1=\"\$$1\"' -I${newinclpath}'"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
|
|
|
@ -4,7 +4,7 @@ AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
|
||||||
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src \
|
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src \
|
||||||
-I$(top_srcdir)/src/leveldb/helpers -I$(top_builddir)/src/qt \
|
-I$(top_srcdir)/src/leveldb/helpers -I$(top_builddir)/src/qt \
|
||||||
-I$(top_builddir)/src/qt/forms $(BOOST_INCLUDES) $(PROTOBUF_CFLAGS) \
|
-I$(top_builddir)/src/qt/forms $(BOOST_INCLUDES) $(PROTOBUF_CFLAGS) \
|
||||||
$(QR_CFLAGS)
|
$(QR_CFLAGS) $(BDB_CPPFLAGS)
|
||||||
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
||||||
bin_PROGRAMS = bitcoin-qt
|
bin_PROGRAMS = bitcoin-qt
|
||||||
noinst_LIBRARIES = libbitcoinqt.a
|
noinst_LIBRARIES = libbitcoinqt.a
|
||||||
|
@ -145,7 +145,7 @@ bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
|
||||||
-I$(top_srcdir)/src/qt/forms
|
-I$(top_srcdir)/src/qt/forms
|
||||||
bitcoin_qt_SOURCES = bitcoin.cpp
|
bitcoin_qt_SOURCES = bitcoin.cpp
|
||||||
bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN) $(LIBLEVELDB) $(LIBMEMENV) \
|
bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||||
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS)
|
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
||||||
|
|
||||||
# forms/foo.h -> forms/ui_foo.h
|
# forms/foo.h -> forms/ui_foo.h
|
||||||
QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))
|
QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))
|
||||||
|
|
|
@ -4,7 +4,7 @@ AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
|
||||||
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src \
|
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src \
|
||||||
-I$(top_srcdir)/src/leveldb/helpers -I$(top_srcdir)/src/qt \
|
-I$(top_srcdir)/src/leveldb/helpers -I$(top_srcdir)/src/qt \
|
||||||
-I$(top_builddir)/src/qt $(BOOST_INCLUDES) $(PROTOBUF_CFLAGS) \
|
-I$(top_builddir)/src/qt $(BOOST_INCLUDES) $(PROTOBUF_CFLAGS) \
|
||||||
$(QR_CFLAGS)
|
$(QR_CFLAGS) $(BDB_CPPFLAGS)
|
||||||
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
||||||
bin_PROGRAMS = test_bitcoin-qt
|
bin_PROGRAMS = test_bitcoin-qt
|
||||||
TESTS = test_bitcoin-qt
|
TESTS = test_bitcoin-qt
|
||||||
|
@ -20,7 +20,7 @@ test_bitcoin_qt_SOURCES = test_main.cpp uritests.cpp paymentservertests.cpp $(TE
|
||||||
nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
|
nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
|
||||||
test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN) $(LIBLEVELDB) \
|
test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN) $(LIBLEVELDB) \
|
||||||
$(LIBMEMENV) $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
|
$(LIBMEMENV) $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
|
||||||
$(QR_LIBS) $(PROTOBUF_LIBS)
|
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
||||||
|
|
||||||
CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno
|
CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ include $(top_srcdir)/src/Makefile.include
|
||||||
|
|
||||||
AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
|
AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
|
||||||
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
|
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
|
||||||
-I$(top_srcdir)/src $(BOOST_INCLUDES)
|
-I$(top_srcdir)/src $(BOOST_INCLUDES) $(BDB_CPPFLAGS)
|
||||||
|
|
||||||
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
|
||||||
# test_bitcoin binary #
|
# test_bitcoin binary #
|
||||||
test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS)
|
test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS)
|
||||||
test_bitcoin_LDADD = $(LIBBITCOIN) $(LIBLEVELDB) $(LIBMEMENV) \
|
test_bitcoin_LDADD = $(LIBBITCOIN) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||||
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(BDB_LIBS)
|
||||||
test_bitcoin_SOURCES = accounting_tests.cpp alert_tests.cpp \
|
test_bitcoin_SOURCES = accounting_tests.cpp alert_tests.cpp \
|
||||||
allocator_tests.cpp base32_tests.cpp base58_tests.cpp base64_tests.cpp \
|
allocator_tests.cpp base32_tests.cpp base58_tests.cpp base64_tests.cpp \
|
||||||
bignum_tests.cpp bloom_tests.cpp canonical_tests.cpp checkblock_tests.cpp \
|
bignum_tests.cpp bloom_tests.cpp canonical_tests.cpp checkblock_tests.cpp \
|
||||||
|
|
Loading…
Reference in New Issue