From 593239433870fc7f38077bc78618d9a91de15caf Mon Sep 17 00:00:00 2001 From: Roy Marmelstein Date: Wed, 13 Jan 2016 00:51:08 +0100 Subject: [PATCH] Build changes --- Zip.xcodeproj/project.pbxproj | 160 +++++++++++++++++++++-- Zip/Zip.swift | 4 - {minizip => Zip/aes}/aes.h | 0 {minizip => Zip/aes}/aes_via_ace.h | 0 {minizip => Zip/aes}/aescrypt.c | 0 {minizip => Zip/aes}/aeskey.c | 0 {minizip => Zip/aes}/aesopt.h | 0 {minizip => Zip/aes}/aestab.c | 0 {minizip => Zip/aes}/aestab.h | 0 {minizip => Zip/aes}/brg_endian.h | 0 {minizip => Zip/aes}/brg_types.h | 0 {minizip => Zip/aes}/entropy.c | 0 {minizip => Zip/aes}/entropy.h | 0 {minizip => Zip/aes}/fileenc.c | 0 {minizip => Zip/aes}/fileenc.h | 0 {minizip => Zip/aes}/hmac.c | 0 {minizip => Zip/aes}/hmac.h | 0 {minizip => Zip/aes}/prng.c | 0 {minizip => Zip/aes}/prng.h | 0 {minizip => Zip/aes}/pwd2key.c | 0 {minizip => Zip/aes}/pwd2key.h | 0 {minizip => Zip/aes}/sha1.c | 0 {minizip => Zip/aes}/sha1.h | 0 minizip/common.h => Zip/minizip/Common.h | 4 +- {minizip => Zip/minizip}/crypt.h | 0 {minizip => Zip/minizip}/include.h | 0 {minizip => Zip/minizip}/ioapi.c | 0 {minizip => Zip/minizip}/ioapi.h | 0 Zip/minizip/module.modulemap | 5 + {minizip => Zip/minizip}/mztools.c | 0 {minizip => Zip/minizip}/mztools.h | 0 {minizip => Zip/minizip}/unzip.c | 0 {minizip => Zip/minizip}/unzip.h | 2 +- {minizip => Zip/minizip}/zip.c | 0 {minizip => Zip/minizip}/zip.h | 0 minizip/module.modulemap | 4 - 36 files changed, 160 insertions(+), 19 deletions(-) rename {minizip => Zip/aes}/aes.h (100%) rename {minizip => Zip/aes}/aes_via_ace.h (100%) rename {minizip => Zip/aes}/aescrypt.c (100%) rename {minizip => Zip/aes}/aeskey.c (100%) rename {minizip => Zip/aes}/aesopt.h (100%) rename {minizip => Zip/aes}/aestab.c (100%) rename {minizip => Zip/aes}/aestab.h (100%) rename {minizip => Zip/aes}/brg_endian.h (100%) rename {minizip => Zip/aes}/brg_types.h (100%) rename {minizip => Zip/aes}/entropy.c (100%) rename {minizip => Zip/aes}/entropy.h (100%) rename {minizip => Zip/aes}/fileenc.c (100%) rename {minizip => Zip/aes}/fileenc.h (100%) rename {minizip => Zip/aes}/hmac.c (100%) rename {minizip => Zip/aes}/hmac.h (100%) rename {minizip => Zip/aes}/prng.c (100%) rename {minizip => Zip/aes}/prng.h (100%) rename {minizip => Zip/aes}/pwd2key.c (100%) rename {minizip => Zip/aes}/pwd2key.h (100%) rename {minizip => Zip/aes}/sha1.c (100%) rename {minizip => Zip/aes}/sha1.h (100%) rename minizip/common.h => Zip/minizip/Common.h (98%) rename {minizip => Zip/minizip}/crypt.h (100%) rename {minizip => Zip/minizip}/include.h (100%) rename {minizip => Zip/minizip}/ioapi.c (100%) rename {minizip => Zip/minizip}/ioapi.h (100%) create mode 100755 Zip/minizip/module.modulemap rename {minizip => Zip/minizip}/mztools.c (100%) rename {minizip => Zip/minizip}/mztools.h (100%) rename {minizip => Zip/minizip}/unzip.c (100%) rename {minizip => Zip/minizip}/unzip.h (99%) rename {minizip => Zip/minizip}/zip.c (100%) rename {minizip => Zip/minizip}/zip.h (100%) delete mode 100755 minizip/module.modulemap diff --git a/Zip.xcodeproj/project.pbxproj b/Zip.xcodeproj/project.pbxproj index 163d703..a981dcc 100644 --- a/Zip.xcodeproj/project.pbxproj +++ b/Zip.xcodeproj/project.pbxproj @@ -8,12 +8,43 @@ /* Begin PBXBuildFile section */ 3430F5D61C45B7FB007473A6 /* ZipHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3430F5D51C45B7FB007473A6 /* ZipHelpers.swift */; }; + 3430F6201C45C805007473A6 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3430F61F1C45C805007473A6 /* libz.tbd */; }; + 3430F62D1C45C851007473A6 /* crypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6221C45C851007473A6 /* crypt.h */; }; + 3430F62E1C45C851007473A6 /* include.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6231C45C851007473A6 /* include.h */; }; + 3430F62F1C45C851007473A6 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F6241C45C851007473A6 /* ioapi.c */; }; + 3430F6301C45C851007473A6 /* ioapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6251C45C851007473A6 /* ioapi.h */; }; + 3430F6311C45C851007473A6 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F6271C45C851007473A6 /* mztools.c */; }; + 3430F6321C45C851007473A6 /* mztools.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6281C45C851007473A6 /* mztools.h */; }; + 3430F6331C45C851007473A6 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F6291C45C851007473A6 /* unzip.c */; }; + 3430F6341C45C851007473A6 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F62A1C45C851007473A6 /* unzip.h */; }; + 3430F6351C45C851007473A6 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F62B1C45C851007473A6 /* zip.c */; }; + 3430F6361C45C851007473A6 /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F62C1C45C851007473A6 /* zip.h */; }; + 3430F6381C45C89A007473A6 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6371C45C89A007473A6 /* Common.h */; }; + 3430F64F1C45C8AD007473A6 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F63A1C45C8AD007473A6 /* aes.h */; }; + 3430F6501C45C8AD007473A6 /* aes_via_ace.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F63B1C45C8AD007473A6 /* aes_via_ace.h */; }; + 3430F6511C45C8AD007473A6 /* aescrypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F63C1C45C8AD007473A6 /* aescrypt.c */; }; + 3430F6521C45C8AD007473A6 /* aeskey.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F63D1C45C8AD007473A6 /* aeskey.c */; }; + 3430F6531C45C8AD007473A6 /* aesopt.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F63E1C45C8AD007473A6 /* aesopt.h */; }; + 3430F6541C45C8AD007473A6 /* aestab.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F63F1C45C8AD007473A6 /* aestab.c */; }; + 3430F6551C45C8AD007473A6 /* aestab.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6401C45C8AD007473A6 /* aestab.h */; }; + 3430F6561C45C8AD007473A6 /* brg_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6411C45C8AD007473A6 /* brg_endian.h */; }; + 3430F6571C45C8AD007473A6 /* brg_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6421C45C8AD007473A6 /* brg_types.h */; }; + 3430F6581C45C8AD007473A6 /* entropy.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F6431C45C8AD007473A6 /* entropy.c */; }; + 3430F6591C45C8AD007473A6 /* entropy.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6441C45C8AD007473A6 /* entropy.h */; }; + 3430F65A1C45C8AD007473A6 /* fileenc.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F6451C45C8AD007473A6 /* fileenc.c */; }; + 3430F65B1C45C8AD007473A6 /* fileenc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6461C45C8AD007473A6 /* fileenc.h */; }; + 3430F65C1C45C8AD007473A6 /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F6471C45C8AD007473A6 /* hmac.c */; }; + 3430F65D1C45C8AD007473A6 /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F6481C45C8AD007473A6 /* hmac.h */; }; + 3430F65E1C45C8AD007473A6 /* prng.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F6491C45C8AD007473A6 /* prng.c */; }; + 3430F65F1C45C8AD007473A6 /* prng.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F64A1C45C8AD007473A6 /* prng.h */; }; + 3430F6601C45C8AD007473A6 /* pwd2key.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F64B1C45C8AD007473A6 /* pwd2key.c */; }; + 3430F6611C45C8AD007473A6 /* pwd2key.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F64C1C45C8AD007473A6 /* pwd2key.h */; }; + 3430F6621C45C8AD007473A6 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 3430F64D1C45C8AD007473A6 /* sha1.c */; }; + 3430F6631C45C8AD007473A6 /* sha1.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430F64E1C45C8AD007473A6 /* sha1.h */; }; 347E3A781C1DFFB500A11FD3 /* Zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 347E3A771C1DFFB500A11FD3 /* Zip.h */; settings = {ATTRIBUTES = (Public, ); }; }; 347E3A7F1C1DFFB500A11FD3 /* Zip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 347E3A741C1DFFB500A11FD3 /* Zip.framework */; }; 347E3A841C1DFFB500A11FD3 /* ZipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E3A831C1DFFB500A11FD3 /* ZipTests.swift */; }; 347E3AD81C1E04C900A11FD3 /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E3AD71C1E04C900A11FD3 /* Zip.swift */; }; - 347E3B1F1C1E1CB500A11FD3 /* libz.1.2.5.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 347E3B1E1C1E1CB500A11FD3 /* libz.1.2.5.tbd */; }; - 347E3B6B1C1E24D300A11FD3 /* minizip in Resources */ = {isa = PBXBuildFile; fileRef = 347E3B6A1C1E24D300A11FD3 /* minizip */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -28,6 +59,40 @@ /* Begin PBXFileReference section */ 3430F5D51C45B7FB007473A6 /* ZipHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZipHelpers.swift; sourceTree = ""; }; + 3430F61F1C45C805007473A6 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 3430F6221C45C851007473A6 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = ""; }; + 3430F6231C45C851007473A6 /* include.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = include.h; sourceTree = ""; }; + 3430F6241C45C851007473A6 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = ""; }; + 3430F6251C45C851007473A6 /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = ""; }; + 3430F6261C45C851007473A6 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; + 3430F6271C45C851007473A6 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = ""; }; + 3430F6281C45C851007473A6 /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = ""; }; + 3430F6291C45C851007473A6 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = ""; }; + 3430F62A1C45C851007473A6 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = ""; }; + 3430F62B1C45C851007473A6 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = ""; }; + 3430F62C1C45C851007473A6 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = ""; }; + 3430F6371C45C89A007473A6 /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = ""; }; + 3430F63A1C45C8AD007473A6 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = ""; }; + 3430F63B1C45C8AD007473A6 /* aes_via_ace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes_via_ace.h; sourceTree = ""; }; + 3430F63C1C45C8AD007473A6 /* aescrypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aescrypt.c; sourceTree = ""; }; + 3430F63D1C45C8AD007473A6 /* aeskey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aeskey.c; sourceTree = ""; }; + 3430F63E1C45C8AD007473A6 /* aesopt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aesopt.h; sourceTree = ""; }; + 3430F63F1C45C8AD007473A6 /* aestab.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aestab.c; sourceTree = ""; }; + 3430F6401C45C8AD007473A6 /* aestab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aestab.h; sourceTree = ""; }; + 3430F6411C45C8AD007473A6 /* brg_endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = brg_endian.h; sourceTree = ""; }; + 3430F6421C45C8AD007473A6 /* brg_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = brg_types.h; sourceTree = ""; }; + 3430F6431C45C8AD007473A6 /* entropy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = entropy.c; sourceTree = ""; }; + 3430F6441C45C8AD007473A6 /* entropy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entropy.h; sourceTree = ""; }; + 3430F6451C45C8AD007473A6 /* fileenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fileenc.c; sourceTree = ""; }; + 3430F6461C45C8AD007473A6 /* fileenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileenc.h; sourceTree = ""; }; + 3430F6471C45C8AD007473A6 /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hmac.c; sourceTree = ""; }; + 3430F6481C45C8AD007473A6 /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = ""; }; + 3430F6491C45C8AD007473A6 /* prng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = prng.c; sourceTree = ""; }; + 3430F64A1C45C8AD007473A6 /* prng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prng.h; sourceTree = ""; }; + 3430F64B1C45C8AD007473A6 /* pwd2key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pwd2key.c; sourceTree = ""; }; + 3430F64C1C45C8AD007473A6 /* pwd2key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pwd2key.h; sourceTree = ""; }; + 3430F64D1C45C8AD007473A6 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = ""; }; + 3430F64E1C45C8AD007473A6 /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = ""; }; 347E3A741C1DFFB500A11FD3 /* Zip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Zip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 347E3A771C1DFFB500A11FD3 /* Zip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Zip.h; sourceTree = ""; }; 347E3A791C1DFFB500A11FD3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -36,7 +101,6 @@ 347E3A851C1DFFB500A11FD3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 347E3AD71C1E04C900A11FD3 /* Zip.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Zip.swift; sourceTree = ""; }; 347E3B1E1C1E1CB500A11FD3 /* libz.1.2.5.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.2.5.tbd; path = usr/lib/libz.1.2.5.tbd; sourceTree = SDKROOT; }; - 347E3B6A1C1E24D300A11FD3 /* minizip */ = {isa = PBXFileReference; lastKnownFileType = folder; path = minizip; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -44,7 +108,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 347E3B1F1C1E1CB500A11FD3 /* libz.1.2.5.tbd in Frameworks */, + 3430F6201C45C805007473A6 /* libz.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -59,9 +123,57 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3430F6211C45C83F007473A6 /* minizip */ = { + isa = PBXGroup; + children = ( + 3430F6371C45C89A007473A6 /* Common.h */, + 3430F6221C45C851007473A6 /* crypt.h */, + 3430F6231C45C851007473A6 /* include.h */, + 3430F6241C45C851007473A6 /* ioapi.c */, + 3430F6251C45C851007473A6 /* ioapi.h */, + 3430F6261C45C851007473A6 /* module.modulemap */, + 3430F6271C45C851007473A6 /* mztools.c */, + 3430F6281C45C851007473A6 /* mztools.h */, + 3430F6291C45C851007473A6 /* unzip.c */, + 3430F62A1C45C851007473A6 /* unzip.h */, + 3430F62B1C45C851007473A6 /* zip.c */, + 3430F62C1C45C851007473A6 /* zip.h */, + ); + path = minizip; + sourceTree = ""; + }; + 3430F6391C45C8AD007473A6 /* aes */ = { + isa = PBXGroup; + children = ( + 3430F63A1C45C8AD007473A6 /* aes.h */, + 3430F63B1C45C8AD007473A6 /* aes_via_ace.h */, + 3430F63C1C45C8AD007473A6 /* aescrypt.c */, + 3430F63D1C45C8AD007473A6 /* aeskey.c */, + 3430F63E1C45C8AD007473A6 /* aesopt.h */, + 3430F63F1C45C8AD007473A6 /* aestab.c */, + 3430F6401C45C8AD007473A6 /* aestab.h */, + 3430F6411C45C8AD007473A6 /* brg_endian.h */, + 3430F6421C45C8AD007473A6 /* brg_types.h */, + 3430F6431C45C8AD007473A6 /* entropy.c */, + 3430F6441C45C8AD007473A6 /* entropy.h */, + 3430F6451C45C8AD007473A6 /* fileenc.c */, + 3430F6461C45C8AD007473A6 /* fileenc.h */, + 3430F6471C45C8AD007473A6 /* hmac.c */, + 3430F6481C45C8AD007473A6 /* hmac.h */, + 3430F6491C45C8AD007473A6 /* prng.c */, + 3430F64A1C45C8AD007473A6 /* prng.h */, + 3430F64B1C45C8AD007473A6 /* pwd2key.c */, + 3430F64C1C45C8AD007473A6 /* pwd2key.h */, + 3430F64D1C45C8AD007473A6 /* sha1.c */, + 3430F64E1C45C8AD007473A6 /* sha1.h */, + ); + path = aes; + sourceTree = ""; + }; 347E3A6A1C1DFFB500A11FD3 = { isa = PBXGroup; children = ( + 3430F61F1C45C805007473A6 /* libz.tbd */, 347E3A761C1DFFB500A11FD3 /* Zip */, 347E3A821C1DFFB500A11FD3 /* ZipTests */, 347E3A751C1DFFB500A11FD3 /* Products */, @@ -80,7 +192,8 @@ 347E3A761C1DFFB500A11FD3 /* Zip */ = { isa = PBXGroup; children = ( - 347E3B6A1C1E24D300A11FD3 /* minizip */, + 3430F6391C45C8AD007473A6 /* aes */, + 3430F6211C45C83F007473A6 /* minizip */, 347E3B1E1C1E1CB500A11FD3 /* libz.1.2.5.tbd */, 347E3A771C1DFFB500A11FD3 /* Zip.h */, 347E3A791C1DFFB500A11FD3 /* Info.plist */, @@ -106,7 +219,26 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 3430F65D1C45C8AD007473A6 /* hmac.h in Headers */, + 3430F65F1C45C8AD007473A6 /* prng.h in Headers */, + 3430F6561C45C8AD007473A6 /* brg_endian.h in Headers */, 347E3A781C1DFFB500A11FD3 /* Zip.h in Headers */, + 3430F6361C45C851007473A6 /* zip.h in Headers */, + 3430F6631C45C8AD007473A6 /* sha1.h in Headers */, + 3430F6551C45C8AD007473A6 /* aestab.h in Headers */, + 3430F62D1C45C851007473A6 /* crypt.h in Headers */, + 3430F65B1C45C8AD007473A6 /* fileenc.h in Headers */, + 3430F62E1C45C851007473A6 /* include.h in Headers */, + 3430F6341C45C851007473A6 /* unzip.h in Headers */, + 3430F6531C45C8AD007473A6 /* aesopt.h in Headers */, + 3430F6591C45C8AD007473A6 /* entropy.h in Headers */, + 3430F6301C45C851007473A6 /* ioapi.h in Headers */, + 3430F64F1C45C8AD007473A6 /* aes.h in Headers */, + 3430F6501C45C8AD007473A6 /* aes_via_ace.h in Headers */, + 3430F6611C45C8AD007473A6 /* pwd2key.h in Headers */, + 3430F6321C45C851007473A6 /* mztools.h in Headers */, + 3430F6571C45C8AD007473A6 /* brg_types.h in Headers */, + 3430F6381C45C89A007473A6 /* Common.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -190,7 +322,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 347E3B6B1C1E24D300A11FD3 /* minizip in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -208,8 +339,21 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3430F6621C45C8AD007473A6 /* sha1.c in Sources */, + 3430F65E1C45C8AD007473A6 /* prng.c in Sources */, + 3430F65C1C45C8AD007473A6 /* hmac.c in Sources */, + 3430F62F1C45C851007473A6 /* ioapi.c in Sources */, + 3430F6331C45C851007473A6 /* unzip.c in Sources */, 347E3AD81C1E04C900A11FD3 /* Zip.swift in Sources */, + 3430F6581C45C8AD007473A6 /* entropy.c in Sources */, + 3430F6521C45C8AD007473A6 /* aeskey.c in Sources */, + 3430F6541C45C8AD007473A6 /* aestab.c in Sources */, + 3430F6351C45C851007473A6 /* zip.c in Sources */, + 3430F6311C45C851007473A6 /* mztools.c in Sources */, + 3430F6511C45C8AD007473A6 /* aescrypt.c in Sources */, 3430F5D61C45B7FB007473A6 /* ZipHelpers.swift in Sources */, + 3430F6601C45C8AD007473A6 /* pwd2key.c in Sources */, + 3430F65A1C45C8AD007473A6 /* fileenc.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -340,7 +484,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.Zip; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_INCLUDE_PATHS = "${SRCROOT}/zlib/** ${SRCROOT}/minizip/**"; + SWIFT_INCLUDE_PATHS = "${SRCROOT}/zlib/** ${SRCROOT}/Zip/minizip/**"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; @@ -364,7 +508,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.Zip; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_INCLUDE_PATHS = "${SRCROOT}/zlib/** ${SRCROOT}/minizip/**"; + SWIFT_INCLUDE_PATHS = "${SRCROOT}/zlib/** ${SRCROOT}/Zip/minizip/**"; }; name = Release; }; diff --git a/Zip/Zip.swift b/Zip/Zip.swift index 00ea3ad..debb448 100644 --- a/Zip/Zip.swift +++ b/Zip/Zip.swift @@ -29,8 +29,6 @@ public class Zip { guard let zip: zipFile = unzOpen(path) else { throw ZipError.UnzipError } - let fileAttributes = try NSFileManager.defaultManager().attributesOfItemAtPath(path) - let fileSize = fileAttributes[NSFileSize] var currentPosition = 0.0 var globalInfo: unz_global_info = unz_global_info(number_entry: 0, number_disk_with_CD: 0, size_comment: 0) unzGetGlobalInfo(zip, &globalInfo) @@ -38,14 +36,12 @@ public class Zip { if unzGoToFirstFile(zip) != UNZ_OK { throw ZipError.UnzipError } - let canceled = false var ret: Int32 = 0 var crc_ret: Int32 = 0 let bufferSize = 4096 var buffer = Array(count: bufferSize, repeatedValue: 0) let fileManager = NSFileManager.defaultManager() - var directoriesModificationDates = NSMutableSet() if let password = password where password.characters.count > 0 { ret = unzOpenCurrentFilePassword(zip, password.cStringUsingEncoding(NSASCIIStringEncoding)!) } diff --git a/minizip/aes.h b/Zip/aes/aes.h similarity index 100% rename from minizip/aes.h rename to Zip/aes/aes.h diff --git a/minizip/aes_via_ace.h b/Zip/aes/aes_via_ace.h similarity index 100% rename from minizip/aes_via_ace.h rename to Zip/aes/aes_via_ace.h diff --git a/minizip/aescrypt.c b/Zip/aes/aescrypt.c similarity index 100% rename from minizip/aescrypt.c rename to Zip/aes/aescrypt.c diff --git a/minizip/aeskey.c b/Zip/aes/aeskey.c similarity index 100% rename from minizip/aeskey.c rename to Zip/aes/aeskey.c diff --git a/minizip/aesopt.h b/Zip/aes/aesopt.h similarity index 100% rename from minizip/aesopt.h rename to Zip/aes/aesopt.h diff --git a/minizip/aestab.c b/Zip/aes/aestab.c similarity index 100% rename from minizip/aestab.c rename to Zip/aes/aestab.c diff --git a/minizip/aestab.h b/Zip/aes/aestab.h similarity index 100% rename from minizip/aestab.h rename to Zip/aes/aestab.h diff --git a/minizip/brg_endian.h b/Zip/aes/brg_endian.h similarity index 100% rename from minizip/brg_endian.h rename to Zip/aes/brg_endian.h diff --git a/minizip/brg_types.h b/Zip/aes/brg_types.h similarity index 100% rename from minizip/brg_types.h rename to Zip/aes/brg_types.h diff --git a/minizip/entropy.c b/Zip/aes/entropy.c similarity index 100% rename from minizip/entropy.c rename to Zip/aes/entropy.c diff --git a/minizip/entropy.h b/Zip/aes/entropy.h similarity index 100% rename from minizip/entropy.h rename to Zip/aes/entropy.h diff --git a/minizip/fileenc.c b/Zip/aes/fileenc.c similarity index 100% rename from minizip/fileenc.c rename to Zip/aes/fileenc.c diff --git a/minizip/fileenc.h b/Zip/aes/fileenc.h similarity index 100% rename from minizip/fileenc.h rename to Zip/aes/fileenc.h diff --git a/minizip/hmac.c b/Zip/aes/hmac.c similarity index 100% rename from minizip/hmac.c rename to Zip/aes/hmac.c diff --git a/minizip/hmac.h b/Zip/aes/hmac.h similarity index 100% rename from minizip/hmac.h rename to Zip/aes/hmac.h diff --git a/minizip/prng.c b/Zip/aes/prng.c similarity index 100% rename from minizip/prng.c rename to Zip/aes/prng.c diff --git a/minizip/prng.h b/Zip/aes/prng.h similarity index 100% rename from minizip/prng.h rename to Zip/aes/prng.h diff --git a/minizip/pwd2key.c b/Zip/aes/pwd2key.c similarity index 100% rename from minizip/pwd2key.c rename to Zip/aes/pwd2key.c diff --git a/minizip/pwd2key.h b/Zip/aes/pwd2key.h similarity index 100% rename from minizip/pwd2key.h rename to Zip/aes/pwd2key.h diff --git a/minizip/sha1.c b/Zip/aes/sha1.c similarity index 100% rename from minizip/sha1.c rename to Zip/aes/sha1.c diff --git a/minizip/sha1.h b/Zip/aes/sha1.h similarity index 100% rename from minizip/sha1.h rename to Zip/aes/sha1.h diff --git a/minizip/common.h b/Zip/minizip/Common.h similarity index 98% rename from minizip/common.h rename to Zip/minizip/Common.h index fa3d027..7a92f13 100755 --- a/minizip/common.h +++ b/Zip/minizip/Common.h @@ -1,5 +1,5 @@ -#ifndef ZipCommon -#define ZipCommon +#ifndef SSZipCommon +#define SSZipCommon /* tm_unz contain date/time info */ typedef struct tm_unz_s diff --git a/minizip/crypt.h b/Zip/minizip/crypt.h similarity index 100% rename from minizip/crypt.h rename to Zip/minizip/crypt.h diff --git a/minizip/include.h b/Zip/minizip/include.h similarity index 100% rename from minizip/include.h rename to Zip/minizip/include.h diff --git a/minizip/ioapi.c b/Zip/minizip/ioapi.c similarity index 100% rename from minizip/ioapi.c rename to Zip/minizip/ioapi.c diff --git a/minizip/ioapi.h b/Zip/minizip/ioapi.h similarity index 100% rename from minizip/ioapi.h rename to Zip/minizip/ioapi.h diff --git a/Zip/minizip/module.modulemap b/Zip/minizip/module.modulemap new file mode 100755 index 0000000..45a6e58 --- /dev/null +++ b/Zip/minizip/module.modulemap @@ -0,0 +1,5 @@ +module minizip [system][extern_c] { + header "unzip.h" + header "zip.h" + export * +} diff --git a/minizip/mztools.c b/Zip/minizip/mztools.c similarity index 100% rename from minizip/mztools.c rename to Zip/minizip/mztools.c diff --git a/minizip/mztools.h b/Zip/minizip/mztools.h similarity index 100% rename from minizip/mztools.h rename to Zip/minizip/mztools.h diff --git a/minizip/unzip.c b/Zip/minizip/unzip.c similarity index 100% rename from minizip/unzip.c rename to Zip/minizip/unzip.c diff --git a/minizip/unzip.h b/Zip/minizip/unzip.h similarity index 99% rename from minizip/unzip.h rename to Zip/minizip/unzip.h index 58dd0d1..02c4c58 100755 --- a/minizip/unzip.h +++ b/Zip/minizip/unzip.h @@ -14,7 +14,7 @@ See the accompanying LICENSE file for the full text of the license. */ -#include "common.h" +#include "Common.h" #ifndef _UNZ_H #define _UNZ_H diff --git a/minizip/zip.c b/Zip/minizip/zip.c similarity index 100% rename from minizip/zip.c rename to Zip/minizip/zip.c diff --git a/minizip/zip.h b/Zip/minizip/zip.h similarity index 100% rename from minizip/zip.h rename to Zip/minizip/zip.h diff --git a/minizip/module.modulemap b/minizip/module.modulemap deleted file mode 100755 index 7b7c412..0000000 --- a/minizip/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module minizip [system] { - header "include.h" - export * -} -- 2.26.2