gnucash-on-windows master: Don't try to distribute Boost libs on 2.6.
John Ralls
jralls at code.gnucash.org
Sun Sep 27 16:27:44 EDT 2015
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/ba67ee5d (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/b710b30b (commit)
commit ba67ee5df03d7de3abfce02632267a9e259886f3
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 27 13:27:32 2015 -0700
Don't try to distribute Boost libs on 2.6.
diff --git a/dist-impl.sh b/dist-impl.sh
index 9f3fd3f..f37d324 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -86,9 +86,16 @@ function dist_aqbanking() {
}
function dist_boost() {
- setup Boost
- cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/bin
- cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/bin
+ setup Boost
+ get_major_minor "$GNUCASH_SCM_REV"
+ if [ "$GNUCASH_SCM_REV" != "master" ] &&
+ (( $major_minor <= 206 )); then
+ echo "Skipping. Boost is only needed for the master branch or future 2.7.x and up versions of gnucash."
+ return
+ fi
+
+ cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/bin
+ cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/bin
}
function dist_gnome() {
Summary of changes:
dist-impl.sh | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
More information about the gnucash-changes
mailing list