gnucash master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Sat Sep 2 05:53:51 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash/commit/098c1950 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0e0e4d29 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/14b72ea1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/197faeab (commit)
	 via  https://github.com/Gnucash/gnucash/commit/19f4ce2f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/19fe7d8a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/11a1ff61 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6eee9cef (commit)
	from  https://github.com/Gnucash/gnucash/commit/1b3a0e56 (commit)



commit 098c1950f3b9db997bd51d835f3f14f8b2ea442d
Merge: 1b3a0e5 0e0e4d2
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Sep 2 11:25:54 2017 +0200

    Merge branch 'maint'
    
    Resolved conflicts:
            .travis.yml
            gnucash/report/standard-reports/transaction.scm

diff --cc .travis.yml
index c65accb,cd1626a..15fe146
--- a/.travis.yml
+++ b/.travis.yml
@@@ -8,14 -3,40 +8,45 @@@ language: c+
  compiler:
    - gcc
  #  - clang
+ env:
+   - BUILDTYPE=cmake-make
+   - BUILDTYPE=cmake-ninja
+   - BUILDTYPE=autotools
  before_install:
 +#  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
    - sudo apt-get update -qq
 +install:
 +#  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.9; export CXX="g++-4.9" CC="gcc-4.9"; fi
    - sudo apt-get build-dep -qq gnucash
-   - sudo apt-get install -qq swig
+   - sudo apt-get install -qq swig xsltproc libdbd-sqlite3 cmake3 texinfo ninja-build
 +  - sudo apt-get install -qq libboost-all-dev libgtk-3-dev libwebkit2gtk-3.0-dev
    - sudo apt-get --reinstall install -qq language-pack-en language-pack-fr
 +  - git clone https://github.com/google/googletest -b release-1.8.0 ~/gtest
- script: ./autogen.sh && ./configure --enable-python GTEST_ROOT=~/gtest/googletest GMOCK_ROOT=~/gtest/googlemock && make && TZ="America/Los_Angeles" make check
+ script: |
+   # The -e here says that if any line below fails, the whole script fails
+   set -ev
+ 
+   # First, do the cmake build using the default Makefile generator
+   if [[ "$BUILDTYPE" == "cmake-make" ]]; then
+     mkdir /tmp/gnucash-build-cmake-make
+     cd /tmp/gnucash-build-cmake-make
 -    cmake $TRAVIS_BUILD_DIR
++    GTEST_ROOT=~/gtest/googletest GMOCK_ROOT=~/gtest/googlemock cmake $TRAVIS_BUILD_DIR
+     make -j 4
 -    make check
++    TZ="America/Los_Angeles" make check
+ 
+   # Next, do cmake again, using the Ninja generator this time
+   elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
+     mkdir /tmp/gnucash-build-cmake-ninja
+     cd /tmp/gnucash-build-cmake-ninja
 -    cmake -G Ninja $TRAVIS_BUILD_DIR
++    GTEST_ROOT=~/gtest/googletest GMOCK_ROOT=~/gtest/googlemock cmake -G Ninja $TRAVIS_BUILD_DIR
+     ninja
 -    ninja check
++    TZ="America/Los_Angeles" ninja check
+ 
+   # Finally, do the autotools build
+   elif [[ "$BUILDTYPE" == "autotools" ]]; then
+     cd $TRAVIS_BUILD_DIR
+     ./autogen.sh
 -    ./configure
++    ./configure --enable-python GTEST_ROOT=~/gtest/googletest GMOCK_ROOT=~/gtest/googlemock
+     make
 -    make check
++    TZ="America/Los_Angeles" make check
+   fi

commit 0e0e4d294e493911004f2e5c53eeedc798fa92a4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Sep 2 11:05:30 2017 +0200

    Set up a build matrix on Travis CI
    
    This will run the different builds in parallel (depending on
    resource availability on Travis).
    
    The advantages are
    - faster test results
    - easier to spot which build type has failed
    - shorter test log per build type to parse

diff --git a/.travis.yml b/.travis.yml
index 9b903b0..cd1626a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,10 @@ language: c
 compiler:
   - gcc
 #  - clang
+env:
+  - BUILDTYPE=cmake-make
+  - BUILDTYPE=cmake-ninja
+  - BUILDTYPE=autotools
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get build-dep -qq gnucash
@@ -13,22 +17,26 @@ script: |
   set -ev
 
   # First, do the cmake build using the default Makefile generator
