gnucash unstable: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Thu Feb 15 19:08:46 EST 2018
Updated via https://github.com/Gnucash/gnucash/commit/941cc7dc (commit)
via https://github.com/Gnucash/gnucash/commit/a92180f0 (commit)
via https://github.com/Gnucash/gnucash/commit/d97b0f26 (commit)
via https://github.com/Gnucash/gnucash/commit/82ad7aca (commit)
from https://github.com/Gnucash/gnucash/commit/04408650 (commit)
commit 941cc7dcf5069a9576e4e4933d6b26a3d238e566
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Feb 15 16:06:03 2018 -0800
Rationalize the copying and installation of GtkBuilder and GtkUIManager files.
Trying to catch all of the possible CMake build files as exceptions is
too hard. Name the source files and copy/install them.
diff --git a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
index 01d7592..b4079ff 100644
--- a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
+++ b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
@@ -1,17 +1,3 @@
-FILE(COPY .
- DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
-
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION share/gnucash
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
-
SET(gnome_utils_GLADE
assistant-xml-encoding.glade
dialog-account.glade
@@ -33,4 +19,8 @@ SET(gnome_utils_GLADE
gnc-tree-view-owner.glade
)
+FILE(COPY ${gnome_utils_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
+
+INSTALL(FILES ${gnome_utils_GLADE} DESTINATION share/gnucash)
+
SET_DIST_LIST(gnome_utils_gtkbuilder_DIST CMakeLists.txt ${gnome_utils_GLADE})
diff --git a/gnucash/gnome-utils/ui/CMakeLists.txt b/gnucash/gnome-utils/ui/CMakeLists.txt
index 79e28cd..4320474 100644
--- a/gnucash/gnome-utils/ui/CMakeLists.txt
+++ b/gnucash/gnome-utils/ui/CMakeLists.txt
@@ -1,24 +1,17 @@
-FILE(COPY .
- DESTINATION ${DATADIR_BUILD}/gnucash/ui
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+set(gnome_utils_UI
+ gnc-main-window-ui.xml
+ gnc-windows-menu-ui-quartz.xml
+ gnc-windows-menu-ui.xml
+ osx_accel_map
+ )
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION share/gnucash
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+FILE(COPY ${gnome_utils_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
+
+INSTALL(FILES ${gnome_utils_UI} DESTINATION share/gnucash/ui)
SET(gnome_utils_ui_DIST_local
- CMakeLists.txt
- gnc-main-window-ui.xml
- gnc-windows-menu-ui-quartz.xml
- gnc-windows-menu-ui.xml
-
- osx_accel_map
- )
+ CMakeLists.txt
+ ${gnome_utils_UI}
+ )
SET_DIST_LIST(gnome_utils_ui_DIST ${gnome_utils_ui_DIST_local})
diff --git a/gnucash/gnome/gtkbuilder/CMakeLists.txt b/gnucash/gnome/gtkbuilder/CMakeLists.txt
index 61f24e1..a58db75 100644
--- a/gnucash/gnome/gtkbuilder/CMakeLists.txt
+++ b/gnucash/gnome/gtkbuilder/CMakeLists.txt
@@ -1,17 +1,3 @@
-FILE(COPY .
- DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
-
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION share/gnucash
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
-
SET(gnome_GLADE
assistant-acct-period.glade
assistant-hierarchy.glade
@@ -48,4 +34,8 @@ SET(gnome_GLADE
window-reconcile.glade
)
+FILE(COPY ${gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
+
+INSTALL(FILES ${gnome_GLADE} DESTINATION share/gnucash/gtkbuilder)
+
SET_DIST_LIST(gnome_gtkbuilder_DIST CMakeLists.txt ${gnome_GLADE})
diff --git a/gnucash/gnome/ui/CMakeLists.txt b/gnucash/gnome/ui/CMakeLists.txt
index 707ec33..8782f4f 100644
--- a/gnucash/gnome/ui/CMakeLists.txt
+++ b/gnucash/gnome/ui/CMakeLists.txt
@@ -1,17 +1,3 @@
-FILE(COPY .
- DESTINATION ${DATADIR_BUILD}/gnucash/ui
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
-
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION share/gnucash
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
-
SET(gnome_UI
gnc-plugin-account-tree-ui.xml
gnc-plugin-basic-commands-ui.xml
@@ -36,6 +22,8 @@ SET(gnome_UI
gnc-sxed-window-ui-full.xml
gnc-sxed-window-ui.xml)
-SET_DIST_LIST(gnome_ui_DIST CMakeLists.txt ${gnome_UI})
+FILE(COPY ${gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
+INSTALL(FILES ${gnome_UI} DESTINATION share/gnucash)
+SET_DIST_LIST(gnome_ui_DIST CMakeLists.txt ${gnome_UI})
diff --git a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
index ed66128..ad42404 100644
--- a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
@@ -1,17 +1,7 @@
+set(bi_import_GLADE dialog-bi-import-gui.glade)
-FILE(COPY .
- DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+FILE(COPY ${bi_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
+INSTALL(FILES ${bi_import_GLADE} DESTINATION share/gnucash)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION share/gnucash
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
-
-SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt dialog-bi-import-gui.glade)
+SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt ${bi_import_GLADE})
diff --git a/gnucash/import-export/bi-import/ui/CMakeLists.txt b/gnucash/import-export/bi-import/ui/CMakeLists.txt
index aec74fe..5053ddc 100644
--- a/gnucash/import-export/bi-import/ui/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/ui/CMakeLists.txt
@@ -1,15 +1,7 @@
-FILE(COPY .
- DESTINATION ${DATADIR_BUILD}/gnucash/ui
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+set(bi_import_UI gnc-plugin-bi-import-ui.xml)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION share/gnucash
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+FILE(COPY ${bi_import_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
+
+INSTALL(FILES ${bi_import_UI} DESTINATION share/gnucash)
SET_DIST_LIST(bi_import_ui_DIST CMakeLists.txt gnc-plugin-bi-import-ui.xml)
diff --git a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
index a335722..41829e1 100644
--- a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
@@ -1,15 +1,6 @@
-FILE(COPY .
- DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+set(customer_import_GLADE dialog-customer-import-gui.glade)
+FILE(COPY ${customer_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION share/gnucash
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+INSTALL(FILES ${customer_import_GLADE} DESTINATION share/gnucash)
-SET_DIST_LIST(customer_import_glade_DIST CMakeLists.txt dialog-customer-import-gui.glade)
+SET_DIST_LIST(customer_import_glade_DIST CMakeLists.txt ${customer_import_GLADE})
diff --git a/gnucash/import-export/customer-import/ui/CMakeLists.txt b/gnucash/import-export/customer-import/ui/CMakeLists.txt
index 2e60fa0..9537e21 100644
--- a/gnucash/import-export/customer-import/ui/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/ui/CMakeLists.txt
@@ -1,15 +1,6 @@
-FILE(COPY .
- DESTINATION ${DATADIR_BUILD}/gnucash/ui
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+set(customer_import_UI gnc-plugin-customer-import-ui.xml)
+FILE(COPY ${customer_import_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION share/gnucash
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+INSTALL(FILES ${customer_import_UI} DESTINATION share/gnucash)
-SET_DIST_LIST(customer_import_ui_DIST CMakeLists.txt gnc-plugin-customer-import-ui.xml)
+SET_DIST_LIST(customer_import_ui_DIST CMakeLists.txt ${customer_import_UI})
diff --git a/gnucash/python/CMakeLists.txt b/gnucash/python/CMakeLists.txt
index c0e38da..4285508 100644
--- a/gnucash/python/CMakeLists.txt
+++ b/gnucash/python/CMakeLists.txt
@@ -1,7 +1,15 @@
-ADD_SUBDIRECTORY(pycons)
-
SET(gncmod_python_SOURCES gncmod-python.c)
+SET(pycons_DATA
+ pycons/__init__.py
+ pycons/console.py
+ pycons/ishell.py
+ pycons/pycons
+ pycons/setup.py
+ pycons/shell.py
+ pycons/simple_plot.py
+)
+
IF (WITH_PYTHON)
ADD_LIBRARY(gncmod-python ${gncmod_python_SOURCES})
@@ -19,21 +27,14 @@ ENDIF()
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
- INSTALL(DIRECTORY pycons DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/python
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+ INSTALL(FILES ${pycons_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/python/pycons)
INSTALL(FILES init.py DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/python)
- FILE(COPY pycons DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python
- PATTERN Makefile.* EXCLUDE
- PATTERN CMake* EXCLUDE
- PATTERN CTest* EXCLUDE
- PATTERN cmake* EXCLUDE)
+ FILE(COPY ${pycons_DATA} DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python/pycons)
FILE(COPY init.py DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python)
ENDIF(WITH_PYTHON)
+SET_LOCAL_DIST(pycons_DIST ${pycons_DATA})
SET_LOCAL_DIST(python_DIST_local CMakeLists.txt gncmod-python.c init.py)
SET(python_DIST ${python_DIST_local} ${pycons_DIST} PARENT_SCOPE)
diff --git a/gnucash/python/pycons/CMakeLists.txt b/gnucash/python/pycons/CMakeLists.txt
deleted file mode 100644
index 874bef8..0000000
--- a/gnucash/python/pycons/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-SET(pycons_DATA
- __init__.py
- console.py
- ishell.py
- pycons
- setup.py
- shell.py
- simple_plot.py
-)
-
-SET_DIST_LIST(pycons_DIST CMakeLists.txt ${pycons_DATA})
\ No newline at end of file
commit a92180f03b2fcdf2e350ffe88f4b3b6f6fcacc71
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Feb 15 16:05:51 2018 -0800
Remove superfluous variable.
diff --git a/data/accounts/CMakeLists.txt b/data/accounts/CMakeLists.txt
index 40bf74a..94d0d46 100644
--- a/data/accounts/CMakeLists.txt
+++ b/data/accounts/CMakeLists.txt
@@ -1,42 +1,3 @@
-SET(accounts_SUBDIRS
- C
- ca
- cs
- da
- de_AT
- de_CH
- de_DE
- el_GR
- en_GB
- en_IN
- es_ES
- es_MX
- fi_FI
- fr_CA
- fr_CH
- fr_FR
- hu_HU
- it
-# ja
- ko
- lt
- lv
-# nb
-# nl
- pl
- pt_BR
- pt_PT
- ru
- sk
- sv_AX
- sv_FI
- sv_SE
- tr_TR
- zh_CN
- zh_HK
- zh_TW
-)
-
SET(ACCOUNTS_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/gnucash/accounts)
SET(ACCOUNTS_BUILD_DIR ${DATADIR_BUILD}/gnucash/accounts)
commit d97b0f261754781942145092150a29bf7b148c9c
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Feb 15 16:04:59 2018 -0800
No more Makefile.am.
diff --git a/data/accounts/en_IN/CMakeLists.txt b/data/accounts/en_IN/CMakeLists.txt
index 15fdcc2..2df9399 100644
--- a/data/accounts/en_IN/CMakeLists.txt
+++ b/data/accounts/en_IN/CMakeLists.txt
@@ -22,7 +22,7 @@ SET(account_DATA
SET_DIST_LIST(EN_IN_DIST ${account_DATA}
# acctchrt_full.gnucash-xea
- Makefile.am CMakeLists.txt)
+ CMakeLists.txt)
INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/en_IN)
FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/en_IN)
commit 82ad7aca51e872dc43e4279c4f4180a831a6aaa1
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Feb 15 13:46:15 2018 -0800
Prevent a couple of divide-by-zero errors.
Might fix Bug 792800.
diff --git a/gnucash/report/report-system/commodity-utilities.scm b/gnucash/report/report-system/commodity-utilities.scm
index a12d57d..1328f1b 100644
--- a/gnucash/report/report-system/commodity-utilities.scm
+++ b/gnucash/report/report-system/commodity-utilities.scm
@@ -559,8 +559,8 @@
;; no pair already, create one
(if (not pair)
(set! pair (list (car foreignlist)
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
+ (cons (gnc:make-number-collector)
+ (gnc:make-number-collector)))))
pair))
;; sumlist: a multilevel alist. Each element has a commodity as key, and another
@@ -639,11 +639,13 @@
(map
(lambda (e)
(list (car e)
- (gnc-numeric-abs
+ (if (zero? ((caadr e) 'total #f)) #f
+ (gnc-numeric-abs
(gnc-numeric-div ((cdadr e) 'total #f)
((caadr e) 'total #f)
GNC-DENOM-AUTO
- (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))
+ (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))
+ )))
(gnc:get-exchange-totals report-commodity end-date cost)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/gnucash/report/standard-reports/advanced-portfolio.scm b/gnucash/report/standard-reports/advanced-portfolio.scm
index a31af27..26cd9af 100644
--- a/gnucash/report/standard-reports/advanced-portfolio.scm
+++ b/gnucash/report/standard-reports/advanced-portfolio.scm
@@ -316,8 +316,10 @@
((and (gnc-numeric-zero-p b-value)
(not (gnc-numeric-zero-p b-units)))
(let* ((current-units (units-basis b-list))
- (units-ratio (gnc-numeric-div (gnc-numeric-add b-units current-units GNC-DENOM-AUTO GNC-DENOM-REDUCE)
- current-units GNC-DENOM-AUTO GNC-DENOM-REDUCE))
+ ;; If current-units is zero then so should be everything else.
+ (units-ratio (if (zero? current-units) (gnc-numeric-zero)
+ (gnc-numeric-div (gnc-numeric-add b-units current-units GNC-DENOM-AUTO GNC-DENOM-REDUCE)
+ current-units GNC-DENOM-AUTO GNC-DENOM-REDUCE)))
;; If the units ratio is zero the stock is worthless and the value should be zero too
(value-ratio (if (gnc-numeric-zero-p units-ratio)
(gnc-numeric-zero)
Summary of changes:
data/accounts/CMakeLists.txt | 39 ----------------------
data/accounts/en_IN/CMakeLists.txt | 2 +-
gnucash/gnome-utils/gtkbuilder/CMakeLists.txt | 18 +++-------
gnucash/gnome-utils/ui/CMakeLists.txt | 31 +++++++----------
gnucash/gnome/gtkbuilder/CMakeLists.txt | 18 +++-------
gnucash/gnome/ui/CMakeLists.txt | 18 ++--------
.../bi-import/gtkbuilder/CMakeLists.txt | 18 +++-------
gnucash/import-export/bi-import/ui/CMakeLists.txt | 16 +++------
.../customer-import/gtkbuilder/CMakeLists.txt | 17 +++-------
.../customer-import/ui/CMakeLists.txt | 17 +++-------
gnucash/python/CMakeLists.txt | 25 +++++++-------
gnucash/python/pycons/CMakeLists.txt | 13 --------
.../report/report-system/commodity-utilities.scm | 10 +++---
.../report/standard-reports/advanced-portfolio.scm | 6 ++--
14 files changed, 63 insertions(+), 185 deletions(-)
delete mode 100644 gnucash/python/pycons/CMakeLists.txt
More information about the gnucash-changes
mailing list