gnucash-on-windows master: Add ICU to the distribution.

John Ralls jralls at code.gnucash.org
Fri Apr 14 14:54:54 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/92b1cb2a (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/b40e5f32 (commit)



commit 92b1cb2ac6f08066aed07ebe03fd6812d75a5adf
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Apr 14 11:51:35 2017 -0700

    Add ICU to the distribution.

diff --git a/dist-impl.sh b/dist-impl.sh
index 9d95fd8..c33a8fd 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -41,6 +41,7 @@ function dist_prepare() {
     _INSTALL_UDIR=`unix_path $INSTALL_DIR`
     _INNO_UDIR=`unix_path $INNO_DIR`
     _WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
+    _ICU4C_UDIR=`unix_path $ICU4C_DIR`
     _ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
     _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
     add_to_env $_UNZIP_UDIR/bin PATH # unzip
@@ -239,6 +240,17 @@ function dist_webkit() {
     cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
 }
 
+function dist_icu4c() {
+    setup icu4c
+    get_major_minor "$GNUCASH_SCM_REV"
+    if [ "$GNUCASH_SCM_REV" != "master" ] &&
+           (( $major_minor <= 206 )); then
+        echo "Skipping. ICU is only needed for the master branch or future 2.7.x and up versions of gnucash."
+        return
+    fi
+    cp -a ${_ICU4C_UDIR}/bin/* ${_DIST_UDIR}/bin
+}
+
 function dist_gnucash() {
     setup GnuCash
     mkdir -p $_DIST_UDIR/bin
diff --git a/dist.sh b/dist.sh
index d440f00..b4886f6 100755
--- a/dist.sh
+++ b/dist.sh
@@ -38,6 +38,7 @@ add_step dist_ktoblzcheck
 add_step dist_aqbanking
 add_step dist_libdbi
 add_step dist_webkit
+add_step dist_icu4c
 add_step dist_boost
 add_step dist_gnucash
 add_step dist_finish



Summary of changes:
 dist-impl.sh | 12 ++++++++++++
 dist.sh      |  1 +
 2 files changed, 13 insertions(+)



More information about the gnucash-changes mailing list