From 939a45b29155a8c7b028ab93a75b91c698551c9b Mon Sep 17 00:00:00 2001
From: Samuel Colvin <s@muelcolvin.com>
Date: Sat, 22 Jul 2017 21:07:38 +0100
Subject: [PATCH] messing with lzma and debug output

---
 .travis.yml        |  3 +--
 Makefile           |  2 +-
 build_cli.sh       | 15 +++++++++++++++
 setup.py           |  5 +++++
 xdelta             |  2 +-
 xdelta3/version.py |  2 +-
 6 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100755 build_cli.sh

diff --git a/.travis.yml b/.travis.yml
index efb6cfe..3235421 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,11 +28,10 @@ install:
 - gcc -v
 #- docker pull $DOCKER_IMAGE
 - pip freeze
-- make install
 
 script:
-- make lint
 - make test
+- make lint
 - ./tests/check_tag.py
 # TODO manylinux is currently broken as gcc-5 isn't available on centos 5
 #- docker run --rm -v `pwd`:/io $DOCKER_IMAGE /io/tests/build-wheels.sh
diff --git a/Makefile b/Makefile
index df176b7..4ba3c2b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ lint:
 	pytest xdelta3 -p no:sugar -q
 
 .PHONY: test
-test: prepare
+test: install
 	pytest --cov=xdelta3
 
 .PHONY: quickbuild
diff --git a/build_cli.sh b/build_cli.sh
new file mode 100755
index 0000000..655ae03
--- /dev/null
+++ b/build_cli.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# build xdelta3 command line tool in the submodule directory, requires automake and libtool
+set -e
+set -x
+
+cd xdelta/xdelta3
+git clean -fX
+libtoolize
+aclocal
+autoconf
+autoheader
+automake --add-missing
+./configure
+make
+cd ../..
diff --git a/setup.py b/setup.py
index bf49124..afa1e9b 100644
--- a/setup.py
+++ b/setup.py
@@ -32,10 +32,15 @@
             '_xdelta3',
             sources=['xdelta3/_xdelta3.c'],
             include_dirs=['./xdelta3/lib'],
+            # use with SECONDARY_LZMA to enabled secondary compression with lzma
+            # libraries=['lzma'],
             define_macros=[
                 ('SIZEOF_SIZE_T', '8'),
                 ('SIZEOF_UNSIGNED_LONG_LONG', '8'),
                 ('XD3_USE_LARGEFILE64', '1'),
+                # ('SECONDARY_LZMA', '1'),
+                # adds verbose debug output to xdelta3
+                # ('XD3_DEBUG', '3'),
             ]
         )
     ],
diff --git a/xdelta b/xdelta
index a089d04..13b7c97 160000
--- a/xdelta
+++ b/xdelta
@@ -1 +1 @@
-Subproject commit a089d04bf19d21a8ac5e03a9066e5a2e36e0b87a
+Subproject commit 13b7c970bc494d0e7dd293b55a3fcd097190854d
diff --git a/xdelta3/version.py b/xdelta3/version.py
index 8c5fcee..ba235c8 100644
--- a/xdelta3/version.py
+++ b/xdelta3/version.py
@@ -2,4 +2,4 @@
 
 __all__ = ['VERSION']
 
-VERSION = StrictVersion('0.0.5')
+VERSION = StrictVersion('0.0.6a1')