Merge branch 'master' of https://github.com/quickfix/quickfix

Author: Oren Miller

.gitignore

@@ -16,6 +16,10 @@ Makefile
 *.o
 *.d
 *.a
+.libs
+*.la
+*.so
+*.dylib
 ChangeLog
 UnitTest++/TestUnitTest++
 aclocal.m4
@@ -35,23 +39,11 @@ stamp-h1
 bin/executor
 bin/ordermatch
 bin/tradeclient
-examples/executor/C++/.libs/
 examples/executor/C++/executor
-examples/ordermatch/.libs/
 examples/ordermatch/ordermatch
-examples/ordermatch/test/.libs/
 examples/ordermatch/test/ordermatch_ut
-examples/tradeclient/.libs/
 examples/tradeclient/tradeclient
 include/
-lib/libquickfix.dylib
-lib/libquickfix.la
-lib/libquickfix.so
-src/.libs/
-src/C++/.libs/
-src/C++/libquickfix.la
-src/C++/test/.libs/
-src/C++/test/libquickfixcpptest.la
 src/at
 src/pt
 src/ut
@@ -62,3 +54,6 @@ test/ut_debug
 test/cfg
 test/store
 autom4te.cache/
+lib/python
+COPYING
+INSTALL

NEWS

@@ -1,3 +1,11 @@
+1.14.1
+------
+Replaced libxml2 and MSXML dependencies with embedded pugixml.
+
+Fixed all warnings from -Wshorten-64-to-32.
+
+Added python api to PyPi. Can be installed with 'pip install quickfix'.
+
 1.14.0
 ------
 Major performance improvement sending/receiving messages. Thanks to 

configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.59])
 
-AC_INIT([QuickFIX], [1.14.0], [ask@quickfixengine.org])
+AC_INIT([QuickFIX], [1.14.1], [ask@quickfixengine.org])
 AC_CONFIG_MACRO_DIR([m4])
 m4_include([m4/ax_lib_mysql.m4])
 m4_include([m4/ax_lib_postgresql.m4])
@@ -36,23 +36,6 @@ AX_PYTHON()
 AX_RUBY()
 AX_JAVA()
 
-########################################
-# CALLSTACK
-########################################
-use_callstack=no
-AC_ARG_ENABLE(callstack,
- [ --enable-callstack display c++ call stack after crashing],
- [use_callstack=$enableval],
- use_callstack=no
-)
-
-if test $use_callstack = yes
-then
- AC_DEFINE(ENABLE_CALLSTACK, 1, 
-Define if you want a C++ callstack to be displayed after crashing)
-fi
-########################################
-
 ########################################
 # TBB 
 ########################################
@@ -94,12 +77,6 @@ then
 fi
 ########################################
 
-########################################
-# LIBXML
-########################################
-AM_PATH_XML2('2.0.0', , AC_MSG_ERROR(libxml2 must be installed.))
-########################################
-
 # libs
 LIBS="$STLPORT_LIBS $XML_LIBS $MYSQL_LIBS $POSTGRESQL_LDFLAGS $TBB_LIBS $LIBS"
 # gcc flags
@@ -111,7 +88,7 @@ fi
 
 CFLAGS="$CFLAGS $SHAREDFLAGS"
 AC_SUBST(CFLAGS)
-CXXFLAGS="$CXXFLAGS $SHAREDFLAGS"
+CXXFLAGS="$CXXFLAGS $SHAREDFLAGS -std=c++0x"
 AC_SUBST(CXXFLAGS)
 
 

doc/html/.gitignore

@@ -2,7 +2,7 @@
 *.map
 *_*.html
 index*.html
-struct_*.html
+struct*.html
 class_*.html
 namespace*.html
 functions*.html

doc/html/building.html

@@ -69,15 +69,6 @@ <h1>Windows</h1>
  enable this option, the postgres include and library
  directories must be in the Visual Studio search paths.</td>
  </tr>
-
- <tr>
- <td><font color="#0000FF">#define HAVE_LIBXML 1</font></td>
- </tr>
-
- <tr>
- <td>Compile and link XML parsing code against the libxml
- library instead of the default MSXML3.</td>
- </tr>
  </table>
 
  <h1>Linux / Solaris / FreeBSD / Mac OS X</h1>
@@ -95,8 +86,7 @@ <h1>Linux / Solaris / FreeBSD / Mac OS X</h1>
 
  <table>
  <tr>
- <td><font color="#0000FF">--with-python=&lt;include
- directory&gt;</font></td>
+ <td><font color="#0000FF">--with-python</font></td>
  </tr>
 
  <tr>

doc/html/dependencies.html

@@ -32,12 +32,11 @@ <h1>Required Dependencies</h1>
  <tr bgcolor="#FFFFFF">
  <td align="center"><b>Windows</b></td>
 
- <td>MSXML3 or libxml2</td>
+ <td></td>
 
  <td>
  <a href="http://msdn.microsoft.com/visualc/">Microsoft
  Visual C++</a><br>
- MSXML3 or libxml2
  </td>
 
  <td>
@@ -52,9 +51,6 @@ <h1>Required Dependencies</h1>
  <a href=
  "http://www.rpmfind.net/linux/rpm2html/search.php?query=glibc">
  glibc</a><br>
