Merge commit 'b9078dc93ffdb526efd0a859a73cc3076108f6b2'

This commit is contained in:
Craig Earls 2014-03-25 18:56:32 -07:00
commit 3112851e97
23 changed files with 345 additions and 345 deletions

View file

@ -54,18 +54,11 @@ it's usually fairly obvious where things have gone astray.
GNU/Linux system (or Debian-based system such as Ubuntu), something GNU/Linux system (or Debian-based system such as Ubuntu), something
like this should work (as root): like this should work (as root):
# aptitude update sudo apt-get install build-essential cmake autopoint texinfo python-dev \
# for name in \ zlib1g-dev libbz2-dev libgmp3-dev gettext libmpfr-dev \
cmake libboost-dev libboost-date-time-dev libboost-doc \ libboost-date-time-dev libboost-filesystem-dev \
libboost-dbg libboost-filesystem-dev libboost-graph-dev \ libboost-graph-dev libboost-iostreams-dev \
libboost-iostreams-dev libboost-program-options-dev \ libboost-python-dev libboost-regex-dev libboost-test-dev
libboost-python-dev libboost-regex-dev \
libboost-serialization-dev libboost-signals-dev \
libboost-test-dev libboost-thread-dev libboost-wave-dev \
libmpfr-dev libmpfr-dbg libmpfr-doc; \
do \
aptitude install ${name}; \
done
---------------------------------------------------------------------- ----------------------------------------------------------------------

View file

@ -65,6 +65,7 @@ current `master` branch:
<tr><td>Boost</td><td>1.35</td><td></td></tr> <tr><td>Boost</td><td>1.35</td><td></td></tr>
<tr><td>GMP</td><td>4.2.2</td><td></td></tr> <tr><td>GMP</td><td>4.2.2</td><td></td></tr>
<tr><td>MPFR</td><td>2.4.0</td><td></td></tr> <tr><td>MPFR</td><td>2.4.0</td><td></td></tr>
<tr><td>utfcpp</td><td>2.3.4</td><td></td></tr>
<tr><td>gettext</td><td>0.17</td><td><em>optional</em></td></tr> <tr><td>gettext</td><td>0.17</td><td><em>optional</em></td></tr>
<tr><td>libedit</td><td>20090111-3.0</td><td><em>optional</em></td></tr> <tr><td>libedit</td><td>20090111-3.0</td><td><em>optional</em></td></tr>
<tr><td>Python</td><td>2.4</td><td><em>optional</em></td></tr> <tr><td>Python</td><td>2.4</td><td><em>optional</em></td></tr>
@ -111,9 +112,9 @@ following packages (current as of Ubuntu 12.04):
Or, for Ubuntu Karmic: Or, for Ubuntu Karmic:
sudo apt-get install build-essential cmake texinfo python-dev zlib1g-dev sudo apt-get install build-essential cmake texinfo python-dev zlib1g-dev
libbz2-dev libgmp3-dev bjam gettext cvs libboost1.40-dev libbz2-dev libgmp3-dev bjam gettext cvs libboost-dev
libboost-regex1.40-dev libboost-date-time1.40-dev libboost-regex-dev libboost-date-time-dev
libboost-filesystem1.40-dev libmpfr-dev libboost-filesystem-dev libmpfr-dev
### Debian ### Debian
@ -124,11 +125,11 @@ Debian wheezy (7.0) contains all components needed to build ledger.
You can install all required build dependencies using the following You can install all required build dependencies using the following
command: command:
sudo apt-get install build-essential cmake autopoint texinfo python-dev sudo apt-get install build-essential cmake autopoint texinfo python-dev \
zlib1g-dev libbz2-dev libgmp3-dev gettext libmpfr-dev zlib1g-dev libbz2-dev libgmp3-dev gettext libmpfr-dev \
libboost-date-time1.49-dev libboost-filesystem1.49-dev libboost-date-time-dev libboost-filesystem-dev \
libboost-graph1.49-dev libboost-iostreams1.49-dev libboost-graph-dev libboost-iostreams-dev \
libboost-python1.49-dev libboost-regex1.49-dev libboost-test1.49-dev libboost-python-dev libboost-regex-dev libboost-test-dev
## Building ## Building

File diff suppressed because it is too large Load diff

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:
;; Helper functions to deal with commoditized numbers. A commoditized ;; Helper functions to deal with commoditized numbers. A commoditized

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:
;; Functions providing payee and account auto complete. ;; Functions providing payee and account auto complete.

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
@ -40,7 +40,8 @@
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-xact-highlight-face (defface ledger-font-xact-highlight-face
`((t :background "#eee8d5")) `((((background dark)) :background "#1a1a1a" )
(t :background "#eee8d5"))
"Default face for transaction under point" "Default face for transaction under point"
:group 'ledger-faces) :group 'ledger-faces)
@ -80,7 +81,8 @@
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-occur-xact-face (defface ledger-occur-xact-face
`((t :background "#eee8d5" )) `((((background dark)) :background "#1a1a1a" )
(t :background "#eee8d5" ))
"Default face for Ledger occur mode shown transactions" "Default face for Ledger occur mode shown transactions"
:group 'ledger-faces) :group 'ledger-faces)

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:
;; Determine the ledger environment ;; Determine the ledger environment

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:
;; Provide buffer narrowing to ledger mode. Adapted from original loccur ;; Provide buffer narrowing to ledger mode. Adapted from original loccur

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;; Reconcile mode ;; Reconcile mode

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
(require 'rx) (require 'rx)

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; Boston, MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:
;; ;;

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
(defgroup ledger-test nil (defgroup ledger-test nil
"Definitions for the Ledger testing framework" "Definitions for the Ledger testing framework"

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
(defgroup ledger-texi nil (defgroup ledger-texi nil
"Options for working on Ledger texi documentation" "Options for working on Ledger texi documentation"

View file

@ -16,8 +16,8 @@
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the ;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02111-1307, USA. ;; MA 02110-1301 USA.
;;; Commentary: ;;; Commentary:

View file

@ -268,9 +268,6 @@ if(BUILD_LIBRARY)
install(TARGETS libledger DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS libledger DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${LEDGER_INCLUDES} install(FILES ${LEDGER_INCLUDES}
${PROJECT_SOURCE_DIR}/lib/sha1.h ${PROJECT_SOURCE_DIR}/lib/sha1.h
${PROJECT_SOURCE_DIR}/lib/utfcpp/source/utf8.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ledger)
install(DIRECTORY ${PROJECT_SOURCE_DIR}/lib/utfcpp/source/utf8
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ledger) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ledger)
else() else()
add_executable(ledger add_executable(ledger