Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(zlib): update zlib to 1.2.12 #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
graft src
recursive-include zlib-1.2.11 *.c *.h
recursive-exclude zlib-1.2.11 ChangeLog configure FAQ INDEX Makefile* make_vms.com README
prune zlib-1.2.11/amiga
prune zlib-1.2.11/as400
prune zlib-1.2.11/examples
prune zlib-1.2.11/msdos
prune zlib-1.2.11/old
prune zlib-1.2.11/projects
prune zlib-1.2.11/qnx
prune zlib-1.2.11/win32
recursive-include zlib-1.2.12 *.c *.h
recursive-exclude zlib-1.2.12 ChangeLog configure FAQ INDEX Makefile* make_vms.com README
prune zlib-1.2.12/amiga
prune zlib-1.2.12/as400
prune zlib-1.2.12/examples
prune zlib-1.2.12/msdos
prune zlib-1.2.12/old
prune zlib-1.2.12/projects
prune zlib-1.2.12/qnx
prune zlib-1.2.12/win32
14 changes: 7 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
from setuptools import setup, Extension

SOURCES = ['src/py_minizip.c', 'src/py_miniunz.c',
'zlib-1.2.11/contrib/minizip/zip.c', 'zlib-1.2.11/contrib/minizip/unzip.c', 'zlib-1.2.11/contrib/minizip/ioapi.c',
'zlib-1.2.11/adler32.c', 'zlib-1.2.11/compress.c', 'zlib-1.2.11/crc32.c', 'zlib-1.2.11/deflate.c',
'zlib-1.2.11/infback.c', 'zlib-1.2.11/inffast.c', 'zlib-1.2.11/inflate.c',
'zlib-1.2.11/inftrees.c', 'zlib-1.2.11/trees.c', 'zlib-1.2.11/uncompr.c', 'zlib-1.2.11/zutil.c']
'zlib-1.2.12/contrib/minizip/zip.c', 'zlib-1.2.12/contrib/minizip/unzip.c', 'zlib-1.2.12/contrib/minizip/ioapi.c',
'zlib-1.2.12/adler32.c', 'zlib-1.2.12/compress.c', 'zlib-1.2.12/crc32.c', 'zlib-1.2.12/deflate.c',
'zlib-1.2.12/infback.c', 'zlib-1.2.12/inffast.c', 'zlib-1.2.12/inflate.c',
'zlib-1.2.12/inftrees.c', 'zlib-1.2.12/trees.c', 'zlib-1.2.12/uncompr.c', 'zlib-1.2.12/zutil.c']

if 'win32' in sys.platform:
SOURCES.append('zlib-1.2.11/contrib/minizip/iowin32.c')
SOURCES.append('zlib-1.2.12/contrib/minizip/iowin32.c')

def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()

setup(
name = 'pyminizip',
version = '0.2.6',
version = '0.2.7',
description = 'A minizip wrapper - To create a password encrypted zip file in python.',
author='Shin Aoyama',
author_email = "[email protected]",
Expand All @@ -39,7 +39,7 @@ def read(fname):
ext_modules=[
Extension(name="pyminizip",
sources=SOURCES,
include_dirs=['src','zlib-1.2.11','zlib-1.2.11/contrib/minizip'],
include_dirs=['src','zlib-1.2.12','zlib-1.2.12/contrib/minizip'],
)
],
long_description = read('README.md'),
Expand Down
32 changes: 0 additions & 32 deletions zlib-1.2.11/contrib/vstudio/vc9/zlib.rc

This file was deleted.

153 changes: 0 additions & 153 deletions zlib-1.2.11/contrib/vstudio/vc9/zlibvc.def

This file was deleted.

Loading