-  mkdir /tmp/gnucash-build-cmake-make
-  cd /tmp/gnucash-build-cmake-make
-  cmake $TRAVIS_BUILD_DIR
-  make -j 4
-  make check
+  if [[ "$BUILDTYPE" == "cmake-make" ]]; then
+    mkdir /tmp/gnucash-build-cmake-make
+    cd /tmp/gnucash-build-cmake-make
+    cmake $TRAVIS_BUILD_DIR
+    make -j 4
+    make check
 
   # Next, do cmake again, using the Ninja generator this time
-  mkdir /tmp/gnucash-build-cmake-ninja
-  cd /tmp/gnucash-build-cmake-ninja
-  cmake -G Ninja $TRAVIS_BUILD_DIR
-  ninja
-  ninja check
+  elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
+    mkdir /tmp/gnucash-build-cmake-ninja
+    cd /tmp/gnucash-build-cmake-ninja
+    cmake -G Ninja $TRAVIS_BUILD_DIR
+    ninja
+    ninja check
 
   # Finally, do the autotools build
-  cd $TRAVIS_BUILD_DIR
-  ./autogen.sh
-  ./configure
-  make
-  make check
+  elif [[ "$BUILDTYPE" == "autotools" ]]; then
+    cd $TRAVIS_BUILD_DIR
+    ./autogen.sh
+    ./configure
+    make
+    make check
+  fi

commit 14b72ea11d948999968616f5b8c14a46ab70753d
Author: Rob Gowin <robgowin at gmail.com>
Date:   Fri Sep 1 17:48:25 2017 -0500

    Enable CMake build in Travis CI

diff --git a/.travis.yml b/.travis.yml
index 1660d5c..9b903b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,29 @@ compiler:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get build-dep -qq gnucash
-  - sudo apt-get install -qq swig xsltproc libdbd-sqlite3
+  - sudo apt-get install -qq swig xsltproc libdbd-sqlite3 cmake3 texinfo ninja-build
   - sudo apt-get --reinstall install -qq language-pack-en language-pack-fr
-script: ./autogen.sh && ./configure && make && make check
+script: |
+  # The -e here says that if any line below fails, the whole script fails
+  set -ev
+
+  # First, do the cmake build using the default Makefile generator
+  mkdir /tmp/gnucash-build-cmake-make
+  cd /tmp/gnucash-build-cmake-make
+  cmake $TRAVIS_BUILD_DIR
+  make -j 4
+  make check
+
+  # Next, do cmake again, using the Ninja generator this time
+  mkdir /tmp/gnucash-build-cmake-ninja
+  cd /tmp/gnucash-build-cmake-ninja
+  cmake -G Ninja $TRAVIS_BUILD_DIR
+  ninja
+  ninja check
+
+  # Finally, do the autotools build
+  cd $TRAVIS_BUILD_DIR
+  ./autogen.sh
+  ./configure
+  make
+  make check

commit 197faeab3f5e24fbebfb78290b6599a549bccd35
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Aug 25 11:40:54 2017 +0200

    Hide Account Substring option
    
    It is only there for compatibility with gnucash 2.8.
    It should not be visible on 2.6.x, only exist.

diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm
index 87c3945..d737a74 100644
--- a/src/report/standard-reports/transaction.scm
+++ b/src/report/standard-reports/transaction.scm
@@ -661,11 +661,8 @@
     #f #t))
 
   (gnc:register-trep-option
-   (gnc:make-string-option
+   (gnc:make-internal-option
     gnc:pagename-accounts (N_ "Account Substring")
-    "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \
-match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
-disable the substring filter. This filter is case-sensitive. Gnucash 2.8 or later.")
     ""))
 
   (gnc:register-trep-option

commit 19f4ce2f5ac14a74e558cd36c5a33ee3fcc76df5
Merge: 7b43822 19fe7d8
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Aug 25 11:29:46 2017 +0200

    Merge branch 'patch-3' of https://github.com/christopherlam/gnucash into maint


commit 19fe7d8a560467d2c6fe2b53277fa453f0677c16
Author: christopherlam <christopher.lck at gmail.com>
Date:   Fri Aug 25 17:13:54 2017 +0800

    Reduce to compatibility shim
    
    Reduce option to retain compatibility layer for earlier 2.8

diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm
index 151ab47..87c3945 100644
--- a/src/report/standard-reports/transaction.scm
+++ b/src/report/standard-reports/transaction.scm
@@ -33,7 +33,6 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
-(use-modules (srfi srfi-13))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
@@ -666,7 +665,7 @@
     gnc:pagename-accounts (N_ "Account Substring")
     "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \
 match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
-disable the substring filter. This filter is case-sensitive.")
+disable the substring filter. This filter is case-sensitive. Gnucash 2.8 or later.")
     ""))
 
   (gnc:register-trep-option
@@ -1431,7 +1430,6 @@ Credit Card, and Income accounts.")))))
   (gnc:report-starting reportname)
   (let ((document (gnc:make-html-document))
 	(c_account_1 (opt-val gnc:pagename-accounts "Accounts"))
-	(c_account_substring (opt-val gnc:pagename-accounts "Account Substring"))
 	(c_account_2 (opt-val gnc:pagename-accounts "Filter By..."))
 	(filter-mode (opt-val gnc:pagename-accounts "Filter Type"))
         (begindate (gnc:timepair-start-day-time
@@ -1454,11 +1452,6 @@ Credit Card, and Income accounts.")))))
     ;;(gnc:warn "accts in trep-renderer:" c_account_1)
     ;;(gnc:warn "Report Account names:" (get-other-account-names c_account_1))
 
-    (set! c_account_1
-          (filter (lambda (acc)
-                    (string-contains (gnc-account-get-full-name acc) c_account_substring))
-                  c_account_1))
-    
     (if (not (or (null? c_account_1) (and-map not c_account_1)))
         (begin
           (qof-query-set-book query (gnc-get-current-book))

commit 11a1ff61c5e15ebc9fa46473ebbb51aac713084e
Author: christopherlam <christopher.lck at gmail.com>
Date:   Wed Aug 16 23:46:25 2017 +0800

    added case sensitive filter
    
    please squash commits for me!

diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm
index 7ea7993..151ab47 100644
--- a/src/report/standard-reports/transaction.scm
+++ b/src/report/standard-reports/transaction.scm
@@ -664,9 +664,9 @@
   (gnc:register-trep-option
    (gnc:make-string-option
     gnc:pagename-accounts (N_ "Account Substring")
-    "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel:' will \
+    "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \
 match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
-disable the substring filter.")
+disable the substring filter. This filter is case-sensitive.")
     ""))
 
   (gnc:register-trep-option

commit 6eee9cefca162bfdd33f08eb70c068a1010854f1
Author: christopherlam <christopher.lck at gmail.com>
Date:   Wed Aug 16 23:33:03 2017 +0800

    Account fullname filter for transaction.scm
    
    This small change will introduce an account full-name filter. Only accounts whose fullname containing substring will be selected e.g. ":Travel" will match Expenses:Travel:Holiday and Expenses:Business:Travel. This can be left blank, which will mimic previous behavior. This will ease accounts selection tremendously.

diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm
index 85bb537..7ea7993 100644
--- a/src/report/standard-reports/transaction.scm
+++ b/src/report/standard-reports/transaction.scm
@@ -33,6 +33,7 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
+(use-modules (srfi srfi-13))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
@@ -661,6 +662,14 @@
     #f #t))
 
   (gnc:register-trep-option
+   (gnc:make-string-option
+    gnc:pagename-accounts (N_ "Account Substring")
+    "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel:' will \
+match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
+disable the substring filter.")
+    ""))
+
+  (gnc:register-trep-option
    (gnc:make-account-list-option
     gnc:pagename-accounts (N_ "Filter By...")
     "b" (N_ "Filter on these accounts.")
@@ -1422,6 +1431,7 @@ Credit Card, and Income accounts.")))))
   (gnc:report-starting reportname)
   (let ((document (gnc:make-html-document))
 	(c_account_1 (opt-val gnc:pagename-accounts "Accounts"))
+	(c_account_substring (opt-val gnc:pagename-accounts "Account Substring"))
 	(c_account_2 (opt-val gnc:pagename-accounts "Filter By..."))
 	(filter-mode (opt-val gnc:pagename-accounts "Filter Type"))
         (begindate (gnc:timepair-start-day-time
@@ -1444,6 +1454,11 @@ Credit Card, and Income accounts.")))))
     ;;(gnc:warn "accts in trep-renderer:" c_account_1)
     ;;(gnc:warn "Report Account names:" (get-other-account-names c_account_1))
 
+    (set! c_account_1
+          (filter (lambda (acc)
+                    (string-contains (gnc-account-get-full-name acc) c_account_substring))
+                  c_account_1))
+    
     (if (not (or (null? c_account_1) (and-map not c_account_1)))
         (begin
           (qof-query-set-book query (gnc-get-current-book))



Summary of changes:
 .travis.yml | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)



More information about the gnucash-changes mailing list