Merge pull request #13 from GroundRod/iXcoin

Initial conversion of codebase to Ixcoin v0.9.4

.gitignore

@@ -1,25 +1,55 @@
+# For collections of useful .gitignore templates visit: https://github.com/github/gitignore
+#
+# Primarily those entries that follow are very specific to building Ixcoin and it's toolchain,
+# the running of tests and/or building bootstrap data files.
+# A few are for future structural changes to v10 core technology, that could otherwise be
+# left out at this time.
+#
+# The challenge has been to get this list correct for building on the different platforms,
+# linux, mingw32 on windows and darwin for the mac are the primary initial concerns.
+# If your building with VisualStudio, running an IDE like Eclipse please add them above,
+# or below this group.  If your building Ixcoin for an Andriod (or other) target, we would
+# like to see those needed exceptions added near the bottom of this list, as a group.
+
 *.tar.gz
 
 *.exe
 src/ixcoin
 src/ixcoind
 src/ixcoin-cli
+src/ixcoin-tx
 src/test/test_ixcoin
 src/qt/test/test_ixcoin-qt
 
+# autoreconf
 Makefile.in
 aclocal.m4
 autom4te.cache/
+build-aux/config.guess
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/ltmain.sh
+build-aux/m4/libtool.m4
+build-aux/m4/lt~obsolete.m4
+build-aux/m4/ltoptions.m4
+build-aux/m4/ltsugar.m4
+build-aux/m4/ltversion.m4
+build-aux/missing
+build-aux/compile
+build-aux/test-driver
 config.log
 config.status
 configure
-src/ixcoin-config.h
-src/ixcoin-config.h.in
-src/build-aux/
-src/stamp-h1
+libtool
+src/config/ixcoin-config.h
+src/config/ixcoin-config.h.in
+src/config/stamp-h1
 share/setup.nsi
 share/qt/Info.plist
 
+src/univalue/gen
+
 src/qt/*.moc
 src/qt/moc_*.cpp
 src/qt/forms/ui_*.h
@@ -28,11 +58,13 @@ src/qt/test/moc*.cpp
 
 .deps
 .dirstamp
+.libs
 .*.swp
 *.*~*
 *.bak
 *.rej
 *.orig
+*.pyc
 *.o
 *.o-*
 *.patch
@@ -48,15 +80,19 @@ src/qt/test/moc*.cpp
 *.json.h
 *.raw.h
 
+#libtool object files
+*.lo
+*.la
+
 # Compilation and Qt preprocessor part
 *.qm
-Makefile
 ixcoin-qt
-IXCoin-Qt.app
+Ixcoin-Qt.app
 
 # Unit-tests
 Makefile.test
 ixcoin-qt_test
+src/test/buildenv.py
 
 # Resources cpp
 qrc_*.cpp
@@ -80,6 +116,20 @@ linux-coverage-build
 linux-build
 win32-build
 qa/pull-tester/run-ixcoind-for-test.sh
-qa/pull-tester/build-tests.sh
+qa/pull-tester/tests-config.sh
+qa/pull-tester/cache/*
+qa/pull-tester/test.*/*
+
+# Some Makefiles are built locally, others are static now, and we must
+# include them, such as the one in depends, qt, qt test and leveldb.
+Makefile
+!depends/Makefile
+!src/qt/Makefile
+!src/test/Makefile
+!src/leveldb/Makefile
+
+src/leveldb/build_config.mk
+
+/doc/doxygen/
 
-!src/leveldb*/Makefile
+libixcoinconsensus.pc

Makefile.am

@@ -1,7 +1,11 @@
-ACLOCAL_AMFLAGS = -I src/m4
+ACLOCAL_AMFLAGS = -I build-aux/m4
 SUBDIRS = src
-.PHONY: deploy
+.PHONY: deploy FORCE
 
+# Handle archive building this way...
+#-9 --best = compress better
+#-n --no-name = do not save or restore the original name and time stamp
+#  For some reason keep getting an override from autogen.sh, when defining this variable, commented out until solved
 GZIP_ENV="-9n"
 
 IXCOIND_BIN=$(top_builddir)/src/ixcoind$(EXEEXT)
@@ -35,7 +39,8 @@ COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
 
 dist-hook:
 	-$(MAKE) -C $(top_distdir)/src/leveldb clean
-	-$(GIT) archive --format=tar HEAD -- src/version.cpp | $(AMTAR) -C $(top_distdir) -xf -
+#	-$(MAKE) -C $(top_distdir)/src/secp256k1 distclean
+	-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
 
 distcheck-hook:
 	$(MKDIR_P) $(top_distdir)/_build/src/leveldb
@@ -45,16 +50,16 @@ distcheck-hook:
 distcleancheck:
 	@:
 
-$(IXCOIN_WIN_INSTALLER): $(IXCOIND_BIN) $(IXCOIN_QT_BIN) $(IXCOIN_CLI_BIN)
+$(IXCOIN_WIN_INSTALLER): all-recursive
 	$(MKDIR_P) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(IXCOIND_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(IXCOIN_QT_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(IXCOIN_CLI_BIN) $(top_builddir)/release
 	@test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
 	  echo error: could not build $@
 
-$(IXCOIND_BIN) $(IXCOIN_QT_BIN) $(IXCOIN_CLI_BIN):
-	make -C $(dir $@) $(notdir $@)
+$(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE
+	$(MAKE) -C src $(patsubst src/%,%,$@)
 
 $(OSX_APP)/Contents/PkgInfo:
 	$(MKDIR_P) $(@D)
@@ -82,11 +87,11 @@ OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lp
 
 if BUILD_DARWIN
 $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
-	$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
+	$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
 
 else
 $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
-	INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
+	INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -verbose 2
 	$(MKDIR_P) dist/.background
 	$(INSTALL) contrib/macdeploy/background.png dist/.background
 	$(INSTALL) contrib/macdeploy/DS_Store dist/.DS_Store
@@ -102,6 +107,15 @@ if TARGET_WINDOWS
 deploy: $(IXCOIN_WIN_INSTALLER)
 endif
 
+$(IXCOIN_QT_BIN): FORCE
+	$(MAKE) -C src qt/$(@F)
+
+$(IXCOIND_BIN): FORCE
+	$(MAKE) -C src $(@F)
+
+$(IXCOIN_CLI_BIN): FORCE
+	$(MAKE) -C src $(@F)
+
 if USE_LCOV
 
 baseline.info:
@@ -159,10 +173,10 @@ endif
 if USE_COMPARISON_TOOL
 check-local:
 	$(MKDIR_P) qa/tmp
-	@qa/pull-tester/run-ixcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
+	@qa/pull-tester/run-ixcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
 endif
 
-EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-ixcoin-cli qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
 
 CLEANFILES = $(OSX_DMG) $(IXCOIN_WIN_INSTALLER)
 

autogen.sh

@@ -2,4 +2,11 @@
 set -e
 srcdir="$(dirname $0)"
 cd "$srcdir"
-autoreconf --install --force
+if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`which glibtoolize 2>/dev/null`"; then
+  LIBTOOLIZE="${GLIBTOOLIZE}"
+  export LIBTOOLIZE
+fi
+# This command has been known to clear out problems
+# autoreconf --install --force --symlink --warnings=all
+autoreconf --install --force --warnings=all
+