gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Fri Apr 14 20:06:37 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/cff2538d (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/3460ba4f (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/1fc3db3a (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/92b1cb2a (commit)



commit cff2538da1634fedb98cf8e284f781bfb16eae76
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Apr 14 16:43:04 2017 -0700

    Temporary kluge to get nightlies building until WebKit is rebuilt.

diff --git a/defaults.sh b/defaults.sh
index eaa454f..3d8662c 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -312,6 +312,7 @@ set_default BUILD_WEBKIT_FROM_SOURCE no
 set_default WEBKIT_VERSION "1.8.3"
 set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-minGW.tgz"
 set_default WEBKIT_DEV_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-dev-minGW.tgz"
+set_default PTHREADGC2_URL "$GC_DEPS_URL/pthreadGC2.dll"
 set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
 #NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
 set_default WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz"
diff --git a/dist-impl.sh b/dist-impl.sh
index 0a8f5cf..1aa62d6 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -236,6 +236,7 @@ function dist_webkit() {
     cp -a ${_LIBXSLT_UDIR}/bin/* ${_DIST_UDIR}/bin
     cp -a ${_ENCHANT_UDIR}/bin/* ${_DIST_UDIR}/bin
     cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
+    cp -a ${_MINGW_UDIR}/bin/pthreadGC2.dll ${_DIST_UDIR}/bin
 }
 
 function dist_icu4c() {
diff --git a/install-impl.sh b/install-impl.sh
index 3134218..7320bb3 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1167,8 +1167,10 @@ function inst_webkit() {
             qpopd
         else
             mkdir -p $_WEBKIT_UDIR
+            _MINGW_UDIR=`unix_path $MINGW_DIR`
             wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
             wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
+            smart_wget $PTHREADGC2_URL $_MINGW_UDIR/bin
             fix_libtool_files ${_WEBKIT_UDIR}
         fi
         quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"

commit 3460ba4fb2e5a013f719d68eef3c89b1d2fdf860
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Apr 14 13:12:28 2017 -0700

    Distribute all of the libboost dlls.
    
    imp-csv requires libboost-local and that drags in a bunch of others. It's
    easier to just distribute all of them than to cherry-pick.

diff --git a/dist-impl.sh b/dist-impl.sh
index dec6bb5..0a8f5cf 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -95,9 +95,7 @@ function dist_boost() {
         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
-    cp -a ${_BOOST_UDIR}/lib/libboost_regex.dll ${_DIST_UDIR}/bin
+    cp -a ${_BOOST_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
 }
 
 function dist_gnome() {

commit 1fc3db3ae7b60dabbe55ccb6011df07a03e8c12b
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Apr 14 13:11:01 2017 -0700

    Fix ICU dist.

diff --git a/dist-impl.sh b/dist-impl.sh
index c33a8fd..dec6bb5 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -248,7 +248,7 @@ function dist_icu4c() {
         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
+    cp -a ${_ICU4C_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
 }
 
 function dist_gnucash() {



Summary of changes:
 defaults.sh     | 1 +
 dist-impl.sh    | 7 +++----
 install-impl.sh | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list