mirror
/
devilutionX-libzt
mirror of https://github.com/diasurgical/libzt.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Added partial support for PyPI (python) package build on Windows

pull/1/head
joseph.henry 8 years ago
parent
9361ff766c
commit
032e6d742d
7 changed files with 104 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CMakeLists.txt
  2. 7
      packages/PyPI/bdist.bat
  3. 2
      packages/pypi/MANIFEST.in
  4. 3
      packages/pypi/Makefile
  5. 41
      packages/pypi/README.md
  6. 15
      packages/pypi/prepare.sh
  7. 104
      packages/pypi/setup.py

1
CMakeLists.txt
Unescape View File

@ -28,6 +28,7 @@ cmake_minimum_required (VERSION 2.8)
project (libzt)
# --- SETUP
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_SUPPRESS_REGENERATION true)
# Paths

7
packages/PyPI/bdist.bat
Unescape View File

@ -0,0 +1,7 @@
cd ../../
cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=DEBUG
cmake --build build
copy bin\lib\Debug\*.lib packages\pypi
cd packages\pypi
pip3 install wheel twine
py setup.py bdist_wheel

2
packages/pypi/MANIFEST.in
Unescape View File

@ -8,3 +8,5 @@ recursive-include ../../include *.h
#recursive-include ../../include *.hpp
include libhttp.a
include liblwip.a
include http.lib
include lwip.lib

3
packages/pypi/Makefile
Unescape View File

