From 4b20a1771aa879d77a2b8baf67275cf371d6bcfd Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Wed, 10 Jan 2018 16:23:41 -0800
Subject: [PATCH] Reconfigured package structure for source dist on linux

---
 packages/pypi/MANIFEST.in    |  6 ++++++
 packages/pypi/libzt.i        |  2 +-
 packages/pypi/libzt_wrap.cxx |  2 +-
 packages/pypi/prepare.sh     | 15 +++++++++++++++
 packages/pypi/setup.py       | 31 +++++++++++++++----------------
 5 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100755 packages/pypi/prepare.sh

diff --git a/packages/pypi/MANIFEST.in b/packages/pypi/MANIFEST.in
index 6010b2e..c4bbc9c 100644
--- a/packages/pypi/MANIFEST.in
+++ b/packages/pypi/MANIFEST.in
@@ -2,3 +2,9 @@
 README.rst
 setup.cfg
 setup.py
+recursive-include data *.c
+recursive-include data *.cpp
+recursive-include data *.h
+recursive-include data *.hpp
+include libhttp.a
+include liblwip.a
diff --git a/packages/pypi/libzt.i b/packages/pypi/libzt.i
index 49165dd..08a3bb9 100644
--- a/packages/pypi/libzt.i
+++ b/packages/pypi/libzt.i
@@ -30,7 +30,7 @@
 
 %{
 #define SWIG_FILE_WITH_INIT
-#include "../../include/libzt.h"
+#include "data/libzt/include/libzt.h"
 %}
 
 int zts_start(const char *path, bool blocking);
diff --git a/packages/pypi/libzt_wrap.cxx b/packages/pypi/libzt_wrap.cxx
index 9306ca0..c94f2e6 100644
--- a/packages/pypi/libzt_wrap.cxx
+++ b/packages/pypi/libzt_wrap.cxx
@@ -3130,7 +3130,7 @@ namespace swig {
 
 
 #define SWIG_FILE_WITH_INIT
-#include "../../include/libzt.h"
+#include "data/libzt/include/libzt.h"
 
 
 SWIGINTERN swig_type_info*
diff --git a/packages/pypi/prepare.sh b/packages/pypi/prepare.sh
new file mode 100755
index 0000000..1485cbd
--- /dev/null
+++ b/packages/pypi/prepare.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Move sources into top-level subdirectory so MANIFEST.in can include it in the source distribution
+
+mkdir -p data/libzt
+mkdir -p data/zto
+
+# libzt
+cp -r ../../src data/libzt/src
+cp -r ../../include data/libzt/include
+cp -r ../../ext data/libzt/ext
+
+# ZeroTier
+cp -r ../../zto/ data/zto
+
diff --git a/packages/pypi/setup.py b/packages/pypi/setup.py
index f8b648c..856014d 100644
--- a/packages/pypi/setup.py
+++ b/packages/pypi/setup.py
@@ -8,11 +8,11 @@ class BinaryDistribution(Distribution):
         return False
 
 source_list = ['libzt_wrap.cxx']
-source_list.extend(list(glob.glob('../../src/*.cpp')))
-source_list.extend(list(glob.glob('../../zto/node/*.cpp')))
-source_list.extend(list(glob.glob('../../zto/osdep/*.cpp')))
-source_list.extend(list(glob.glob('../../zto/service/*.cpp')))
-source_list.extend(list(glob.glob('../../zto/controller/*.cpp')))
+source_list.extend(list(glob.glob('data/libzt/src/*.cpp')))
+source_list.extend(list(glob.glob('data/zto/node/*.cpp')))
+source_list.extend(list(glob.glob('data/zto/osdep/*.cpp')))
+source_list.extend(list(glob.glob('data/zto/service/*.cpp')))
+source_list.extend(list(glob.glob('data/zto/controller/*.cpp')))
 
 #http_parser_source_list = ['libzt_wrap.cxx']
 #http_parser_source_list.extend(list(glob.glob('../../zto/ext/http-parser/*.c')))
@@ -22,7 +22,7 @@ source_list.extend(list(glob.glob('../../zto/controller/*.cpp')))
 #lwip_source_list.extend(list(glob.glob('../../ext/lwip/src/core/ipv6/*.c')))
 
 source_list = list(set(source_list)-set(
-	['../../zto/osdep/LinuxEthernetTap.cpp','../../zto/osdep/BSDEthernetTap.cpp','../../zto/osdep/OSXEthernetTap.cpp', '../../zto/osdep/WindowsEthernetTap.cpp']))
+	['data/zto/osdep/LinuxEthernetTap.cpp','data/zto/osdep/BSDEthernetTap.cpp','data/zto/osdep/OSXEthernetTap.cpp', 'data/zto/osdep/WindowsEthernetTap.cpp']))
 
 #lwip_module = Extension('lwip',
 #					extra_compile_args=['-DZT_SDK'],
@@ -44,15 +44,14 @@ libzt_module = Extension('libzt',
 					extra_compile_args=['-std=c++11', '-DZT_SDK', '-DZT_SOFTWARE_UPDATE_DEFAULT=\"disable\"'],
 					extra_link_args=['-L.','-llwip','-lhttp'],
 					sources=source_list,
-					include_dirs=['../include',
-							'../../include',
-							'../../ext/lwip/src/include',
-							'../../ext/lwip-contrib/ports/unix/include',
-							'../../zto/include',
-							'../../zto/node',
-							'../../zto/service',
-							'../../zto/osdep',
-							'../../zto/controller']                           
+					include_dirs=['data/libzt/include',
+							'data/libzt/ext/lwip/src/include',
+							'data/libzt/ext/lwip-contrib/ports/unix/include',
+							'data/zto/include',
+							'data/zto/node',
+							'data/zto/service',
+							'data/zto/osdep',
+							'data/zto/controller']                           
 					)
 
 setup(    
@@ -62,7 +61,7 @@ setup(
 	py_modules = ['libzt'],
 	name = 'libzt',
 	packages = ['libzt'],
-	version = '1.1.5a14',
+	version = '1.1.5a19',
 	description = 'ZeroTier, in library form.',
 	long_description = 'Encrypted P2P networks between your applications',
 	author = 'ZeroTier, Inc.',