gnucash-on-windows master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Thu Feb 2 13:03:30 EST 2017
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/5de8f8be (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/0bc21bc8 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/caab4a16 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/53ee6621 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/265e47b2 (commit)
commit 5de8f8bee7e446eae99d981519b2e79ff9190914
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Feb 2 18:04:57 2017 +0100
Make gtest work on Windows
There is a PR that got merged after release-1.8 that's needed for mingw.
diff --git a/defaults.sh b/defaults.sh
index 9ecc30e..bd3a311 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -402,7 +402,7 @@ set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
set_default BOOST_DIR $GLOBAL_DIR\\boost
set_default GTEST_REPO "https://github.com/google/googletest"
-set_default GTEST_VERSION "release-1.8.0"
+set_default GTEST_VERSION "master"
set_default GTEST_DIR $GLOBAL_DIR\\gtest
set_default WGET_EXTRA_OPTIONS "--no-check-certificate"
commit 0bc21bc8d8b23420a233bf1b289b593e16d6419c
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Feb 2 15:28:39 2017 +0100
Install gtest/gmock
GTest based tests are said to fail still on Windows, but
with this GTest can be made a mandatory build dependency for gnucash.
Just don't run any tests on Windows...
diff --git a/defaults.sh b/defaults.sh
index 854fa90..9ecc30e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -401,6 +401,10 @@ set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
set_default BOOST_DIR $GLOBAL_DIR\\boost
+set_default GTEST_REPO "https://github.com/google/googletest"
+set_default GTEST_VERSION "release-1.8.0"
+set_default GTEST_DIR $GLOBAL_DIR\\gtest
+
set_default WGET_EXTRA_OPTIONS "--no-check-certificate"
### Local Variables: ***
### sh-basic-offset: 4 ***
diff --git a/install-impl.sh b/install-impl.sh
index befa6aa..1fd5f5c 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1297,6 +1297,36 @@ function inst_boost() {
fi
}
+function inst_gtest() {
+ setup Googe Test Framework
+ get_major_minor "$GNUCASH_SCM_REV"
+ if [ "$GNUCASH_SCM_REV" != "master" ] &&
+ (( $major_minor <= 206 )); then
+ echo "Skipping. The Google test framework is only needed for the master branch or future 2.7.x and up versions of gnucash."
+ return
+ fi
+
+ _GTEST_UDIR=`unix_path ${GTEST_DIR}`
+ set_env ${_GTEST_UDIR}/googletest GTEST_ROOT
+ set_env ${_GTEST_UDIR}/googlemock GMOCK_ROOT
+ export GTEST_ROOT GMOCK_ROOT
+ if [ -f ${GTEST_ROOT}/src/gtest-all.cc ] &&
+ [ -f ${GTEST_ROOT}/include/gtest/gtest.h ] &&
+ [ -f ${GMOCK_ROOT}/src/gmock-all.cc ] &&
+ [ -f ${GMOCK_ROOT}/include/gmock/gmock.h ]
+ then
+ echo "Google test framework already installed in ${_GTEST_UDIR}. skipping."
+ else
+ rm -fr ${_GTEST_UDIR}
+ git clone $GTEST_REPO -b $GTEST_VERSION ${_GTEST_UDIR}
+
+ ([ -f ${GTEST_ROOT}/src/gtest-all.cc ] &&
+ [ -f ${GTEST_ROOT}/include/gtest/gtest.h ] &&
+ [ -f ${GMOCK_ROOT}/src/gmock-all.cc ] &&
+ [ -f ${GMOCK_ROOT}/include/gmock/gmock.h ]) || die "Google test framework not installed correctly"
+ fi
+}
+
function inst_cutecash() {
setup Cutecash
_BUILD_UDIR=`unix_path $CUTECASH_BUILD_DIR`
diff --git a/install.sh b/install.sh
index 354c2ac..77bfab3 100644
--- a/install.sh
+++ b/install.sh
@@ -99,8 +99,9 @@ add_step inst_libdbi
add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
-#boost now needed for C++ on master only
+#boost and gtest now needed for C++ on master only
add_step inst_boost
+add_step inst_gtest
##
if [ "$WITH_CUTECASH" = "yes" ]; then
commit caab4a16bb605556ac37fb9baa13a7cbade4f94c
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Feb 2 15:25:59 2017 +0100
Find boost library via the BOOST_ROOT environment variable
Note this currently only works for the autotools based build path.
The cmake configuration has this hard-coded at the time of this commit.
I will change that in a future update.
diff --git a/install-impl.sh b/install-impl.sh
index 67929e0..befa6aa 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1271,6 +1271,7 @@ function inst_boost() {
_BOOST_UDIR=`unix_path ${BOOST_DIR}`
set_env ${_BOOST_UDIR} BOOST_ROOT
+ export BOOST_ROOT
add_to_env ${_BOOST_UDIR}/lib PATH
if test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll
then
@@ -1393,14 +1394,6 @@ function inst_gnucash() {
qpopd
fi
- # Check for options that may not be available in all versions we can build
- _CONFIG_HELP=$($_REPOS_UDIR/configure --help)
- if [ -n "$(grep -- '--with-boost' <<< "$_CONFIG_HELP")" ]; then
- _EXTRA_OPTIONS="--with-boost=${BOOST_ROOT}"
- else
- _EXTRA_OPTIONS=""
- fi
-
qpushd $_BUILD_UDIR
$_REPOS_UDIR/configure ${HOST_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
@@ -1411,7 +1404,6 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- ${_EXTRA_OPTIONS} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
commit 53ee6621dfbc01d9f8ab2a01290433f23c3dcbe3
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Jan 27 17:08:43 2017 +0100
Drop unused dependency from gwenhywfar
diff --git a/install-impl.sh b/install-impl.sh
index 5ac5b76..67929e0 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -662,8 +662,8 @@ function inst_gwenhywfar() {
--disable-ssl \
--prefix=$_GWENHYWFAR_UDIR \
--with-guis=gtk2 \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
+ CPPFLAGS="${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
+ LDFLAGS="${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
make
# [ "$CROSS_COMPILE" != "yes" ] && make check
rm -rf ${_GWENHYWFAR_UDIR}
Summary of changes:
defaults.sh | 4 ++++
install-impl.sh | 44 +++++++++++++++++++++++++++++++++-----------
install.sh | 3 ++-
3 files changed, 39 insertions(+), 12 deletions(-)
More information about the gnucash-changes
mailing list