mac os

swatchie-1 · Jun 3, 2019 · 384de0b · 384de0b
1 parent c06a59b
commit 384de0b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 38 deletions.
diff --git a/Makefile b/Makefile
@@ -87,8 +87,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-apple-darwin18.6.0
-host_triplet = x86_64-apple-darwin18.6.0
+build_triplet = x86_64-apple-darwin18.2.0
+host_triplet = x86_64-apple-darwin18.2.0
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build-aux/m4/ax_boost_base.m4 \
@@ -270,13 +270,13 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing aclocal-1.16
+ACLOCAL = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing aclocal-1.16
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 0
 AR = /usr/bin/ar
-AUTOCONF = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing autoconf
-AUTOHEADER = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing autoheader
-AUTOMAKE = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing automake-1.16
+AUTOCONF = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing autoconf
+AUTOHEADER = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing autoheader
+AUTOMAKE = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing automake-1.16
 AWK = awk
 BDB_CPPFLAGS = 
 BDB_LIBS = -ldb_cxx-4.8
@@ -296,8 +296,8 @@ CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 CLIENT_VERSION_IS_RELEASE = true
 CLIENT_VERSION_MAJOR = 1
-CLIENT_VERSION_MINOR = 1
-CLIENT_VERSION_REVISION = 1
+CLIENT_VERSION_MINOR = 2
+CLIENT_VERSION_REVISION = 0
 COMPARISON_TOOL_REORG_TESTS = 0
 COPYRIGHT_YEAR = 2019
 CPP = gcc -E
@@ -329,7 +329,7 @@ FGREP = /usr/bin/grep -F
 GCOV = /usr/bin/gcov
 GENHTML = 
 GENISOIMAGE = 
-GIT = /usr/bin/git
+GIT = /usr/local/bin/git
 GREP = /usr/bin/grep
 HARDENED_CPPFLAGS =  -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
 HARDENED_CXXFLAGS =  -Wstack-protector -fstack-protector-all
@@ -345,7 +345,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 JAVA = /usr/bin/java
 JAVA_COMPARISON_TOOL = 
 LCOV = 
-LD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+LD = /Library/Developer/CommandLineTools/usr/bin/ld
 LDFLAGS =  -Wl,-headerpad_max_install_names -Wl,-dead_strip
 LEVELDB_ATOMIC_CPPFLAGS = -DLEVELDB_ATOMIC_PRESENT
 LEVELDB_ATOMIC_CXXFLAGS = -std=c++0x
@@ -364,7 +364,7 @@ LTLIBOBJS =
 LT_SYS_LIBRARY_PATH = 
 LUPDATE = /usr/local/Cellar/qt/5.12.3/bin/lupdate
 MAINT = 
-MAKEINFO = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing makeinfo
+MAKEINFO = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing makeinfo
 MAKENSIS = 
 MANIFEST_TOOL = :
 MINIUPNPC_CPPFLAGS = 
@@ -448,10 +448,10 @@ X11XCB_LIBS =
 XGETTEXT = 
 ZMQ_CFLAGS = 
 ZMQ_LIBS = 
-abs_builddir = /Users/tmfirehorse/Desktop/hilux
-abs_srcdir = /Users/tmfirehorse/Desktop/hilux
-abs_top_builddir = /Users/tmfirehorse/Desktop/hilux
-abs_top_srcdir = /Users/tmfirehorse/Desktop/hilux
+abs_builddir = /Users/tzehmingloo/Desktop/hilux
+abs_srcdir = /Users/tzehmingloo/Desktop/hilux
+abs_top_builddir = /Users/tzehmingloo/Desktop/hilux
+abs_top_srcdir = /Users/tzehmingloo/Desktop/hilux
 ac_ct_AR = ar
 ac_ct_CC = gcc
 ac_ct_CXX = g++
@@ -464,26 +464,26 @@ am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 ax_pthread_config = 
 bindir = ${exec_prefix}/bin
-build = x86_64-apple-darwin18.6.0
+build = x86_64-apple-darwin18.2.0
 build_alias = 
 build_cpu = x86_64
-build_os = darwin18.6.0
+build_os = darwin18.2.0
 build_vendor = apple
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = x86_64-apple-darwin18.6.0
+host = x86_64-apple-darwin18.2.0
 host_alias = 
 host_cpu = x86_64
-host_os = darwin18.6.0
+host_os = darwin18.2.0
 host_vendor = apple
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/install-sh
+install_sh = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