@ -1,5 +1,6 @@
bdist:
cd ../../; cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=DEBUG; cmake --build build
cd ../../; cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=DEBUG
cmake --build build
cp ../../bin/lib/*.a .
python3 setup.py bdist_wheel

41
packages/pypi/README.md
Unescape View File

@ -19,20 +19,43 @@ while True:
time.sleep(1)
```
## Building the Package
## Building
Package is specified in [setup.py](setup.py). *Note: A new version must be specified in `setup.py` for every new upload of a package*
### macOS, Linux
Get necessary tools
Binary distribution:
`pip3 install wheel twine`
make bdist
*Note: As there appears to be no way to differentiate C and C++ code (and thus pass correct build args to each type) in a setuptools script we must separately build the `lwip` and `http_parser` libraries, copy them here, and then build the binary. See the top-level [README.md](../../README.md) for instructions on how to do that*
Alternatively, source Distribution:
make sdist
Upload to PyPI:
make upload
Cleanup:
make clean
### Windows
Build the binary distribution wheel:
Binary distribution:
`python3 setup.py bdist_wheel`
bdist.bat
Upload to PyPI
Source distribution:
`twine upload dist/*`
sdist.bat
Upload to PyPI:
upload.bat
Cleanup:
clean.bat
*Note: As there appears to be no way to differentiate C and C++ code (and thus pass correct build args to each type) in a setuptools script we must separately build the `lwip` and `http_parser` libraries, copy them here, and then build the binary. See the top-level [README.md](../../README.md) for instructions on how to do that*

15
packages/pypi/prepare.sh
Unescape View File

@ -1,15 +0,0 @@
#!/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

104
packages/pypi/setup.py
Unescape View File

@ -2,58 +2,74 @@
from setuptools import setup, Extension, Command, Distribution
import glob
import os
class BinaryDistribution(Distribution):
def is_pure(self):
return False
projDir='../..'
source_list = ['libzt_wrap.cxx']
source_list.extend(list(glob.glob(projDir+'/src/*.cpp')))
source_list.extend(list(glob.glob(projDir+'/zto/node/*.cpp')))
source_list.extend(list(glob.glob(projDir+'/zto/osdep/*.cpp')))
source_list.extend(list(glob.glob(projDir+'/zto/service/*.cpp')))
source_list.extend(list(glob.glob(projDir+'/zto/controller/*.cpp')))
# WINDOWS
if os.name == 'nt':
projDir='..\\..'
source_list = ['libzt_wrap.cxx']
source_list.extend(list(glob.glob(projDir+'\\src\\*.cpp')))
source_list.extend(list(glob.glob(projDir+'\\zto\\node\\*.cpp')))
source_list.extend(list(glob.glob(projDir+'\\zto\\osdep\\*.cpp')))
source_list.extend(list(glob.glob(projDir+'\\zto\\service\\*.cpp')))
source_list.extend(list(glob.glob(projDir+'\\zto\\controller\\*.cpp')))
#http_parser_source_list = ['libzt_wrap.cxx']
#http_parser_source_list.extend(list(glob.glob('../../zto/ext/http-parser/*.c')))
#lwip_source_list = ['libzt_wrap.cxx']
#lwip_source_list.extend(list(glob.glob('../../ext/lwip/src/core/*.c')))
#lwip_source_list.extend(list(glob.glob('../../ext/lwip/src/core/ipv4/*.c')))
#lwip_source_list.extend(list(glob.glob('../../ext/lwip/src/core/ipv6/*.c')))
source_list = list(set(source_list)-set(
[
projDir+'\\zto\\osdep\\LinuxEthernetTap.cpp',
projDir+'\\zto\\osdep\\BSDEthernetTap.cpp',
projDir+'\\zto\\osdep\\OSXEthernetTap.cpp',
projDir+'\\zto\\osdep\\WindowsEthernetTap.cpp'
]))
source_list = list(set(source_list)-set(
[projDir+'/zto/osdep/LinuxEthernetTap.cpp',projDir+'/zto/osdep/BSDEthernetTap.cpp',projDir+'/zto/osdep/OSXEthernetTap.cpp', projDir+'/zto/osdep/WindowsEthernetTap.cpp']))
libzt_module = Extension('libzt',
extra_compile_args=['/std:c++14', '-DNOMINMAX=1', '-DZT_SDK', '-DSDK', '-DZT_SOFTWARE_UPDATE_DEFAULT=\"disable\"'],
extra_link_args=['/LIBPATH:.', 'WS2_32.Lib', 'ShLwApi.Lib', 'iphlpapi.Lib','lwip.lib','http.lib'],
sources=source_list,
include_dirs=[projDir+'\\include',
projDir+'\\ext\\lwip\\src\\include',
projDir+'\\ext\\lwip-contrib\\ports\\win32\\include',
projDir+'\\zto\\include',
projDir+'\\zto\\node',
projDir+'\\zto\\service',
projDir+'\\zto\\osdep',
projDir+'\\zto\\controller']
)
# EVERYTHING ELSE
else:
projDir='../..'
source_list = ['libzt_wrap.cxx']
source_list.extend(list(glob.glob(projDir+'/src/*.cpp')))
source_list.extend(list(glob.glob(projDir+'/zto/node/*.cpp')))
source_list.extend(list(glob.glob(projDir+'/zto/osdep/*.cpp')))
source_list.extend(list(glob.glob(projDir+'/zto/service/*.cpp')))
source_list.extend(list(glob.glob(projDir+'/zto/controller/*.cpp')))
#lwip_module = Extension('lwip',
# extra_compile_args=['-DZT_SDK'],
# extra_link_args=[],
# sources=lwip_source_list,
# include_dirs=['../include',
# '../../include',
# '../../ext/lwip/src/include',
# '../../ext/lwip-contrib/ports/unix/include',]
# )
source_list = list(set(source_list)-set(
[
projDir+'/zto/osdep/LinuxEthernetTap.cpp',
projDir+'/zto/osdep/BSDEthernetTap.cpp',
projDir+'/zto/osdep/OSXEthernetTap.cpp',
projDir+'/zto/osdep/WindowsEthernetTap.cpp'
]))
#http_parser_module = Extension('http_parser',
# extra_compile_args=[],
# extra_link_args=[],
# sources=http_parser_source_list,
# )
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=[projDir+'/include',
projDir+'/ext/lwip/src/include',
projDir+'/ext/lwip-contrib/ports/unix/include',
projDir+'/zto/include',
projDir+'/zto/node',
projDir+'/zto/service',
projDir+'/zto/osdep',
projDir+'/zto/controller']
)
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=[projDir+'/include',
projDir+'/ext/lwip/src/include',
projDir+'/ext/lwip-contrib/ports/unix/include',
projDir+'/zto/include',
projDir+'/zto/node',
projDir+'/zto/service',
projDir+'/zto/osdep',
projDir+'/zto/controller']
)
setup(
include_package_data=True,
@ -66,7 +82,7 @@ setup(
description = 'ZeroTier',
long_description = 'Encrypted P2P communication between apps and services',
author = 'ZeroTier, Inc.',
author_email = 'joseph@zerotier.com',
author_email = 'josep@zerotier.com',
url = 'https://github.com/zerotier/libzt',
license='GPLv3',
download_url = 'https://github.com/zerotier/libzt/archive/1.1.6.tar.gz',

Write Preview
Loading…
Cancel
Save