gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Fri Jul 15 18:05:59 EDT 2016


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/45bd108b (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/b72bc095 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/a5dea5eb (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/89fc72e2 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/a64dca9e (commit)



commit 45bd108b596414bebddeb2359080f31b69f9ce1e
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 15 22:05:41 2016 +0000

    Dependency build: Add more descriptive/instructive comments.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33c20d2..451e553 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,11 @@
+# Edit cmake/custom.cmake with overrides for the variables set in cmake/defaults.cmake.
 # Call cmake defining the variables you need to build the modules you want and set -G "MSYS Makefile".
+# Important variables are
+# GNC_BUILD_GLIB Specifies GLib, Harfbuzz, and their dependencies.
+# GNC_BUILD_DEPS Specifies all dependencies.
+# "Specified" dependencies will be built into ${GLOBAL_DEP_BUILD_DIR}.
+# GNC_INSTALL_DEPS Installs the dependencies into ${GLOBAL_DIR}.
+# GNC_MAKE_TARBALLS Makes the distribution tarballs for upload to SourceForge from the specified dependencies.
 cmake_minimum_required (VERSION 3.3.2)
 include (cmake/defaults.cmake)
 include (cmake/custom.cmake)

commit b72bc095bc5d70bb42851dedc49021b13c65a07e
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 15 22:04:50 2016 +0000

    Build GnuCash with Ninja in build_tag.sh.

diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index c1d6826..a5f0f8d 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -132,6 +132,9 @@ for tag_rev in $tags ; do
 
     # Inform the build scripts of the tag we're building.
     echo "GNUCASH_SCM_REV=$tag" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+    #Set up CMAKE and NINJA build:
+    echo "WITH_CMAKE=yes" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+    echo "WITH_NINJA=yes" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
 
     # Now build the tag!  (this will upload it too)
     # Use the build_package script from master (cwd), not from the tag

commit a5dea5ebe41671e7323dc5e7c308f89609732fc0
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 15 22:03:11 2016 +0000

    Fix zlib.pc paths.

diff --git a/cmake/glib.cmake b/cmake/glib.cmake
index 4a3e776..dc50b3e 100644
--- a/cmake/glib.cmake
+++ b/cmake/glib.cmake
@@ -1,5 +1,6 @@
 set_property (GLOBAL PROPERTY EP_BASE ${GLOBAL_DEP_BUILD_DIR})
 set (INSTALL_DIR ${GLOBAL_DEP_BUILD_DIR}/glib-install)
+set (CMAKE_INSTALL_PREFIX ${INSTALL_DIR})
 ExternalProject_Add(pkgconfig
   URL ${PKG_CONFIG_SRC_URL}
   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --with-internal-glib
@@ -12,7 +13,7 @@ ExternalProject_Add(zlib
   CONFIGURE_COMMAND sed -i s/SHARED_MODE=0/SHARED_MODE=1/ <SOURCE_DIR>/win32/Makefile.gcc
   BUILD_COMMAND make -f <SOURCE_DIR>/win32/Makefile.gcc
   BUILD_IN_SOURCE 1
-  INSTALL_COMMAND INCLUDE_PATH=${INSTALL_DIR}/include LIBRARY_PATH=${INSTALL_DIR}/lib BINARY_PATH=${INSTALL_DIR}/bin make -f <SOURCE_DIR>/win32/Makefile.gcc install
+  INSTALL_COMMAND prefix=${INSTALL_DIR} INCLUDE_PATH=${INSTALL_DIR}/include LIBRARY_PATH=${INSTALL_DIR}/lib BINARY_PATH=${INSTALL_DIR}/bin make -f <SOURCE_DIR>/win32/Makefile.gcc install
   INSTALL_DIR ${INSTALL_DIR}
   )
 ExternalProject_Add(intltool
@@ -24,7 +25,7 @@ ExternalProject_Add(intltool
   )
 ExternalProject_Add(freetype
   URL ${FREETYPE_URL}
-  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --without-bzip2
+  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --without-bzip2 --without-png
   BUILD_COMMAND make
   INSTALL_COMMAND make install
   INSTALL_DIR ${INSTALL_DIR}
@@ -70,17 +71,10 @@ ExternalProject_Add(harfbuzz
   )
 # harfbuzz has a dependency on glib for three unicode functions, so we
 # need to build it again after building glib.
-#ExternalProject_Add(harfbuzz2
-#  URL ${HARFBUZZ_URL}
-#  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR}
-#  BUILD_COMMAND make
-#  INSTALL_DIR ${INSTALL_DIR}
-#  DEPENDS glib
-#  )
 ExternalProject_Add_Step(harfbuzz fix-pkgconfig-prefix
   COMMAND sh -c "chmod -R o+w ${INSTALL_DIR}"
   COMMAND sh -c "sed -i 's at prefix *= *${INSTALL_DIR}@prefix = c:/gcdev@' ${INSTALL_DIR}/lib/pkgconfig/*.pc"
-  COMMAND sh -c "sed -i s@${INSTALL_DIR}@\${prefix}@ ${INSTALL_DIR}/lib/pkgconfig/*.pc"
+  COMMAND sh -c "sed -i s@${INSTALL_DIR}@\\$\\{prefix\\}@ ${INSTALL_DIR}/lib/pkgconfig/*.pc"
   DEPENDEES install
   )
 if (GNC_MAKE_TARBALLS)

commit 89fc72e231eca02afbd90ec5cb393c4d0b10d341
Author: Rob Gowin <robgowin at gmail.com>
Date:   Thu Jul 14 21:11:24 2016 -0500

    Pass HH_DIR to CMake via command line

diff --git a/install-impl.sh b/install-impl.sh
index 9a00e3d..59f25f9 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1334,6 +1334,7 @@ function inst_gnucash_using_cmake() {
     _REPOS_UDIR=`unix_path  $REPOS_DIR`
     _NINJA_UDIR=`unix_path  $NINJA_DIR`
     _MSYS_UDIR=`unix_path   $MSYS_DIR`
+    _HH_UDIR=`unix_path     $HH_DIR`
     _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
     
     mkdir -p $_BUILD_UDIR
@@ -1363,6 +1364,7 @@ function inst_gnucash_using_cmake() {
                -D PERL_EXECUTABLE=${_MSYS_UDIR}/bin/perl \
                -D CMAKE_MAKE_PROGRAM=${_CMAKE_MAKE_PROGRAM} \
                -D GNC_DBD_DIR=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
+	       -D HTMLHELP_DIR=${_HH_UDIR} \
                ${_REPOS_UDIR}
           ${_CMAKE_MAKE_PROGRAM} install
      qpopd



Summary of changes:
 CMakeLists.txt            |  7 +++++++
 buildserver/build_tags.sh |  3 +++
 cmake/glib.cmake          | 14 ++++----------
 install-impl.sh           |  2 ++
 4 files changed, 16 insertions(+), 10 deletions(-)



More information about the gnucash-changes mailing list