Merge pull request Open-Transactions#152 from Open-Transactions/develop

Develop

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text eol=lf
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -1,6 +1,8 @@
 #see http://shanesbrain.net/2008/7/9/using-xcode-with-git
 # xcode noise
 build/*
+*.log
+*.trs
 *.xcconfig
 *.xcclassmodel/*
 *.o
@@ -36,6 +38,7 @@ profile
 # autoreconf noise
 Makefile.in
 aclocal.m4
+build-aux/test-driver
 build-aux/compile
 build-aux/config.guess
 build-aux/config.sub
@@ -107,14 +110,22 @@ src/otlib/protobOT/.deps/
 # linux build noise
 *.lo
 *.la
-src/.libs
-src/otapi/.libs
-src/otlib/.libs
+.dirstamp
+.libs
 *.pb.cc
+src/opentxs
 src/createmint
 src/ot
 src/otserver
+unittests_*
 Bitcoin.cc
 Generics.cc
 Markets.cc
 Moneychanger.cc
+
+# Qt Creator .pro files
+project-Qt/
+build-OpenTransactions*
+
+# KDE Dolphin (file manager) noise
+.directory

.travis.yml

@@ -0,0 +1,28 @@
+language: cpp
+compiler:
+  - gcc
+  - clang
+install:
+  - sudo apt-get install libprotobuf-dev protobuf-compiler libzmq3-dev libboost-all-dev
+  - git clone https://github.com/zeromq/cppzmq.git
+  - sudo cp cppzmq/zmq.hpp /usr/local/include/
+script: ./autogen.sh && ./configure && make distcheck -j4
+branches:
+  only:
+    - master
+    - develop
+notifications:
+  recipients:
+    - [email protected]
+  email:
+    on_success: change
+    on_failure: always
+#  irc:
+#    on_success: change
+#    on_failure: always
+#    channels:
+#      - "chat.freenode.net#opentransactions"
+#    template:
+#      - "%{branch} (%{commit} - %{author}): %{message}"
+#      - "Change view: %{compare_url}"
+#      - "Build: %{build_url}"

Makefile.am

@@ -9,11 +9,11 @@ ACLOCAL_AMFLAGS 	=	-I build-aux/m4
 
 SUBDIRS                 =   src
 
-## Open-Transactions Installs ##
+## tests (commented out until gtest packaging resolved)
 
-#### autogen.sh, opentxs script CLI utility
+## Open-Transactions Installs ##
 
-dist_bin_SCRIPTS		=	scripts/opentxs
+#### autogen.sh
 
 dist_noinst_SCRIPTS		=	autogen.sh
 
@@ -36,18 +36,17 @@ dist_bashcompletion_SCRIPTS	=	scripts/bash_completion.d/opentxs-bash-completion.
 
 opentxsdocdir			=	$(docdir)
 
-dist_opentxsdoc_DATA    =   docs/INSTALL-Android.txt		\
-                            docs/INSTALL-Fedora.txt		\
-                            docs/INSTALL-Debian_Ubuntu.txt	\
-                            docs/INSTALL-OSX-Homebrew.txt	\
-                            docs/INSTALL-Windows.txt		\
-                            docs/SSL-NOTES.txt			\
-                            docs/WIPE-USERS-ACCOUNTS.txt	\
-                            docs/CLIENT-COMMANDS.txt		\
-                            docs/LICENSE-AND-CREDITS.txt	\
-                            PUBKEY-FellowTraveler.asc		\
-                            README.md				\
-                            VERSION
+dist_opentxsdoc_DATA	=	docs/INSTALL-Fedora.txt		\
+				docs/INSTALL-Debian_Ubuntu.txt	\
+				docs/INSTALL-OSX-Homebrew.txt	\
+				docs/INSTALL-Windows.txt	\
+				docs/SSL-NOTES.txt		\
+				docs/WIPE-USERS-ACCOUNTS.txt	\
+				docs/CLIENT-COMMANDS.txt	\
+				docs/LICENSE-AND-CREDITS.txt	\
+				PUBKEY-FellowTraveler.asc	\
+				README.md			\
+				VERSION
 
 opentxsdatadir          =	$(pkgdatadir)
 dist_opentxsdata_DATA	=	sample-data/command-line-ot.opt	\

README.md

@@ -1,5 +1,7 @@
 ## Open-Transactions Library Project
 
+[![Build Status](https://travis-ci.org/Open-Transactions/Open-Transactions.svg?branch=develop)](https://travis-ci.org/Open-Transactions/Open-Transactions)
+
 The Open-Transactions project is a collaborative effort to develop
 a robust, commercial-grade, fully-featured, free-software toolkit
 implementing the OTX protocol as well as a full-strength financial

VERSION

@@ -1 +1 @@
-0.92.a
+0.92.b

debian/changelog

@@ -1,5 +1,5 @@
-opentxs (0.91.d) UNRELEASED; urgency=low
+opentxs (0.92.a) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
 
- -- randy-waterhouse <[email protected]>  Thu, 17 Apr 2014 23:34:45 +1300
+ -- randy-waterhouse <[email protected]>  Tue, 22 Apr 2014 15:32:45 +1300