gnucash-docs maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sat Jul 25 16:57:04 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/0e6e25c4 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/35a8ac6a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/182c7060 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/47eb68e8 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/8eee199b (commit)



commit 0e6e25c4f8a2efbc3e261dd6efe4da9bbf819392
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 25 13:56:28 2020 -0700

    Release Documentation for GnuCash 4.1.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a763def..71c2599 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.5)
 # We don't actually use C, but GNUInstallDirs doesn't work if we don't
 # specify a language.
 project (gnucash-docs
-    VERSION 4.0
+    VERSION 4.1
     LANGUAGES C)
 
 set (PACKAGE_NAME GnuCash Docs)
diff --git a/ChangeLog b/ChangeLog
index 772543e..9eee3b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2020-07-25 John Ralls 
+
+	* Fix typo. (HEAD -> maint)
+
+2020-07-25 John Ralls 
+
+	* CMake GNUInstallDirs aborts if project language is NONE.
+
+2020-07-25 John Ralls 
+
+	* Dist isn't supposed to be possible from a dist tarball so don't try.
+
+2020-07-05 Geert Janssens 
+
+	* Drop obsolete log formatter for svn logs (origin/maint)
+
+2020-06-28 John Ralls 
+
+	* Fix Cmake dist tarball creation with autotools-build option.
+
+2020-06-28 John Ralls 
+
+	* Fix version in configure.ac.
+
+2020-06-27 John Ralls 
+
+	* Fix building Italian translations with Cmake.
+
+2020-06-27 John Ralls 
+
+	* Fix building mobi with Cmake.
+
 2020-04-11 John Ralls 
 
 	* Release Documentation for GnuCash 3.10. (HEAD -> maint, tag: 3.10)
diff --git a/NEWS b/NEWS
index 75890df..b838221 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 Version History
 ---------------
+ 4.1    - 26 July 2020
+        o Various build system fixes.
+        o Removed old Subversion log formatter.
+
  4.0    - 28 June 2020
         o Screenshot: Change a Transaction Association Dialog
         o Transaction assoc illustration: Symbols
diff --git a/configure.ac b/configure.ac
index 1a351fb..9d9aeaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # copyright (c) 2003-2016 GnuCash Development Team
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gnucash-docs], [4.0], [https://bugs.gnucash.org/describecomponents.cgi?product=Documentation], , [http://www.gnucash.org/])
+AC_INIT([gnucash-docs], [4.1], [https://bugs.gnucash.org/describecomponents.cgi?product=Documentation], , [http://www.gnucash.org/])
 AC_CANONICAL_HOST
 
 dnl ==========================================================================
diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 024c065..a16c28c 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -32,10 +32,10 @@ own entity definitions to use across all of our DocBook pages. -->
   
   1. a) Publication - should only be changed by the release manager!
 -->
-<!ENTITY manrevision "4.0">
-<!ENTITY date "28 June 2020">
+<!ENTITY manrevision "4.1">
+<!ENTITY date "26 July 2020">
 <!ENTITY vers-unstable "">
-<!ENTITY vers-stable "4.0">
+<!ENTITY vers-stable "4.1">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "4">
 

commit 35a8ac6aaa5af5ac82e7ab97ebfd94bf87d4f519
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 25 13:49:06 2020 -0700

    Fix typo.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c7143e..a763def 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ if(WITH_MOBI)
     # Mobi is based on epub so enable epub if mobi is requested
     set(WITH_EPUB ON)
 else()
-    message(STATUS "Mobi file format support is disabled.  Specify -DWITH_MOBY=ON if you want to enable it.")
+    message(STATUS "Mobi file format support is disabled.  Specify -DWITH_MOBI=ON if you want to enable it.")
 endif()
 
 # To find our figures in the source directory each run of fop

commit 182c7060f5f4bd77ff004b8499f92860ca3dd6c9
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 25 13:46:18 2020 -0700

    CMake GNUInstallDirs aborts if project language is NONE.
    
    https://gitlab.kitware.com/cmake/cmake/commit/c18ed7236db5720bab383e6de78415177922bff3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 846e52a..6c7143e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,9 +4,11 @@ cmake_minimum_required (VERSION 3.5)
 
 # This sets a number of environment variables we can use later on
 # The names of these variables start with PROJECT_ and gnucash-docs_VERSION
+# We don't actually use C, but GNUInstallDirs doesn't work if we don't
+# specify a language.
 project (gnucash-docs
     VERSION 4.0
-    LANGUAGES NONE)
+    LANGUAGES C)
 
 set (PACKAGE_NAME GnuCash Docs)
 set (PACKAGE_BUGREPORT "https://bugs.gnucash.org/describecomponents.cgi?product=Documentation")

commit 47eb68e83e374031d2738f1a1f5a759540baec45
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 25 13:44:45 2020 -0700

    Dist isn't supposed to be possible from a dist tarball so don't try.
    
    Because it fails.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd78a5e..846e52a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -194,13 +194,15 @@ if(AUTOTOOLS_IN_DIST)
         pdf.make
         xmldocs.make)
 
-      find_file(AUTOGEN autogen.sh
-        HINTS "${CMAKE_SOURCE_DIR}"
-        NO_DEFAULT_PATH)
-      if(NOT AUTOGEN)
-        message(FATAL_ERROR "No autogen.sh in sources. Either you're trying to make a distribution tarball from something other than a repository clone or your clone is defective. You can continue if you insist by passing -DAUTOTOOLS_IN_DIST=NO to cmake.")
-    endif()
-
+      if (AUTOTOOLS_IN_DIST AND NOT AUTOTOOLS_IN_DIST STREQUAL "RUN")
+        find_file(AUTOGEN autogen.sh
+          HINTS "${CMAKE_SOURCE_DIR}"
+          NO_DEFAULT_PATH)
+        if(NOT AUTOGEN)
+          message(FATAL_ERROR "No autogen.sh in sources. Either you're trying to make a distribution tarball from something other than a repository clone or your clone is defective. You can continue if you insist by passing -DAUTOTOOLS_IN_DIST=NO to cmake.")
+        endif()
+        set(AUTOTOOLS_IN_DIST "RUN")
+      endif()
     add_to_dist(${autotoolsfiles})
 endif()
 
diff --git a/cmake/MakeDistCheck.cmake b/cmake/MakeDistCheck.cmake
index 39bc565..488cf80 100644
--- a/cmake/MakeDistCheck.cmake
+++ b/cmake/MakeDistCheck.cmake
@@ -69,13 +69,6 @@ function(run_dist_check PACKAGE_PREFIX EXT)
             ERROR_MSG "Ninja check failed."
     )
 
-    # Run ninja dist
-    execute_process_and_check_result(
-            COMMAND ${CMAKE_COMMAND} -E env ${NINJA_COMMAND} dist
-            WORKING_DIRECTORY ${BUILD_DIR}
-            ERROR_MSG "Ninja dist failed."
-    )
-
     message("distcheck complete.")
 
 endfunction()



Summary of changes:
 CMakeLists.txt            | 24 ++++++++++++++----------
 ChangeLog                 | 32 ++++++++++++++++++++++++++++++++
 NEWS                      |  4 ++++
 cmake/MakeDistCheck.cmake |  7 -------
 configure.ac              |  2 +-
 docbook/gnc-docbookx.dtd  |  6 +++---
 6 files changed, 54 insertions(+), 21 deletions(-)



More information about the gnucash-changes mailing list