diff --git a/src/Makefile b/src/Makefile
@@ -88,8 +88,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-apple-darwin18.6.0
-host_triplet = x86_64-apple-darwin18.6.0
+build_triplet = x86_64-apple-darwin18.2.0
+host_triplet = x86_64-apple-darwin18.2.0
 am__append_1 = $(BDB_CPPFLAGS)
 am__append_2 = libhilux_wallet.a
 #am__append_3 = libhilux_zmq.a
@@ -2018,13 +2018,13 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ACLOCAL = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing aclocal-1.16
+ACLOCAL = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing aclocal-1.16
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 0
 AR = /usr/bin/ar
-AUTOCONF = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing autoconf
-AUTOHEADER = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing autoheader
-AUTOMAKE = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing automake-1.16
+AUTOCONF = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing autoconf
+AUTOHEADER = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing autoheader
+AUTOMAKE = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing automake-1.16
 AWK = awk
 BDB_CPPFLAGS = 
 BDB_LIBS = -ldb_cxx-4.8
@@ -2077,7 +2077,7 @@ FGREP = /usr/bin/grep -F
 GCOV = /usr/bin/gcov
 GENHTML = 
 GENISOIMAGE = 
-GIT = /usr/bin/git
+GIT = /usr/local/bin/git
 GREP = /usr/bin/grep
 HARDENED_CPPFLAGS =  -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
 HARDENED_CXXFLAGS =  -Wstack-protector -fstack-protector-all
@@ -2093,7 +2093,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 JAVA = /usr/bin/java
 JAVA_COMPARISON_TOOL = 
 LCOV = 
-LD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+LD = /Library/Developer/CommandLineTools/usr/bin/ld
 LDFLAGS =  -Wl,-headerpad_max_install_names -Wl,-dead_strip
 LEVELDB_ATOMIC_CPPFLAGS = -DLEVELDB_ATOMIC_PRESENT
 LEVELDB_ATOMIC_CXXFLAGS = -std=c++0x
@@ -2112,7 +2112,7 @@ LTLIBOBJS =
 LT_SYS_LIBRARY_PATH = 
 LUPDATE = /usr/local/Cellar/qt/5.12.3/bin/lupdate
 MAINT = 
-MAKEINFO = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/missing makeinfo
+MAKEINFO = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/missing makeinfo
 MAKENSIS = 
 MANIFEST_TOOL = :
 MINIUPNPC_CPPFLAGS = 
@@ -2196,10 +2196,10 @@ X11XCB_LIBS =
 XGETTEXT = 
 ZMQ_CFLAGS = 
 ZMQ_LIBS = 
-abs_builddir = /Users/tmfirehorse/Desktop/hilux/src
-abs_srcdir = /Users/tmfirehorse/Desktop/hilux/src
-abs_top_builddir = /Users/tmfirehorse/Desktop/hilux
-abs_top_srcdir = /Users/tmfirehorse/Desktop/hilux
+abs_builddir = /Users/tzehmingloo/Desktop/hilux/src
+abs_srcdir = /Users/tzehmingloo/Desktop/hilux/src
+abs_top_builddir = /Users/tzehmingloo/Desktop/hilux
+abs_top_srcdir = /Users/tzehmingloo/Desktop/hilux
 ac_ct_AR = ar
 ac_ct_CC = gcc
 ac_ct_CXX = g++
@@ -2212,26 +2212,26 @@ am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 ax_pthread_config = 
 bindir = ${exec_prefix}/bin
-build = x86_64-apple-darwin18.6.0
+build = x86_64-apple-darwin18.2.0
 build_alias = 
 build_cpu = x86_64
-build_os = darwin18.6.0
+build_os = darwin18.2.0
 build_vendor = apple
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = x86_64-apple-darwin18.6.0
+host = x86_64-apple-darwin18.2.0
 host_alias = 
 host_cpu = x86_64
-host_os = darwin18.6.0
+host_os = darwin18.2.0
 host_vendor = apple
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /Users/tmfirehorse/Desktop/hilux/build-aux/install-sh
+install_sh = ${SHELL} /Users/tzehmingloo/Desktop/hilux/build-aux/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

diff --git a/src/qt/test/test_hilux_qt-compattests-1de37d27.o.tmp b/src/qt/test/test_hilux_qt-compattests-1de37d27.o.tmp
diff --git a/src/qt/toolspage.cpp b/src/qt/toolspage.cpp
@@ -369,6 +369,7 @@ void ToolsPage::setClientModel(ClientModel *model)
         // Make sure we clean up the executor thread
         Q_EMIT stopExecutor();
         thread.wait();
+
     }
 }