- <a href=
- "http://www.rpmfind.net/linux/rpm2html/search.php?query=libxml">
- libxml2</a><br>
  </td>
 
  <td>
@@ -67,9 +63,6 @@ <h1>Required Dependencies</h1>
  <a href=
  "http://www.rpmfind.net/linux/rpm2html/search.php?query=glibc-devel">
  glibc-devel</a><br>
- <a href=
- "http://www.rpmfind.net/linux/rpm2html/search.php?query=libxml-devel">
- libxml2-devel</a><br>
  <a href="ftp://ftp.gnu.org/pub/gnu/make/">gnu
  make</a><br>
  <a href=
@@ -90,9 +83,6 @@ <h1>Required Dependencies</h1>
  <td>
  <a href=
  "http://www.gnu.org/software/libc/#Availability">glibc</a><br>
-
- <a href=
- "http://xmlsoft.org/downloads.html">libxml2</a><br>
  </td>
 
  <td>
@@ -101,8 +91,6 @@ <h1>Required Dependencies</h1>
  or SunPRO<br>
  gcc-c++<br>
  glibc-devel<br>
- <a href=
- "http://xmlsoft.org/downloads.html">libxml2-devel</a><br>
 
  <a href="ftp://ftp.gnu.org/pub/gnu/make/">gnu
  make</a><br>
@@ -121,11 +109,9 @@ <h1>Required Dependencies</h1>
  <td align="center"><b>FreeBSD</b></td>
 
  <td>
- <a href="http://www.freebsd.org/ports/">libxml2</a><br>
  </td>
 
  <td>
- <a href="http://www.freebsd.org/ports/">libxml2<br></a>
  </td>
 
  <td>
@@ -137,18 +123,12 @@ <h1>Required Dependencies</h1>
  <td align="center"><b>Mac OS X</b></td>
 
  <td>
- <a href=
- "http://www.macports.org/ports.php?by=library&amp;substr=libxml2">
- libxml2</a><br>
  </td>
 
  <td>
  <a href=
  "http://developer.apple.com/tools/download/">Xcode
  Tools</a><br>
- <a href=
- "http://www.macports.org/ports.php?by=library&amp;substr=libxml2">
- libxml2</a><br>
  </td>
 
  <td></td>

examples/executor/python/executor.py

@@ -1,6 +1,5 @@
 import sys
 import time
-import thread
 import quickfix as fix
 
 class Application(fix.Application):
@@ -27,7 +26,6 @@ def fromApp(self, message, sessionID):
 clOrdID = fix.ClOrdID()
 
 message.getField( ordType )
-print ordType
 if ordType.getValue() != fix.OrdType_LIMIT:
 raise fix.IncorrectTagValue( ordType.getField() )
 
@@ -62,15 +60,15 @@ def fromApp(self, message, sessionID):
 
 try:
 fix.Session.sendToTarget( executionReport, sessionID )
-except SessionNotFound, e:
+except SessionNotFound as e:
 return
 
 def genOrderID(self):
 self.orderID = self.orderID+1
-return `self.orderID`
+return self.orderID
 def genExecID(self):
 self.execID = self.execID+1
-return `self.execID`
+return self.execID
 
 try:
 file = sys.argv[1]
@@ -83,5 +81,5 @@ def genExecID(self):
 
 while 1:
  time.sleep(1)
-except (fix.ConfigError, fix.RuntimeError), e:
-print e
+except (fix.ConfigError, fix.RuntimeError) as e:
+print(e)

examples/ordermatch/Market.cpp

@@ -107,7 +107,7 @@ Order& Market::find( Order::Side side, std::string id )
 void Market::match( Order& bid, Order& ask )
 {
  double price = ask.getPrice();
- int quantity = 0;
+ long quantity = 0;
 
  if ( bid.getOpenQuantity() > ask.getOpenQuantity() )
  quantity = ask.getOpenQuantity();

examples/ordermatch/test/Market.cpp

@@ -107,7 +107,7 @@ Order& Market::find( Order::Side side, std::string id )
 void Market::match( Order& bid, Order& ask )
 {
  double price = ask.getPrice();
- int quantity = 0;
+ long quantity = 0;
 
  if ( bid.getOpenQuantity() > ask.getOpenQuantity() )
  quantity = ask.getOpenQuantity();

m4/ax_python.m4

@@ -18,10 +18,10 @@ AC_SUBST(PYTHON_PREFIX)
 
 if test $has_python = true
 then
- PYTHON_INCLUDE_PATH=[`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_inc(1)'`]
+ PYTHON_INCLUDE_PATH=[`$PYTHON -c 'from distutils import sysconfig; print( sysconfig.get_python_inc(1) )'`]
  PYTHON_CFLAGS="-I${PYTHON_INCLUDE_PATH}" 
  AC_SUBST(PYTHON_CFLAGS)
- PYTHON_SITE_PACKAGES=[`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)'`]
+ PYTHON_SITE_PACKAGES=[`$PYTHON -c 'from distutils import sysconfig; print( sysconfig.get_python_lib(1) )'`]
  AC_SUBST(PYTHON_SITE_PACKAGES)
  AC_DEFINE(HAVE_PYTHON, 1, Define if you have python)
 fi