From 7610d575190d26a26100cc107bcb7d18e3f9aa3a Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Thu, 25 Jun 2015 18:26:36 -0400 Subject: [PATCH 01/38] Switched from static library to framework for the Mac target --- Other/UnrarKit_Prefix.pch | 4 - UnrarKit.xcodeproj/project.pbxproj | 756 +++++++++--------- .../xcshareddata/xcschemes/UnrarKit.xcscheme | 42 +- 3 files changed, 406 insertions(+), 396 deletions(-) delete mode 100644 Other/UnrarKit_Prefix.pch diff --git a/Other/UnrarKit_Prefix.pch b/Other/UnrarKit_Prefix.pch deleted file mode 100644 index e9b004b..0000000 --- a/Other/UnrarKit_Prefix.pch +++ /dev/null @@ -1,4 +0,0 @@ -// -// Prefix header for all source files of the 'CocoaTouchStaticLibrary' target in the 'CocoaTouchStaticLibrary' project. -// - diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index c344b61..3777295 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -57,118 +57,69 @@ 960F66A419EDDC2600512951 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 960F66A519EDDC2600512951 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 960F66A619EDDC2600512951 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FDF19ED925E00DAF8F1 /* sha256.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCF19ED8BB200DAF8F1 /* sha256.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FE019ED926F00DAF8F1 /* blake2s.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FB419ED8A8200DAF8F1 /* blake2s.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FE119ED928C00DAF8F1 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC419ED8B0400DAF8F1 /* hash.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FE219ED92B700DAF8F1 /* headers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC619ED8B1F00DAF8F1 /* headers.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FE319ED92C400DAF8F1 /* threadpool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD219ED8C6100DAF8F1 /* threadpool.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FE419ED92D800DAF8F1 /* rs16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCD19ED8B9700DAF8F1 /* rs16.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FE519ED92E000DAF8F1 /* ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD419ED8C8000DAF8F1 /* ui.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FE619ED931100DAF8F1 /* filestr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2A18DB722E00B5651B /* filestr.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96370FE719ED931A00DAF8F1 /* recvol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5918DB722E00B5651B /* recvol.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FE819ED932200DAF8F1 /* rs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5F18DB722E00B5651B /* rs.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96370FE919ED932900DAF8F1 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96370FEA19ED933100DAF8F1 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96370FEB19ED934B00DAF8F1 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; 964547D21B384F7D00202B28 /* URKArchiveTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 964547D11B384F7D00202B28 /* URKArchiveTestCase.m */; }; 964C8AC718D28EE000AD7321 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AC518D28EE000AD7321 /* InfoPlist.strings */; }; 9660D7AF1A3F4FF90059AC1E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9660D7AE1A3F4FF90059AC1E /* libz.dylib */; }; - 9685413218DBA13200B5651B /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; - 9685413318DBA16300B5651B /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0818DB722E00B5651B /* archive.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685413418DBA16300B5651B /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 9685413618DBA16300B5651B /* cmddata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0D18DB722E00B5651B /* cmddata.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685413818DBA16300B5651B /* consio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1218DB722E00B5651B /* consio.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685413918DBA16300B5651B /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1418DB722E00B5651B /* crc.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685413A18DBA16300B5651B /* crypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1618DB722E00B5651B /* crypt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685413C18DBA16300B5651B /* encname.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1C18DB722E00B5651B /* encname.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685413D18DBA16300B5651B /* errhnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1E18DB722E00B5651B /* errhnd.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685413E18DBA16300B5651B /* extinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2018DB722E00B5651B /* extinfo.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685413F18DBA16300B5651B /* extract.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2218DB722E00B5651B /* extract.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414018DBA16300B5651B /* filcreat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2418DB722E00B5651B /* filcreat.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414118DBA16300B5651B /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 9685414218DBA16300B5651B /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2818DB722E00B5651B /* filefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414418DBA16300B5651B /* find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2C18DB722E00B5651B /* find.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414518DBA16300B5651B /* getbits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2E18DB722E00B5651B /* getbits.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414618DBA16300B5651B /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3018DB722E00B5651B /* global.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414718DBA16300B5651B /* isnt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3318DB722E00B5651B /* isnt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414818DBA16300B5651B /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3618DB722E00B5651B /* list.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414A18DBA16300B5651B /* match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3F18DB722E00B5651B /* match.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414C18DBA16300B5651B /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4418DB722E00B5651B /* options.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685414E18DBA16300B5651B /* pathfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4818DB722E00B5651B /* pathfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 9685414F18DBA16300B5651B /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685415118DBA16300B5651B /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 9685415318DBA16300B5651B /* rawread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5418DB722E00B5651B /* rawread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685415418DBA16300B5651B /* rdwrfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5618DB722E00B5651B /* rdwrfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685415618DBA16300B5651B /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5B18DB722E00B5651B /* resource.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685415718DBA16300B5651B /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 9685415B18DBA16300B5651B /* secpassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6518DB722E00B5651B /* secpassword.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685415C18DBA16300B5651B /* sha1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6718DB722E00B5651B /* sha1.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685415D18DBA16300B5651B /* smallfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6918DB722E00B5651B /* smallfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685415E18DBA16300B5651B /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685415F18DBA16300B5651B /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 9685416118DBA16300B5651B /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7118DB722E00B5651B /* system.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685416218DBA16300B5651B /* timefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7318DB722E00B5651B /* timefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685416418DBA16300B5651B /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7718DB722E00B5651B /* unicode.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685416618DBA16300B5651B /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7A18DB722E00B5651B /* unpack.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685416A18DBA16300B5651B /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F8218DB722F00B5651B /* volume.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 9685417018DBA43A00B5651B /* URKArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 489CFA0E128B5169005DCC2A /* URKArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417118DBA58F00B5651B /* archive.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0918DB722E00B5651B /* archive.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417218DBA58F00B5651B /* array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0B18DB722E00B5651B /* array.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417318DBA58F00B5651B /* cmddata.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0E18DB722E00B5651B /* cmddata.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417418DBA58F00B5651B /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1018DB722E00B5651B /* coder.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417518DBA58F00B5651B /* compress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1118DB722E00B5651B /* compress.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417618DBA58F00B5651B /* consio.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1318DB722E00B5651B /* consio.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417718DBA58F00B5651B /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1518DB722E00B5651B /* crc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417818DBA58F00B5651B /* crypt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1718DB722E00B5651B /* crypt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417918DBA58F00B5651B /* dll.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1A18DB722E00B5651B /* dll.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417A18DBA58F00B5651B /* encname.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1D18DB722E00B5651B /* encname.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417B18DBA58F00B5651B /* errhnd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1F18DB722E00B5651B /* errhnd.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417C18DBA58F00B5651B /* extinfo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2118DB722E00B5651B /* extinfo.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417D18DBA58F00B5651B /* extract.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2318DB722E00B5651B /* extract.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417E18DBA58F00B5651B /* filcreat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2518DB722E00B5651B /* filcreat.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685417F18DBA58F00B5651B /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2718DB722E00B5651B /* file.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418018DBA58F00B5651B /* filefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2918DB722E00B5651B /* filefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418118DBA58F00B5651B /* filestr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2B18DB722E00B5651B /* filestr.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418218DBA58F00B5651B /* find.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2D18DB722E00B5651B /* find.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418318DBA58F00B5651B /* getbits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2F18DB722E00B5651B /* getbits.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418418DBA58F00B5651B /* global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3118DB722E00B5651B /* global.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418518DBA58F00B5651B /* headers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3218DB722E00B5651B /* headers.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418618DBA58F00B5651B /* isnt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3418DB722E00B5651B /* isnt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418718DBA58F00B5651B /* list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3718DB722E00B5651B /* list.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418818DBA58F00B5651B /* loclang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3818DB722E00B5651B /* loclang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418918DBA58F00B5651B /* log.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3A18DB722E00B5651B /* log.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418A18DBA58F00B5651B /* match.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4018DB722E00B5651B /* match.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418B18DBA58F00B5651B /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4218DB722E00B5651B /* model.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418C18DBA58F00B5651B /* options.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4518DB722E00B5651B /* options.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418D18DBA58F00B5651B /* os.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4618DB722E00B5651B /* os.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418E18DBA58F00B5651B /* pathfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4918DB722E00B5651B /* pathfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685418F18DBA58F00B5651B /* rar.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4B18DB722E00B5651B /* rar.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419018DBA58F00B5651B /* rardefs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4C18DB722E00B5651B /* rardefs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419118DBA58F00B5651B /* rarlang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4D18DB722E00B5651B /* rarlang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419218DBA58F00B5651B /* raros.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4E18DB722E00B5651B /* raros.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419318DBA58F00B5651B /* rartypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5018DB722E00B5651B /* rartypes.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419418DBA58F00B5651B /* rarvm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5218DB722E00B5651B /* rarvm.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419518DBA58F00B5651B /* rawread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5518DB722E00B5651B /* rawread.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419618DBA58F00B5651B /* rdwrfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5718DB722E00B5651B /* rdwrfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419718DBA58F00B5651B /* recvol.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5A18DB722E00B5651B /* recvol.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419818DBA58F00B5651B /* resource.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5C18DB722E00B5651B /* resource.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419918DBA58F00B5651B /* rijndael.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5E18DB722E00B5651B /* rijndael.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419A18DBA58F00B5651B /* rs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6018DB722E00B5651B /* rs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419B18DBA58F00B5651B /* savepos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6218DB722E00B5651B /* savepos.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419C18DBA58F00B5651B /* scantree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6418DB722E00B5651B /* scantree.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419D18DBA58F00B5651B /* secpassword.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6618DB722E00B5651B /* secpassword.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419E18DBA58F00B5651B /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6818DB722E00B5651B /* sha1.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9685419F18DBA58F00B5651B /* smallfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6A18DB722E00B5651B /* smallfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A018DBA58F00B5651B /* strfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6C18DB722E00B5651B /* strfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A118DBA58F00B5651B /* strlist.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6E18DB722E00B5651B /* strlist.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A218DBA58F00B5651B /* suballoc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7018DB722E00B5651B /* suballoc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A318DBA58F00B5651B /* system.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7218DB722E00B5651B /* system.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A418DBA58F00B5651B /* timefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7418DB722E00B5651B /* timefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A518DBA58F00B5651B /* ulinks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7618DB722E00B5651B /* ulinks.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A618DBA58F00B5651B /* unicode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7818DB722E00B5651B /* unicode.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A718DBA58F00B5651B /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A818DBA58F00B5651B /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 968541A918DBA58F00B5651B /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F91D1B3CB4D000B6D373 /* URKArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 489CFA0E128B5169005DCC2A /* URKArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F91E1B3CB4D000B6D373 /* URKFileInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FCD4691A3262E5003612BF /* URKFileInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F91F1B3CB4D000B6D373 /* UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 969F17361A60297700665453 /* UnrarKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9201B3CB4D000B6D373 /* archive.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0918DB722E00B5651B /* archive.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9211B3CB4D000B6D373 /* array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0B18DB722E00B5651B /* array.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9221B3CB4D000B6D373 /* cmddata.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0E18DB722E00B5651B /* cmddata.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9231B3CB4D000B6D373 /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1018DB722E00B5651B /* coder.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9241B3CB4D000B6D373 /* compress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1118DB722E00B5651B /* compress.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9251B3CB4D000B6D373 /* consio.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1318DB722E00B5651B /* consio.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9261B3CB4D000B6D373 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1518DB722E00B5651B /* crc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9271B3CB4D000B6D373 /* crypt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1718DB722E00B5651B /* crypt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9281B3CB4D000B6D373 /* dll.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1A18DB722E00B5651B /* dll.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9291B3CB4D000B6D373 /* encname.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1D18DB722E00B5651B /* encname.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F92A1B3CB4D000B6D373 /* errhnd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1F18DB722E00B5651B /* errhnd.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F92B1B3CB4D000B6D373 /* extinfo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2118DB722E00B5651B /* extinfo.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F92C1B3CB4D000B6D373 /* extract.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2318DB722E00B5651B /* extract.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F92D1B3CB4D000B6D373 /* filcreat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2518DB722E00B5651B /* filcreat.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F92E1B3CB4D000B6D373 /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2718DB722E00B5651B /* file.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F92F1B3CB4D000B6D373 /* filefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2918DB722E00B5651B /* filefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9301B3CB4D000B6D373 /* filestr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2B18DB722E00B5651B /* filestr.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9311B3CB4D000B6D373 /* find.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2D18DB722E00B5651B /* find.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9321B3CB4D000B6D373 /* getbits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2F18DB722E00B5651B /* getbits.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9331B3CB4D000B6D373 /* global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3118DB722E00B5651B /* global.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9341B3CB4D000B6D373 /* headers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3218DB722E00B5651B /* headers.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9351B3CB4D000B6D373 /* isnt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3418DB722E00B5651B /* isnt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9361B3CB4D000B6D373 /* list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3718DB722E00B5651B /* list.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9371B3CB4D000B6D373 /* loclang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3818DB722E00B5651B /* loclang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9381B3CB4D000B6D373 /* log.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3A18DB722E00B5651B /* log.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9391B3CB4D000B6D373 /* match.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4018DB722E00B5651B /* match.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F93A1B3CB4D000B6D373 /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4218DB722E00B5651B /* model.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F93B1B3CB4D000B6D373 /* options.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4518DB722E00B5651B /* options.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F93C1B3CB4D000B6D373 /* os.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4618DB722E00B5651B /* os.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F93D1B3CB4D000B6D373 /* pathfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4918DB722E00B5651B /* pathfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F93E1B3CB4D000B6D373 /* rar.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4B18DB722E00B5651B /* rar.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F93F1B3CB4D000B6D373 /* rardefs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4C18DB722E00B5651B /* rardefs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9401B3CB4D000B6D373 /* rarlang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4D18DB722E00B5651B /* rarlang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9411B3CB4D000B6D373 /* raros.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4E18DB722E00B5651B /* raros.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9421B3CB4D000B6D373 /* rartypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5018DB722E00B5651B /* rartypes.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9431B3CB4D000B6D373 /* rarvm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5218DB722E00B5651B /* rarvm.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9441B3CB4D000B6D373 /* rawread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5518DB722E00B5651B /* rawread.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9451B3CB4D000B6D373 /* rdwrfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5718DB722E00B5651B /* rdwrfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9461B3CB4D000B6D373 /* recvol.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5A18DB722E00B5651B /* recvol.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9471B3CB4D000B6D373 /* resource.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5C18DB722E00B5651B /* resource.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9481B3CB4D000B6D373 /* rijndael.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5E18DB722E00B5651B /* rijndael.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9491B3CB4D000B6D373 /* rs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6018DB722E00B5651B /* rs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F94B1B3CB4D000B6D373 /* savepos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6218DB722E00B5651B /* savepos.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F94C1B3CB4D000B6D373 /* scantree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6418DB722E00B5651B /* scantree.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F94D1B3CB4D000B6D373 /* secpassword.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6618DB722E00B5651B /* secpassword.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F94E1B3CB4D000B6D373 /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6818DB722E00B5651B /* sha1.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F94F1B3CB4D000B6D373 /* smallfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6A18DB722E00B5651B /* smallfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9501B3CB4D000B6D373 /* strfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6C18DB722E00B5651B /* strfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9511B3CB4D000B6D373 /* strlist.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6E18DB722E00B5651B /* strlist.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9521B3CB4D000B6D373 /* suballoc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7018DB722E00B5651B /* suballoc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9531B3CB4D000B6D373 /* system.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7218DB722E00B5651B /* system.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9541B3CB4D000B6D373 /* timefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7418DB722E00B5651B /* timefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9551B3CB4D000B6D373 /* ulinks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7618DB722E00B5651B /* ulinks.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9561B3CB4D000B6D373 /* unicode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7818DB722E00B5651B /* unicode.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9571B3CB4D000B6D373 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9581B3CB4D000B6D373 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9591B3CB4D000B6D373 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 969BD9B019EDE88E002CE755 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; }; 969BD9B119EDE88E002CE755 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; 969BD9B219EDE88E002CE755 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; }; @@ -278,11 +229,8 @@ 969BDA1E19EDE88E002CE755 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 969BDA1F19EDE88E002CE755 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 969BDA2019EDE88E002CE755 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969F17371A6029E000665453 /* UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 969F17361A60297700665453 /* UnrarKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; 969F17381A6029E700665453 /* UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 969F17361A60297700665453 /* UnrarKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 96DBF7F91A3F72800033B759 /* NSString+UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 96DBF7F71A3F72800033B759 /* NSString+UnrarKit.h */; }; 96DBF7FA1A3F72800033B759 /* NSString+UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 96DBF7F71A3F72800033B759 /* NSString+UnrarKit.h */; }; - 96DBF7FB1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96DBF7FC1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96DBF7FD1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96E5D345198B333200A74340 /* Test Data in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AD018D28F1600AD7321 /* Test Data */; }; @@ -291,6 +239,59 @@ 96EA53331B3B462D00F79DC6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96EA53321B3B462D00F79DC6 /* AppDelegate.swift */; }; 96EA53501B3B4A0500F79DC6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96EA53361B3B462D00F79DC6 /* Main.storyboard */; }; 96EA53511B3B4A0800F79DC6 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96EA533B1B3B462D00F79DC6 /* LaunchScreen.xib */; }; + 96EA53781B3CB2C700F79DC6 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53791B3CB2C700F79DC6 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA537A1B3CB2C700F79DC6 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA537B1B3CB2C700F79DC6 /* pathfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4818DB722E00B5651B /* pathfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA537C1B3CB2C700F79DC6 /* smallfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6918DB722E00B5651B /* smallfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA537D1B3CB2C700F79DC6 /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3018DB722E00B5651B /* global.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA537E1B3CB2C700F79DC6 /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; + 96EA537F1B3CB2C700F79DC6 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53801B3CB2C700F79DC6 /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2818DB722E00B5651B /* filefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53811B3CB2C700F79DC6 /* filcreat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2418DB722E00B5651B /* filcreat.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53821B3CB2C700F79DC6 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0818DB722E00B5651B /* archive.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53831B3CB2C700F79DC6 /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53841B3CB2C700F79DC6 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7718DB722E00B5651B /* unicode.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53851B3CB2C700F79DC6 /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7118DB722E00B5651B /* system.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53861B3CB2C700F79DC6 /* isnt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3318DB722E00B5651B /* isnt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53871B3CB2C700F79DC6 /* crypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1618DB722E00B5651B /* crypt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53881B3CB2C700F79DC6 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1418DB722E00B5651B /* crc.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53891B3CB2C700F79DC6 /* rawread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5418DB722E00B5651B /* rawread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA538A1B3CB2C700F79DC6 /* encname.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1C18DB722E00B5651B /* encname.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA538B1B3CB2C700F79DC6 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5B18DB722E00B5651B /* resource.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA538C1B3CB2C700F79DC6 /* match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3F18DB722E00B5651B /* match.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA538D1B3CB2C700F79DC6 /* timefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7318DB722E00B5651B /* timefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA538E1B3CB2C700F79DC6 /* rdwrfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5618DB722E00B5651B /* rdwrfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA538F1B3CB2C700F79DC6 /* consio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1218DB722E00B5651B /* consio.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53901B3CB2C700F79DC6 /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4418DB722E00B5651B /* options.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53911B3CB2C700F79DC6 /* errhnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1E18DB722E00B5651B /* errhnd.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53921B3CB2C700F79DC6 /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53931B3CB2C700F79DC6 /* secpassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6518DB722E00B5651B /* secpassword.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53941B3CB2C700F79DC6 /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53951B3CB2C700F79DC6 /* getbits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2E18DB722E00B5651B /* getbits.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53961B3CB2C700F79DC6 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; + 96EA53971B3CB2C700F79DC6 /* sha1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6718DB722E00B5651B /* sha1.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53981B3CB2C700F79DC6 /* sha256.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCF19ED8BB200DAF8F1 /* sha256.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53991B3CB2C700F79DC6 /* blake2s.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FB419ED8A8200DAF8F1 /* blake2s.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA539A1B3CB2C700F79DC6 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC419ED8B0400DAF8F1 /* hash.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA539B1B3CB2C700F79DC6 /* extinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2018DB722E00B5651B /* extinfo.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA539C1B3CB2C700F79DC6 /* extract.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2218DB722E00B5651B /* extract.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA539D1B3CB2C700F79DC6 /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F8218DB722F00B5651B /* volume.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA539E1B3CB2C700F79DC6 /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3618DB722E00B5651B /* list.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA539F1B3CB2C700F79DC6 /* find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2C18DB722E00B5651B /* find.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A01B3CB2C700F79DC6 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7A18DB722E00B5651B /* unpack.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A11B3CB2C700F79DC6 /* headers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC619ED8B1F00DAF8F1 /* headers.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A21B3CB2C700F79DC6 /* threadpool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD219ED8C6100DAF8F1 /* threadpool.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A31B3CB2C700F79DC6 /* rs16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCD19ED8B9700DAF8F1 /* rs16.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A41B3CB2C700F79DC6 /* cmddata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0D18DB722E00B5651B /* cmddata.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A51B3CB2C700F79DC6 /* ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD419ED8C8000DAF8F1 /* ui.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A61B3CB2C700F79DC6 /* filestr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2A18DB722E00B5651B /* filestr.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53A71B3CB2C700F79DC6 /* recvol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5918DB722E00B5651B /* recvol.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A81B3CB2C700F79DC6 /* rs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5F18DB722E00B5651B /* rs.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53A91B3CB2C700F79DC6 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53AA1B3CB2C700F79DC6 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53AB1B3CB2C700F79DC6 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53AC1B3CB2C700F79DC6 /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; 96F450751B38527100679597 /* ValidatePasswordTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450741B38527100679597 /* ValidatePasswordTests.m */; }; 96F450771B38552200679597 /* IsPasswordProtectedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450761B38552200679597 /* IsPasswordProtectedTests.m */; }; 96F450791B385AF800679597 /* ListFilenamesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450781B385AF800679597 /* ListFilenamesTests.m */; }; @@ -301,21 +302,12 @@ 96F5BBC11B39AEBC00ACB162 /* Test Data in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AD018D28F1600AD7321 /* Test Data */; }; 96F5BBC21B39AF2300ACB162 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96F5BBC31B39B18B00ACB162 /* ExtractFilesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F4507A1B385BCD00679597 /* ExtractFilesTests.m */; }; - F3FCD46B1A3262E5003612BF /* URKFileInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FCD4691A3262E5003612BF /* URKFileInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3FCD46C1A3262E5003612BF /* URKFileInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FCD4691A3262E5003612BF /* URKFileInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F3FCD46D1A3262E5003612BF /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; F3FCD46E1A3262E5003612BF /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; F3FCD46F1A3262E5003612BF /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 968541D818DC81F500B5651B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9685410F18DBA06000B5651B; - remoteInfo = UnrarKit; - }; 96EA53541B3B691B00F79DC6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -342,15 +334,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9685410E18DBA06000B5651B /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 969BD9E519EDE88E002CE755 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -524,7 +507,6 @@ 96853F8318DB722F00B5651B /* volume.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = volume.hpp; sourceTree = ""; }; 96853F8418DB722F00B5651B /* win32acl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = win32acl.cpp; sourceTree = ""; }; 96853F8518DB722F00B5651B /* win32stm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = win32stm.cpp; sourceTree = ""; }; - 9685411018DBA06000B5651B /* libUnrarKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libUnrarKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 969BDA2419EDE88E002CE755 /* libUnrarKit iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libUnrarKit iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 969F17361A60297700665453 /* UnrarKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UnrarKit.h; sourceTree = ""; }; 96DBF7F71A3F72800033B759 /* NSString+UnrarKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+UnrarKit.h"; path = "Categories/NSString+UnrarKit.h"; sourceTree = ""; }; @@ -534,12 +516,12 @@ 96EA53321B3B462D00F79DC6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 96EA53371B3B462D00F79DC6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 96EA533C1B3B462D00F79DC6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; + 96EA535B1B3CB04300F79DC6 /* UnrarKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UnrarKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 96F450741B38527100679597 /* ValidatePasswordTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ValidatePasswordTests.m; sourceTree = ""; }; 96F450761B38552200679597 /* IsPasswordProtectedTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IsPasswordProtectedTests.m; sourceTree = ""; }; 96F450781B385AF800679597 /* ListFilenamesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListFilenamesTests.m; sourceTree = ""; }; 96F4507A1B385BCD00679597 /* ExtractFilesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExtractFilesTests.m; sourceTree = ""; }; 96F5BBB11B39A65F00ACB162 /* UnrarKit iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UnrarKit iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - AA747D9E0F9514B9006C5449 /* UnrarKit_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnrarKit_Prefix.pch; sourceTree = ""; }; F3FCD4691A3262E5003612BF /* URKFileInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URKFileInfo.h; sourceTree = ""; }; F3FCD46A1A3262E5003612BF /* URKFileInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URKFileInfo.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -553,21 +535,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9685410D18DBA06000B5651B /* Frameworks */ = { + 969BD9E319EDE88E002CE755 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 969BD9E319EDE88E002CE755 /* Frameworks */ = { + 96EA532B1B3B462D00F79DC6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 96EA532B1B3B462D00F79DC6 /* Frameworks */ = { + 96EA53571B3CB04300F79DC6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -589,11 +571,11 @@ 034768DFFF38A50411DB9C8B /* Products */ = { isa = PBXGroup; children = ( - 9685411018DBA06000B5651B /* libUnrarKit.a */, 964C8ABB18D28EE000AD7321 /* UnrarKit Tests.xctest */, 969BDA2419EDE88E002CE755 /* libUnrarKit iOS.a */, 96F5BBB11B39A65F00ACB162 /* UnrarKit iOS Tests.xctest */, 96EA532E1B3B462D00F79DC6 /* iOSUnitTestHostApp.app */, + 96EA535B1B3CB04300F79DC6 /* UnrarKit.framework */, ); name = Products; sourceTree = ""; @@ -604,7 +586,6 @@ 08FB77AEFE84172EC02AAC07 /* Classes */, 96853ED318DB704900B5651B /* Resources */, 964C8AC218D28EE000AD7321 /* Tests */, - 32C88DFF0371C24200C91783 /* Other Sources */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, 96853F0418DB722E00B5651B /* Libraries */, @@ -633,15 +614,6 @@ path = Classes; sourceTree = SOURCE_ROOT; }; - 32C88DFF0371C24200C91783 /* Other Sources */ = { - isa = PBXGroup; - children = ( - AA747D9E0F9514B9006C5449 /* UnrarKit_Prefix.pch */, - ); - name = "Other Sources"; - path = Other; - sourceTree = SOURCE_ROOT; - }; 964C8AC218D28EE000AD7321 /* Tests */ = { isa = PBXGroup; children = ( @@ -872,74 +844,6 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 9685416F18DBA43500B5651B /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 9685417018DBA43A00B5651B /* URKArchive.h in Headers */, - F3FCD46B1A3262E5003612BF /* URKFileInfo.h in Headers */, - 969F17371A6029E000665453 /* UnrarKit.h in Headers */, - 9685417118DBA58F00B5651B /* archive.hpp in Headers */, - 9685417218DBA58F00B5651B /* array.hpp in Headers */, - 9685417318DBA58F00B5651B /* cmddata.hpp in Headers */, - 9685417418DBA58F00B5651B /* coder.hpp in Headers */, - 9685417518DBA58F00B5651B /* compress.hpp in Headers */, - 9685417618DBA58F00B5651B /* consio.hpp in Headers */, - 9685417718DBA58F00B5651B /* crc.hpp in Headers */, - 9685417818DBA58F00B5651B /* crypt.hpp in Headers */, - 9685417918DBA58F00B5651B /* dll.hpp in Headers */, - 9685417A18DBA58F00B5651B /* encname.hpp in Headers */, - 9685417B18DBA58F00B5651B /* errhnd.hpp in Headers */, - 9685417C18DBA58F00B5651B /* extinfo.hpp in Headers */, - 9685417D18DBA58F00B5651B /* extract.hpp in Headers */, - 9685417E18DBA58F00B5651B /* filcreat.hpp in Headers */, - 9685417F18DBA58F00B5651B /* file.hpp in Headers */, - 9685418018DBA58F00B5651B /* filefn.hpp in Headers */, - 9685418118DBA58F00B5651B /* filestr.hpp in Headers */, - 9685418218DBA58F00B5651B /* find.hpp in Headers */, - 9685418318DBA58F00B5651B /* getbits.hpp in Headers */, - 9685418418DBA58F00B5651B /* global.hpp in Headers */, - 9685418518DBA58F00B5651B /* headers.hpp in Headers */, - 9685418618DBA58F00B5651B /* isnt.hpp in Headers */, - 9685418718DBA58F00B5651B /* list.hpp in Headers */, - 9685418818DBA58F00B5651B /* loclang.hpp in Headers */, - 9685418918DBA58F00B5651B /* log.hpp in Headers */, - 9685418A18DBA58F00B5651B /* match.hpp in Headers */, - 9685418B18DBA58F00B5651B /* model.hpp in Headers */, - 9685418C18DBA58F00B5651B /* options.hpp in Headers */, - 9685418D18DBA58F00B5651B /* os.hpp in Headers */, - 9685418E18DBA58F00B5651B /* pathfn.hpp in Headers */, - 9685418F18DBA58F00B5651B /* rar.hpp in Headers */, - 9685419018DBA58F00B5651B /* rardefs.hpp in Headers */, - 9685419118DBA58F00B5651B /* rarlang.hpp in Headers */, - 9685419218DBA58F00B5651B /* raros.hpp in Headers */, - 9685419318DBA58F00B5651B /* rartypes.hpp in Headers */, - 9685419418DBA58F00B5651B /* rarvm.hpp in Headers */, - 9685419518DBA58F00B5651B /* rawread.hpp in Headers */, - 9685419618DBA58F00B5651B /* rdwrfn.hpp in Headers */, - 9685419718DBA58F00B5651B /* recvol.hpp in Headers */, - 9685419818DBA58F00B5651B /* resource.hpp in Headers */, - 9685419918DBA58F00B5651B /* rijndael.hpp in Headers */, - 9685419A18DBA58F00B5651B /* rs.hpp in Headers */, - 96DBF7F91A3F72800033B759 /* NSString+UnrarKit.h in Headers */, - 9685419B18DBA58F00B5651B /* savepos.hpp in Headers */, - 9685419C18DBA58F00B5651B /* scantree.hpp in Headers */, - 9685419D18DBA58F00B5651B /* secpassword.hpp in Headers */, - 9685419E18DBA58F00B5651B /* sha1.hpp in Headers */, - 9685419F18DBA58F00B5651B /* smallfn.hpp in Headers */, - 968541A018DBA58F00B5651B /* strfn.hpp in Headers */, - 968541A118DBA58F00B5651B /* strlist.hpp in Headers */, - 968541A218DBA58F00B5651B /* suballoc.hpp in Headers */, - 968541A318DBA58F00B5651B /* system.hpp in Headers */, - 968541A418DBA58F00B5651B /* timefn.hpp in Headers */, - 968541A518DBA58F00B5651B /* ulinks.hpp in Headers */, - 968541A618DBA58F00B5651B /* unicode.hpp in Headers */, - 968541A718DBA58F00B5651B /* unpack.hpp in Headers */, - 968541A818DBA58F00B5651B /* version.hpp in Headers */, - 968541A918DBA58F00B5651B /* volume.hpp in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 969BD9E619EDE88E002CE755 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1008,6 +912,73 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 96EA53581B3CB04300F79DC6 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 9699F91D1B3CB4D000B6D373 /* URKArchive.h in Headers */, + 9699F91E1B3CB4D000B6D373 /* URKFileInfo.h in Headers */, + 9699F91F1B3CB4D000B6D373 /* UnrarKit.h in Headers */, + 9699F9201B3CB4D000B6D373 /* archive.hpp in Headers */, + 9699F9211B3CB4D000B6D373 /* array.hpp in Headers */, + 9699F9221B3CB4D000B6D373 /* cmddata.hpp in Headers */, + 9699F9231B3CB4D000B6D373 /* coder.hpp in Headers */, + 9699F9241B3CB4D000B6D373 /* compress.hpp in Headers */, + 9699F9251B3CB4D000B6D373 /* consio.hpp in Headers */, + 9699F9261B3CB4D000B6D373 /* crc.hpp in Headers */, + 9699F9271B3CB4D000B6D373 /* crypt.hpp in Headers */, + 9699F9281B3CB4D000B6D373 /* dll.hpp in Headers */, + 9699F9291B3CB4D000B6D373 /* encname.hpp in Headers */, + 9699F92A1B3CB4D000B6D373 /* errhnd.hpp in Headers */, + 9699F92B1B3CB4D000B6D373 /* extinfo.hpp in Headers */, + 9699F92C1B3CB4D000B6D373 /* extract.hpp in Headers */, + 9699F92D1B3CB4D000B6D373 /* filcreat.hpp in Headers */, + 9699F92E1B3CB4D000B6D373 /* file.hpp in Headers */, + 9699F92F1B3CB4D000B6D373 /* filefn.hpp in Headers */, + 9699F9301B3CB4D000B6D373 /* filestr.hpp in Headers */, + 9699F9311B3CB4D000B6D373 /* find.hpp in Headers */, + 9699F9321B3CB4D000B6D373 /* getbits.hpp in Headers */, + 9699F9331B3CB4D000B6D373 /* global.hpp in Headers */, + 9699F9341B3CB4D000B6D373 /* headers.hpp in Headers */, + 9699F9351B3CB4D000B6D373 /* isnt.hpp in Headers */, + 9699F9361B3CB4D000B6D373 /* list.hpp in Headers */, + 9699F9371B3CB4D000B6D373 /* loclang.hpp in Headers */, + 9699F9381B3CB4D000B6D373 /* log.hpp in Headers */, + 9699F9391B3CB4D000B6D373 /* match.hpp in Headers */, + 9699F93A1B3CB4D000B6D373 /* model.hpp in Headers */, + 9699F93B1B3CB4D000B6D373 /* options.hpp in Headers */, + 9699F93C1B3CB4D000B6D373 /* os.hpp in Headers */, + 9699F93D1B3CB4D000B6D373 /* pathfn.hpp in Headers */, + 9699F93E1B3CB4D000B6D373 /* rar.hpp in Headers */, + 9699F93F1B3CB4D000B6D373 /* rardefs.hpp in Headers */, + 9699F9401B3CB4D000B6D373 /* rarlang.hpp in Headers */, + 9699F9411B3CB4D000B6D373 /* raros.hpp in Headers */, + 9699F9421B3CB4D000B6D373 /* rartypes.hpp in Headers */, + 9699F9431B3CB4D000B6D373 /* rarvm.hpp in Headers */, + 9699F9441B3CB4D000B6D373 /* rawread.hpp in Headers */, + 9699F9451B3CB4D000B6D373 /* rdwrfn.hpp in Headers */, + 9699F9461B3CB4D000B6D373 /* recvol.hpp in Headers */, + 9699F9471B3CB4D000B6D373 /* resource.hpp in Headers */, + 9699F9481B3CB4D000B6D373 /* rijndael.hpp in Headers */, + 9699F9491B3CB4D000B6D373 /* rs.hpp in Headers */, + 9699F94B1B3CB4D000B6D373 /* savepos.hpp in Headers */, + 9699F94C1B3CB4D000B6D373 /* scantree.hpp in Headers */, + 9699F94D1B3CB4D000B6D373 /* secpassword.hpp in Headers */, + 9699F94E1B3CB4D000B6D373 /* sha1.hpp in Headers */, + 9699F94F1B3CB4D000B6D373 /* smallfn.hpp in Headers */, + 9699F9501B3CB4D000B6D373 /* strfn.hpp in Headers */, + 9699F9511B3CB4D000B6D373 /* strlist.hpp in Headers */, + 9699F9521B3CB4D000B6D373 /* suballoc.hpp in Headers */, + 9699F9531B3CB4D000B6D373 /* system.hpp in Headers */, + 9699F9541B3CB4D000B6D373 /* timefn.hpp in Headers */, + 9699F9551B3CB4D000B6D373 /* ulinks.hpp in Headers */, + 9699F9561B3CB4D000B6D373 /* unicode.hpp in Headers */, + 9699F9571B3CB4D000B6D373 /* unpack.hpp in Headers */, + 9699F9581B3CB4D000B6D373 /* version.hpp in Headers */, + 9699F9591B3CB4D000B6D373 /* volume.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -1023,31 +994,12 @@ buildRules = ( ); dependencies = ( - 968541D918DC81F500B5651B /* PBXTargetDependency */, ); name = "UnrarKit Tests"; productName = "UnrarKit Tests"; productReference = 964C8ABB18D28EE000AD7321 /* UnrarKit Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 9685410F18DBA06000B5651B /* UnrarKit */ = { - isa = PBXNativeTarget; - buildConfigurationList = 9685412C18DBA06100B5651B /* Build configuration list for PBXNativeTarget "UnrarKit" */; - buildPhases = ( - 9685410C18DBA06000B5651B /* Sources */, - 9685410D18DBA06000B5651B /* Frameworks */, - 9685410E18DBA06000B5651B /* CopyFiles */, - 9685416F18DBA43500B5651B /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = UnrarKit; - productName = UnrarKit; - productReference = 9685411018DBA06000B5651B /* libUnrarKit.a */; - productType = "com.apple.product-type.library.static"; - }; 969BD9AE19EDE88E002CE755 /* UnrarKit iOS */ = { isa = PBXNativeTarget; buildConfigurationList = 969BDA2119EDE88E002CE755 /* Build configuration list for PBXNativeTarget "UnrarKit iOS" */; @@ -1083,6 +1035,24 @@ productReference = 96EA532E1B3B462D00F79DC6 /* iOSUnitTestHostApp.app */; productType = "com.apple.product-type.application"; }; + 96EA535A1B3CB04300F79DC6 /* UnrarKit */ = { + isa = PBXNativeTarget; + buildConfigurationList = 96EA53721B3CB04300F79DC6 /* Build configuration list for PBXNativeTarget "UnrarKit" */; + buildPhases = ( + 96EA53561B3CB04300F79DC6 /* Sources */, + 96EA53571B3CB04300F79DC6 /* Frameworks */, + 96EA53581B3CB04300F79DC6 /* Headers */, + 96EA53591B3CB04300F79DC6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = UnrarKit; + productName = "UnrarKit"; + productReference = 96EA535B1B3CB04300F79DC6 /* UnrarKit.framework */; + productType = "com.apple.product-type.framework"; + }; 96F5BBB01B39A65F00ACB162 /* UnrarKit iOS Tests */ = { isa = PBXNativeTarget; buildConfigurationList = 96F5BBBC1B39A65F00ACB162 /* Build configuration list for PBXNativeTarget "UnrarKit iOS Tests" */; @@ -1116,6 +1086,9 @@ 96EA532D1B3B462D00F79DC6 = { CreatedOnToolsVersion = 6.3.2; }; + 96EA535A1B3CB04300F79DC6 = { + CreatedOnToolsVersion = 6.3.2; + }; 96F5BBB01B39A65F00ACB162 = { CreatedOnToolsVersion = 6.3.2; TestTargetID = 96EA532D1B3B462D00F79DC6; @@ -1139,7 +1112,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 9685410F18DBA06000B5651B /* UnrarKit */, + 96EA535A1B3CB04300F79DC6 /* UnrarKit */, 964C8ABA18D28EE000AD7321 /* UnrarKit Tests */, 969BD9AE19EDE88E002CE755 /* UnrarKit iOS */, 96F5BBB01B39A65F00ACB162 /* UnrarKit iOS Tests */, @@ -1167,6 +1140,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 96EA53591B3CB04300F79DC6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 96F5BBAF1B39A65F00ACB162 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1244,66 +1224,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9685410C18DBA06000B5651B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9685414F18DBA16300B5651B /* rar.cpp in Sources */, - 9685415F18DBA16300B5651B /* strlist.cpp in Sources */, - 9685415E18DBA16300B5651B /* strfn.cpp in Sources */, - 9685414E18DBA16300B5651B /* pathfn.cpp in Sources */, - 9685415D18DBA16300B5651B /* smallfn.cpp in Sources */, - 9685414618DBA16300B5651B /* global.cpp in Sources */, - F3FCD46D1A3262E5003612BF /* URKFileInfo.m in Sources */, - 9685414118DBA16300B5651B /* file.cpp in Sources */, - 9685414218DBA16300B5651B /* filefn.cpp in Sources */, - 9685414018DBA16300B5651B /* filcreat.cpp in Sources */, - 9685413318DBA16300B5651B /* archive.cpp in Sources */, - 9685413418DBA16300B5651B /* arcread.cpp in Sources */, - 9685416418DBA16300B5651B /* unicode.cpp in Sources */, - 9685416118DBA16300B5651B /* system.cpp in Sources */, - 9685414718DBA16300B5651B /* isnt.cpp in Sources */, - 9685413A18DBA16300B5651B /* crypt.cpp in Sources */, - 9685413918DBA16300B5651B /* crc.cpp in Sources */, - 9685415318DBA16300B5651B /* rawread.cpp in Sources */, - 9685413C18DBA16300B5651B /* encname.cpp in Sources */, - 9685415618DBA16300B5651B /* resource.cpp in Sources */, - 9685414A18DBA16300B5651B /* match.cpp in Sources */, - 9685416218DBA16300B5651B /* timefn.cpp in Sources */, - 9685415418DBA16300B5651B /* rdwrfn.cpp in Sources */, - 9685413818DBA16300B5651B /* consio.cpp in Sources */, - 9685414C18DBA16300B5651B /* options.cpp in Sources */, - 9685413D18DBA16300B5651B /* errhnd.cpp in Sources */, - 9685415118DBA16300B5651B /* rarvm.cpp in Sources */, - 9685415B18DBA16300B5651B /* secpassword.cpp in Sources */, - 9685415718DBA16300B5651B /* rijndael.cpp in Sources */, - 9685414518DBA16300B5651B /* getbits.cpp in Sources */, - 96DBF7FB1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */, - 9685415C18DBA16300B5651B /* sha1.cpp in Sources */, - 96370FDF19ED925E00DAF8F1 /* sha256.cpp in Sources */, - 96370FE019ED926F00DAF8F1 /* blake2s.cpp in Sources */, - 96370FE119ED928C00DAF8F1 /* hash.cpp in Sources */, - 9685413E18DBA16300B5651B /* extinfo.cpp in Sources */, - 9685413F18DBA16300B5651B /* extract.cpp in Sources */, - 9685416A18DBA16300B5651B /* volume.cpp in Sources */, - 9685414818DBA16300B5651B /* list.cpp in Sources */, - 9685414418DBA16300B5651B /* find.cpp in Sources */, - 9685416618DBA16300B5651B /* unpack.cpp in Sources */, - 96370FE219ED92B700DAF8F1 /* headers.cpp in Sources */, - 96370FE319ED92C400DAF8F1 /* threadpool.cpp in Sources */, - 96370FE419ED92D800DAF8F1 /* rs16.cpp in Sources */, - 9685413618DBA16300B5651B /* cmddata.cpp in Sources */, - 96370FE519ED92E000DAF8F1 /* ui.cpp in Sources */, - 96370FE619ED931100DAF8F1 /* filestr.cpp in Sources */, - 96370FE719ED931A00DAF8F1 /* recvol.cpp in Sources */, - 96370FE819ED932200DAF8F1 /* rs.cpp in Sources */, - 96370FE919ED932900DAF8F1 /* scantree.cpp in Sources */, - 96370FEA19ED933100DAF8F1 /* qopen.cpp in Sources */, - 96370FEB19ED934B00DAF8F1 /* dll.cpp in Sources */, - 9685413218DBA13200B5651B /* URKArchive.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 969BD9AF19EDE88E002CE755 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1372,6 +1292,66 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 96EA53561B3CB04300F79DC6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 96EA53781B3CB2C700F79DC6 /* rar.cpp in Sources */, + 96EA53791B3CB2C700F79DC6 /* strlist.cpp in Sources */, + 96EA537A1B3CB2C700F79DC6 /* strfn.cpp in Sources */, + 96EA537B1B3CB2C700F79DC6 /* pathfn.cpp in Sources */, + 96EA537C1B3CB2C700F79DC6 /* smallfn.cpp in Sources */, + 96EA537D1B3CB2C700F79DC6 /* global.cpp in Sources */, + 96EA537E1B3CB2C700F79DC6 /* URKFileInfo.m in Sources */, + 96EA537F1B3CB2C700F79DC6 /* file.cpp in Sources */, + 96EA53801B3CB2C700F79DC6 /* filefn.cpp in Sources */, + 96EA53811B3CB2C700F79DC6 /* filcreat.cpp in Sources */, + 96EA53821B3CB2C700F79DC6 /* archive.cpp in Sources */, + 96EA53831B3CB2C700F79DC6 /* arcread.cpp in Sources */, + 96EA53841B3CB2C700F79DC6 /* unicode.cpp in Sources */, + 96EA53851B3CB2C700F79DC6 /* system.cpp in Sources */, + 96EA53861B3CB2C700F79DC6 /* isnt.cpp in Sources */, + 96EA53871B3CB2C700F79DC6 /* crypt.cpp in Sources */, + 96EA53881B3CB2C700F79DC6 /* crc.cpp in Sources */, + 96EA53891B3CB2C700F79DC6 /* rawread.cpp in Sources */, + 96EA538A1B3CB2C700F79DC6 /* encname.cpp in Sources */, + 96EA538B1B3CB2C700F79DC6 /* resource.cpp in Sources */, + 96EA538C1B3CB2C700F79DC6 /* match.cpp in Sources */, + 96EA538D1B3CB2C700F79DC6 /* timefn.cpp in Sources */, + 96EA538E1B3CB2C700F79DC6 /* rdwrfn.cpp in Sources */, + 96EA538F1B3CB2C700F79DC6 /* consio.cpp in Sources */, + 96EA53901B3CB2C700F79DC6 /* options.cpp in Sources */, + 96EA53911B3CB2C700F79DC6 /* errhnd.cpp in Sources */, + 96EA53921B3CB2C700F79DC6 /* rarvm.cpp in Sources */, + 96EA53931B3CB2C700F79DC6 /* secpassword.cpp in Sources */, + 96EA53941B3CB2C700F79DC6 /* rijndael.cpp in Sources */, + 96EA53951B3CB2C700F79DC6 /* getbits.cpp in Sources */, + 96EA53961B3CB2C700F79DC6 /* NSString+UnrarKit.mm in Sources */, + 96EA53971B3CB2C700F79DC6 /* sha1.cpp in Sources */, + 96EA53981B3CB2C700F79DC6 /* sha256.cpp in Sources */, + 96EA53991B3CB2C700F79DC6 /* blake2s.cpp in Sources */, + 96EA539A1B3CB2C700F79DC6 /* hash.cpp in Sources */, + 96EA539B1B3CB2C700F79DC6 /* extinfo.cpp in Sources */, + 96EA539C1B3CB2C700F79DC6 /* extract.cpp in Sources */, + 96EA539D1B3CB2C700F79DC6 /* volume.cpp in Sources */, + 96EA539E1B3CB2C700F79DC6 /* list.cpp in Sources */, + 96EA539F1B3CB2C700F79DC6 /* find.cpp in Sources */, + 96EA53A01B3CB2C700F79DC6 /* unpack.cpp in Sources */, + 96EA53A11B3CB2C700F79DC6 /* headers.cpp in Sources */, + 96EA53A21B3CB2C700F79DC6 /* threadpool.cpp in Sources */, + 96EA53A31B3CB2C700F79DC6 /* rs16.cpp in Sources */, + 96EA53A41B3CB2C700F79DC6 /* cmddata.cpp in Sources */, + 96EA53A51B3CB2C700F79DC6 /* ui.cpp in Sources */, + 96EA53A61B3CB2C700F79DC6 /* filestr.cpp in Sources */, + 96EA53A71B3CB2C700F79DC6 /* recvol.cpp in Sources */, + 96EA53A81B3CB2C700F79DC6 /* rs.cpp in Sources */, + 96EA53A91B3CB2C700F79DC6 /* scantree.cpp in Sources */, + 96EA53AA1B3CB2C700F79DC6 /* qopen.cpp in Sources */, + 96EA53AB1B3CB2C700F79DC6 /* dll.cpp in Sources */, + 96EA53AC1B3CB2C700F79DC6 /* URKArchive.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 96F5BBAD1B39A65F00ACB162 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1385,11 +1365,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 968541D918DC81F500B5651B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9685410F18DBA06000B5651B /* UnrarKit */; - targetProxy = 968541D818DC81F500B5651B /* PBXContainerItemProxy */; - }; 96EA53551B3B691B00F79DC6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 96EA532D1B3B462D00F79DC6 /* iOSUnitTestHostApp */; @@ -1552,7 +1527,7 @@ }; name = Release; }; - 9685412D18DBA06100B5651B /* Debug */ = { + 969BDA2219EDE88E002CE755 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1565,7 +1540,6 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DSTROOT = /tmp/UnrarKit.dst; FRAMEWORK_SEARCH_PATHS = ( @@ -1573,8 +1547,6 @@ "$(DEVELOPER_FRAMEWORKS_DIR)", ); GCC_DYNAMIC_NO_PIC = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Other/UnrarKit_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -1587,8 +1559,9 @@ GCC_WARN_UNUSED_FUNCTION = YES; IPHONEOS_DEPLOYMENT_TARGET = 7.1; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "UnrarKit iOS"; PUBLIC_HEADERS_FOLDER_PATH = ../../Headers/UnrarKit; + SDKROOT = iphoneos; SKIP_INSTALL = YES; WARNING_CFLAGS = ( "-Wno-dangling-else", @@ -1603,7 +1576,7 @@ }; name = Debug; }; - 9685412E18DBA06100B5651B /* Release */ = { + 969BDA2319EDE88E002CE755 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1616,7 +1589,6 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DSTROOT = /tmp/UnrarKit.dst; ENABLE_NS_ASSERTIONS = NO; @@ -1624,8 +1596,6 @@ "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Other/UnrarKit_Prefix.pch; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1633,8 +1603,9 @@ GCC_WARN_UNUSED_FUNCTION = YES; IPHONEOS_DEPLOYMENT_TARGET = 7.1; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "UnrarKit iOS"; PUBLIC_HEADERS_FOLDER_PATH = ../../Headers/UnrarKit; + SDKROOT = iphoneos; SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = ( @@ -1651,10 +1622,12 @@ }; name = Release; }; - 969BDA2219EDE88E002CE755 /* Debug */ = { + 96EA534B1B3B462D00F79DC6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; @@ -1663,16 +1636,15 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - DSTROOT = /tmp/UnrarKit.dst; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Other/UnrarKit_Prefix.pch; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -1683,29 +1655,23 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "UnrarKit iOS"; - PUBLIC_HEADERS_FOLDER_PATH = ../../Headers/UnrarKit; + INFOPLIST_FILE = Tests/iOSUnitTestHostApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SKIP_INSTALL = YES; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-shorten-64-to-32", - "-Wno-unused-function", - "-Wno-conditional-uninitialized", - ); + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - 969BDA2319EDE88E002CE755 /* Release */ = { + 96EA534C1B3B462D00F79DC6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; @@ -1714,48 +1680,35 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DSTROOT = /tmp/UnrarKit.dst; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Other/UnrarKit_Prefix.pch; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "UnrarKit iOS"; - PUBLIC_HEADERS_FOLDER_PATH = ../../Headers/UnrarKit; + INFOPLIST_FILE = Tests/iOSUnitTestHostApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-shorten-64-to-32", - "-Wno-unused-function", - "-Wno-conditional-uninitialized", - "-Wno-error=unused-command-line-argument", - ); }; name = Release; }; - 96EA534B1B3B462D00F79DC6 /* Debug */ = { + 96EA536E1B3CB04300F79DC6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; @@ -1766,10 +1719,15 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1783,23 +1741,31 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = Tests/iOSUnitTestHostApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + INFOPLIST_FILE = "Resources/UnrarKit-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; + SKIP_INSTALL = YES; + WARNING_CFLAGS = ( + "-Wno-dangling-else", + "-Wno-parentheses", + "-Wno-return-type", + "-Wno-unused-variable", + "-Wno-switch", + "-Wno-shorten-64-to-32", + "-Wno-unused-function", + "-Wno-conditional-uninitialized", + "-Wno-error=unused-command-line-argument", + ); }; name = Debug; }; - 96EA534C1B3B462D00F79DC6 /* Release */ = { + 96EA536F1B3CB04300F79DC6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; @@ -1810,11 +1776,16 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1822,14 +1793,25 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = Tests/iOSUnitTestHostApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + INFOPLIST_FILE = "Resources/UnrarKit-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; + SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; + WARNING_CFLAGS = ( + "-Wno-dangling-else", + "-Wno-parentheses", + "-Wno-return-type", + "-Wno-unused-variable", + "-Wno-switch", + "-Wno-shorten-64-to-32", + "-Wno-unused-function", + "-Wno-conditional-uninitialized", + "-Wno-error=unused-command-line-argument", + ); }; name = Release; }; @@ -1938,15 +1920,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9685412C18DBA06100B5651B /* Build configuration list for PBXNativeTarget "UnrarKit" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9685412D18DBA06100B5651B /* Debug */, - 9685412E18DBA06100B5651B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 969BDA2119EDE88E002CE755 /* Build configuration list for PBXNativeTarget "UnrarKit iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1965,6 +1938,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 96EA53721B3CB04300F79DC6 /* Build configuration list for PBXNativeTarget "UnrarKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 96EA536E1B3CB04300F79DC6 /* Debug */, + 96EA536F1B3CB04300F79DC6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 96F5BBBC1B39A65F00ACB162 /* Build configuration list for PBXNativeTarget "UnrarKit iOS Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit.xcscheme b/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit.xcscheme index 59fb837..c3509cb 100644 --- a/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit.xcscheme +++ b/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit.xcscheme @@ -14,12 +14,26 @@ buildForAnalyzing = "YES"> + + + + + + + + @@ -67,9 +90,18 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + + buildConfiguration = "Debug"> Date: Thu, 25 Jun 2015 19:02:43 -0400 Subject: [PATCH 02/38] Switched the iOS target from static library to framework, also --- UnrarKit.xcodeproj/project.pbxproj | 380 +++++++++--------- .../xcschemes/UnrarKit iOS.xcscheme | 32 +- 2 files changed, 199 insertions(+), 213 deletions(-) diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index 3777295..a4c87e9 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -120,6 +120,67 @@ 9699F9571B3CB4D000B6D373 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 9699F9581B3CB4D000B6D373 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 9699F9591B3CB4D000B6D373 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA2A1B3CBB1400B6D373 /* URKArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 489CFA0E128B5169005DCC2A /* URKArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA2B1B3CBB1400B6D373 /* URKFileInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FCD4691A3262E5003612BF /* URKFileInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA2C1B3CBB1400B6D373 /* UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 969F17361A60297700665453 /* UnrarKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA2D1B3CBB1400B6D373 /* archive.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0918DB722E00B5651B /* archive.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA2E1B3CBB1400B6D373 /* array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0B18DB722E00B5651B /* array.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA2F1B3CBB1400B6D373 /* cmddata.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0E18DB722E00B5651B /* cmddata.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA301B3CBB1400B6D373 /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1018DB722E00B5651B /* coder.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA311B3CBB1400B6D373 /* compress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1118DB722E00B5651B /* compress.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA321B3CBB1400B6D373 /* consio.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1318DB722E00B5651B /* consio.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA331B3CBB1400B6D373 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1518DB722E00B5651B /* crc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA341B3CBB1400B6D373 /* crypt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1718DB722E00B5651B /* crypt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA351B3CBB1400B6D373 /* dll.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1A18DB722E00B5651B /* dll.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA361B3CBB1400B6D373 /* encname.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1D18DB722E00B5651B /* encname.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA371B3CBB1400B6D373 /* errhnd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1F18DB722E00B5651B /* errhnd.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA381B3CBB1400B6D373 /* extinfo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2118DB722E00B5651B /* extinfo.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA391B3CBB1400B6D373 /* extract.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2318DB722E00B5651B /* extract.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA3A1B3CBB1400B6D373 /* filcreat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2518DB722E00B5651B /* filcreat.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA3B1B3CBB1400B6D373 /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2718DB722E00B5651B /* file.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA3C1B3CBB1400B6D373 /* filefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2918DB722E00B5651B /* filefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA3D1B3CBB1400B6D373 /* filestr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2B18DB722E00B5651B /* filestr.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA3E1B3CBB1400B6D373 /* find.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2D18DB722E00B5651B /* find.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA3F1B3CBB1400B6D373 /* getbits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2F18DB722E00B5651B /* getbits.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA401B3CBB1400B6D373 /* global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3118DB722E00B5651B /* global.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA411B3CBB1400B6D373 /* headers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3218DB722E00B5651B /* headers.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA421B3CBB1400B6D373 /* isnt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3418DB722E00B5651B /* isnt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA431B3CBB1400B6D373 /* list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3718DB722E00B5651B /* list.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA441B3CBB1400B6D373 /* loclang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3818DB722E00B5651B /* loclang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA451B3CBB1400B6D373 /* log.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3A18DB722E00B5651B /* log.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA461B3CBB1400B6D373 /* match.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4018DB722E00B5651B /* match.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA471B3CBB1400B6D373 /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4218DB722E00B5651B /* model.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA481B3CBB1400B6D373 /* options.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4518DB722E00B5651B /* options.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA491B3CBB1400B6D373 /* os.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4618DB722E00B5651B /* os.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA4A1B3CBB1400B6D373 /* pathfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4918DB722E00B5651B /* pathfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA4B1B3CBB1400B6D373 /* rar.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4B18DB722E00B5651B /* rar.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA4C1B3CBB1400B6D373 /* rardefs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4C18DB722E00B5651B /* rardefs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA4D1B3CBB1400B6D373 /* rarlang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4D18DB722E00B5651B /* rarlang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA4E1B3CBB1400B6D373 /* raros.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4E18DB722E00B5651B /* raros.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA4F1B3CBB1400B6D373 /* rartypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5018DB722E00B5651B /* rartypes.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA501B3CBB1400B6D373 /* rarvm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5218DB722E00B5651B /* rarvm.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA511B3CBB1400B6D373 /* rawread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5518DB722E00B5651B /* rawread.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA521B3CBB1400B6D373 /* rdwrfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5718DB722E00B5651B /* rdwrfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA531B3CBB1400B6D373 /* recvol.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5A18DB722E00B5651B /* recvol.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA541B3CBB1400B6D373 /* resource.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5C18DB722E00B5651B /* resource.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA551B3CBB1400B6D373 /* rijndael.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5E18DB722E00B5651B /* rijndael.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA561B3CBB1400B6D373 /* rs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6018DB722E00B5651B /* rs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA571B3CBB1400B6D373 /* savepos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6218DB722E00B5651B /* savepos.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA581B3CBB1400B6D373 /* scantree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6418DB722E00B5651B /* scantree.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA591B3CBB1400B6D373 /* secpassword.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6618DB722E00B5651B /* secpassword.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA5A1B3CBB1400B6D373 /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6818DB722E00B5651B /* sha1.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA5B1B3CBB1400B6D373 /* smallfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6A18DB722E00B5651B /* smallfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA5C1B3CBB1400B6D373 /* strfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6C18DB722E00B5651B /* strfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA5D1B3CBB1400B6D373 /* strlist.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6E18DB722E00B5651B /* strlist.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA5E1B3CBB1400B6D373 /* suballoc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7018DB722E00B5651B /* suballoc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA5F1B3CBB1400B6D373 /* system.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7218DB722E00B5651B /* system.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA601B3CBB1400B6D373 /* timefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7418DB722E00B5651B /* timefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA611B3CBB1400B6D373 /* ulinks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7618DB722E00B5651B /* ulinks.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA621B3CBB1400B6D373 /* unicode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7818DB722E00B5651B /* unicode.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA631B3CBB1400B6D373 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA641B3CBB1400B6D373 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA651B3CBB1400B6D373 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA691B3CBD1000B6D373 /* UnrarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9699F9DA1B3CB83100B6D373 /* UnrarKit.framework */; }; 969BD9B019EDE88E002CE755 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; }; 969BD9B119EDE88E002CE755 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; 969BD9B219EDE88E002CE755 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; }; @@ -171,66 +232,6 @@ 969BD9E019EDE88E002CE755 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; 969BD9E119EDE88E002CE755 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; 969BD9E219EDE88E002CE755 /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; - 969BD9E719EDE88E002CE755 /* URKArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 489CFA0E128B5169005DCC2A /* URKArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9E819EDE88E002CE755 /* archive.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0918DB722E00B5651B /* archive.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9E919EDE88E002CE755 /* array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0B18DB722E00B5651B /* array.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9EA19EDE88E002CE755 /* cmddata.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0E18DB722E00B5651B /* cmddata.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9EB19EDE88E002CE755 /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1018DB722E00B5651B /* coder.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9EC19EDE88E002CE755 /* compress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1118DB722E00B5651B /* compress.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9ED19EDE88E002CE755 /* consio.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1318DB722E00B5651B /* consio.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9EE19EDE88E002CE755 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1518DB722E00B5651B /* crc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9EF19EDE88E002CE755 /* crypt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1718DB722E00B5651B /* crypt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F019EDE88E002CE755 /* dll.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1A18DB722E00B5651B /* dll.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F119EDE88E002CE755 /* encname.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1D18DB722E00B5651B /* encname.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F219EDE88E002CE755 /* errhnd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1F18DB722E00B5651B /* errhnd.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F319EDE88E002CE755 /* extinfo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2118DB722E00B5651B /* extinfo.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F419EDE88E002CE755 /* extract.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2318DB722E00B5651B /* extract.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F519EDE88E002CE755 /* filcreat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2518DB722E00B5651B /* filcreat.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F619EDE88E002CE755 /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2718DB722E00B5651B /* file.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F719EDE88E002CE755 /* filefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2918DB722E00B5651B /* filefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F819EDE88E002CE755 /* filestr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2B18DB722E00B5651B /* filestr.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9F919EDE88E002CE755 /* find.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2D18DB722E00B5651B /* find.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9FA19EDE88E002CE755 /* getbits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2F18DB722E00B5651B /* getbits.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9FB19EDE88E002CE755 /* global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3118DB722E00B5651B /* global.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9FC19EDE88E002CE755 /* headers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3218DB722E00B5651B /* headers.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9FD19EDE88E002CE755 /* isnt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3418DB722E00B5651B /* isnt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9FE19EDE88E002CE755 /* list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3718DB722E00B5651B /* list.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BD9FF19EDE88E002CE755 /* loclang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3818DB722E00B5651B /* loclang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0019EDE88E002CE755 /* log.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3A18DB722E00B5651B /* log.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0119EDE88E002CE755 /* match.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4018DB722E00B5651B /* match.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0219EDE88E002CE755 /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4218DB722E00B5651B /* model.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0319EDE88E002CE755 /* options.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4518DB722E00B5651B /* options.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0419EDE88E002CE755 /* os.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4618DB722E00B5651B /* os.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0519EDE88E002CE755 /* pathfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4918DB722E00B5651B /* pathfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0619EDE88E002CE755 /* rar.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4B18DB722E00B5651B /* rar.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0719EDE88E002CE755 /* rardefs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4C18DB722E00B5651B /* rardefs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0819EDE88E002CE755 /* rarlang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4D18DB722E00B5651B /* rarlang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0919EDE88E002CE755 /* raros.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4E18DB722E00B5651B /* raros.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0A19EDE88E002CE755 /* rartypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5018DB722E00B5651B /* rartypes.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0B19EDE88E002CE755 /* rarvm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5218DB722E00B5651B /* rarvm.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0C19EDE88E002CE755 /* rawread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5518DB722E00B5651B /* rawread.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0D19EDE88E002CE755 /* rdwrfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5718DB722E00B5651B /* rdwrfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0E19EDE88E002CE755 /* recvol.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5A18DB722E00B5651B /* recvol.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA0F19EDE88E002CE755 /* resource.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5C18DB722E00B5651B /* resource.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1019EDE88E002CE755 /* rijndael.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5E18DB722E00B5651B /* rijndael.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1119EDE88E002CE755 /* rs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6018DB722E00B5651B /* rs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1219EDE88E002CE755 /* savepos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6218DB722E00B5651B /* savepos.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1319EDE88E002CE755 /* scantree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6418DB722E00B5651B /* scantree.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1419EDE88E002CE755 /* secpassword.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6618DB722E00B5651B /* secpassword.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1519EDE88E002CE755 /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6818DB722E00B5651B /* sha1.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1619EDE88E002CE755 /* smallfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6A18DB722E00B5651B /* smallfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1719EDE88E002CE755 /* strfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6C18DB722E00B5651B /* strfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1819EDE88E002CE755 /* strlist.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6E18DB722E00B5651B /* strlist.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1919EDE88E002CE755 /* suballoc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7018DB722E00B5651B /* suballoc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1A19EDE88E002CE755 /* system.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7218DB722E00B5651B /* system.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1B19EDE88E002CE755 /* timefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7418DB722E00B5651B /* timefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1C19EDE88E002CE755 /* ulinks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7618DB722E00B5651B /* ulinks.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1D19EDE88E002CE755 /* unicode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7818DB722E00B5651B /* unicode.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1E19EDE88E002CE755 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA1F19EDE88E002CE755 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969BDA2019EDE88E002CE755 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 969F17381A6029E700665453 /* UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 969F17361A60297700665453 /* UnrarKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 96DBF7FA1A3F72800033B759 /* NSString+UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 96DBF7F71A3F72800033B759 /* NSString+UnrarKit.h */; }; 96DBF7FC1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96DBF7FD1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96E5D345198B333200A74340 /* Test Data in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AD018D28F1600AD7321 /* Test Data */; }; @@ -296,13 +297,11 @@ 96F450771B38552200679597 /* IsPasswordProtectedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450761B38552200679597 /* IsPasswordProtectedTests.m */; }; 96F450791B385AF800679597 /* ListFilenamesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450781B385AF800679597 /* ListFilenamesTests.m */; }; 96F4507B1B385BCD00679597 /* ExtractFilesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F4507A1B385BCD00679597 /* ExtractFilesTests.m */; }; - 96F5BBB71B39A65F00ACB162 /* libUnrarKit iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 969BDA2419EDE88E002CE755 /* libUnrarKit iOS.a */; }; 96F5BBBD1B39A68600ACB162 /* URKArchiveTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 964547D11B384F7D00202B28 /* URKArchiveTestCase.m */; }; 96F5BBBF1B39AD3000ACB162 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9660D7AE1A3F4FF90059AC1E /* libz.dylib */; }; 96F5BBC11B39AEBC00ACB162 /* Test Data in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AD018D28F1600AD7321 /* Test Data */; }; 96F5BBC21B39AF2300ACB162 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96F5BBC31B39B18B00ACB162 /* ExtractFilesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F4507A1B385BCD00679597 /* ExtractFilesTests.m */; }; - F3FCD46C1A3262E5003612BF /* URKFileInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FCD4691A3262E5003612BF /* URKFileInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3FCD46E1A3262E5003612BF /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; F3FCD46F1A3262E5003612BF /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; /* End PBXBuildFile section */ @@ -315,13 +314,6 @@ remoteGlobalIDString = 96EA532D1B3B462D00F79DC6; remoteInfo = iOSUnitTestHostApp; }; - 96F5BBB81B39A65F00ACB162 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 969BD9AE19EDE88E002CE755; - remoteInfo = "UnrarKit iOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -334,15 +326,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 969BD9E519EDE88E002CE755 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -507,7 +490,7 @@ 96853F8318DB722F00B5651B /* volume.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = volume.hpp; sourceTree = ""; }; 96853F8418DB722F00B5651B /* win32acl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = win32acl.cpp; sourceTree = ""; }; 96853F8518DB722F00B5651B /* win32stm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = win32stm.cpp; sourceTree = ""; }; - 969BDA2419EDE88E002CE755 /* libUnrarKit iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libUnrarKit iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9699F9DA1B3CB83100B6D373 /* UnrarKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UnrarKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 969F17361A60297700665453 /* UnrarKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UnrarKit.h; sourceTree = ""; }; 96DBF7F71A3F72800033B759 /* NSString+UnrarKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+UnrarKit.h"; path = "Categories/NSString+UnrarKit.h"; sourceTree = ""; }; 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "NSString+UnrarKit.mm"; path = "Categories/NSString+UnrarKit.mm"; sourceTree = ""; }; @@ -535,7 +518,7 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 969BD9E319EDE88E002CE755 /* Frameworks */ = { + 9699F9D61B3CB83100B6D373 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -561,7 +544,7 @@ buildActionMask = 2147483647; files = ( 96F5BBBF1B39AD3000ACB162 /* libz.dylib in Frameworks */, - 96F5BBB71B39A65F00ACB162 /* libUnrarKit iOS.a in Frameworks */, + 9699FA691B3CBD1000B6D373 /* UnrarKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -571,11 +554,11 @@ 034768DFFF38A50411DB9C8B /* Products */ = { isa = PBXGroup; children = ( + 96EA535B1B3CB04300F79DC6 /* UnrarKit.framework */, 964C8ABB18D28EE000AD7321 /* UnrarKit Tests.xctest */, - 969BDA2419EDE88E002CE755 /* libUnrarKit iOS.a */, + 9699F9DA1B3CB83100B6D373 /* UnrarKit.framework */, 96F5BBB11B39A65F00ACB162 /* UnrarKit iOS Tests.xctest */, 96EA532E1B3B462D00F79DC6 /* iOSUnitTestHostApp.app */, - 96EA535B1B3CB04300F79DC6 /* UnrarKit.framework */, ); name = Products; sourceTree = ""; @@ -844,71 +827,70 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 969BD9E619EDE88E002CE755 /* Headers */ = { + 9699F9D71B3CB83100B6D373 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 969BD9E719EDE88E002CE755 /* URKArchive.h in Headers */, - F3FCD46C1A3262E5003612BF /* URKFileInfo.h in Headers */, - 969F17381A6029E700665453 /* UnrarKit.h in Headers */, - 969BD9E819EDE88E002CE755 /* archive.hpp in Headers */, - 969BD9E919EDE88E002CE755 /* array.hpp in Headers */, - 969BD9EA19EDE88E002CE755 /* cmddata.hpp in Headers */, - 969BD9EB19EDE88E002CE755 /* coder.hpp in Headers */, - 969BD9EC19EDE88E002CE755 /* compress.hpp in Headers */, - 969BD9ED19EDE88E002CE755 /* consio.hpp in Headers */, - 969BD9EE19EDE88E002CE755 /* crc.hpp in Headers */, - 969BD9EF19EDE88E002CE755 /* crypt.hpp in Headers */, - 969BD9F019EDE88E002CE755 /* dll.hpp in Headers */, - 969BD9F119EDE88E002CE755 /* encname.hpp in Headers */, - 969BD9F219EDE88E002CE755 /* errhnd.hpp in Headers */, - 969BD9F319EDE88E002CE755 /* extinfo.hpp in Headers */, - 969BD9F419EDE88E002CE755 /* extract.hpp in Headers */, - 969BD9F519EDE88E002CE755 /* filcreat.hpp in Headers */, - 969BD9F619EDE88E002CE755 /* file.hpp in Headers */, - 969BD9F719EDE88E002CE755 /* filefn.hpp in Headers */, - 969BD9F819EDE88E002CE755 /* filestr.hpp in Headers */, - 969BD9F919EDE88E002CE755 /* find.hpp in Headers */, - 969BD9FA19EDE88E002CE755 /* getbits.hpp in Headers */, - 969BD9FB19EDE88E002CE755 /* global.hpp in Headers */, - 969BD9FC19EDE88E002CE755 /* headers.hpp in Headers */, - 969BD9FD19EDE88E002CE755 /* isnt.hpp in Headers */, - 969BD9FE19EDE88E002CE755 /* list.hpp in Headers */, - 969BD9FF19EDE88E002CE755 /* loclang.hpp in Headers */, - 969BDA0019EDE88E002CE755 /* log.hpp in Headers */, - 969BDA0119EDE88E002CE755 /* match.hpp in Headers */, - 969BDA0219EDE88E002CE755 /* model.hpp in Headers */, - 969BDA0319EDE88E002CE755 /* options.hpp in Headers */, - 969BDA0419EDE88E002CE755 /* os.hpp in Headers */, - 969BDA0519EDE88E002CE755 /* pathfn.hpp in Headers */, - 969BDA0619EDE88E002CE755 /* rar.hpp in Headers */, - 969BDA0719EDE88E002CE755 /* rardefs.hpp in Headers */, - 969BDA0819EDE88E002CE755 /* rarlang.hpp in Headers */, - 969BDA0919EDE88E002CE755 /* raros.hpp in Headers */, - 969BDA0A19EDE88E002CE755 /* rartypes.hpp in Headers */, - 969BDA0B19EDE88E002CE755 /* rarvm.hpp in Headers */, - 969BDA0C19EDE88E002CE755 /* rawread.hpp in Headers */, - 969BDA0D19EDE88E002CE755 /* rdwrfn.hpp in Headers */, - 969BDA0E19EDE88E002CE755 /* recvol.hpp in Headers */, - 969BDA0F19EDE88E002CE755 /* resource.hpp in Headers */, - 969BDA1019EDE88E002CE755 /* rijndael.hpp in Headers */, - 969BDA1119EDE88E002CE755 /* rs.hpp in Headers */, - 96DBF7FA1A3F72800033B759 /* NSString+UnrarKit.h in Headers */, - 969BDA1219EDE88E002CE755 /* savepos.hpp in Headers */, - 969BDA1319EDE88E002CE755 /* scantree.hpp in Headers */, - 969BDA1419EDE88E002CE755 /* secpassword.hpp in Headers */, - 969BDA1519EDE88E002CE755 /* sha1.hpp in Headers */, - 969BDA1619EDE88E002CE755 /* smallfn.hpp in Headers */, - 969BDA1719EDE88E002CE755 /* strfn.hpp in Headers */, - 969BDA1819EDE88E002CE755 /* strlist.hpp in Headers */, - 969BDA1919EDE88E002CE755 /* suballoc.hpp in Headers */, - 969BDA1A19EDE88E002CE755 /* system.hpp in Headers */, - 969BDA1B19EDE88E002CE755 /* timefn.hpp in Headers */, - 969BDA1C19EDE88E002CE755 /* ulinks.hpp in Headers */, - 969BDA1D19EDE88E002CE755 /* unicode.hpp in Headers */, - 969BDA1E19EDE88E002CE755 /* unpack.hpp in Headers */, - 969BDA1F19EDE88E002CE755 /* version.hpp in Headers */, - 969BDA2019EDE88E002CE755 /* volume.hpp in Headers */, + 9699FA2A1B3CBB1400B6D373 /* URKArchive.h in Headers */, + 9699FA2B1B3CBB1400B6D373 /* URKFileInfo.h in Headers */, + 9699FA2C1B3CBB1400B6D373 /* UnrarKit.h in Headers */, + 9699FA2D1B3CBB1400B6D373 /* archive.hpp in Headers */, + 9699FA2E1B3CBB1400B6D373 /* array.hpp in Headers */, + 9699FA2F1B3CBB1400B6D373 /* cmddata.hpp in Headers */, + 9699FA301B3CBB1400B6D373 /* coder.hpp in Headers */, + 9699FA311B3CBB1400B6D373 /* compress.hpp in Headers */, + 9699FA321B3CBB1400B6D373 /* consio.hpp in Headers */, + 9699FA331B3CBB1400B6D373 /* crc.hpp in Headers */, + 9699FA341B3CBB1400B6D373 /* crypt.hpp in Headers */, + 9699FA351B3CBB1400B6D373 /* dll.hpp in Headers */, + 9699FA361B3CBB1400B6D373 /* encname.hpp in Headers */, + 9699FA371B3CBB1400B6D373 /* errhnd.hpp in Headers */, + 9699FA381B3CBB1400B6D373 /* extinfo.hpp in Headers */, + 9699FA391B3CBB1400B6D373 /* extract.hpp in Headers */, + 9699FA3A1B3CBB1400B6D373 /* filcreat.hpp in Headers */, + 9699FA3B1B3CBB1400B6D373 /* file.hpp in Headers */, + 9699FA3C1B3CBB1400B6D373 /* filefn.hpp in Headers */, + 9699FA3D1B3CBB1400B6D373 /* filestr.hpp in Headers */, + 9699FA3E1B3CBB1400B6D373 /* find.hpp in Headers */, + 9699FA3F1B3CBB1400B6D373 /* getbits.hpp in Headers */, + 9699FA401B3CBB1400B6D373 /* global.hpp in Headers */, + 9699FA411B3CBB1400B6D373 /* headers.hpp in Headers */, + 9699FA421B3CBB1400B6D373 /* isnt.hpp in Headers */, + 9699FA431B3CBB1400B6D373 /* list.hpp in Headers */, + 9699FA441B3CBB1400B6D373 /* loclang.hpp in Headers */, + 9699FA451B3CBB1400B6D373 /* log.hpp in Headers */, + 9699FA461B3CBB1400B6D373 /* match.hpp in Headers */, + 9699FA471B3CBB1400B6D373 /* model.hpp in Headers */, + 9699FA481B3CBB1400B6D373 /* options.hpp in Headers */, + 9699FA491B3CBB1400B6D373 /* os.hpp in Headers */, + 9699FA4A1B3CBB1400B6D373 /* pathfn.hpp in Headers */, + 9699FA4B1B3CBB1400B6D373 /* rar.hpp in Headers */, + 9699FA4C1B3CBB1400B6D373 /* rardefs.hpp in Headers */, + 9699FA4D1B3CBB1400B6D373 /* rarlang.hpp in Headers */, + 9699FA4E1B3CBB1400B6D373 /* raros.hpp in Headers */, + 9699FA4F1B3CBB1400B6D373 /* rartypes.hpp in Headers */, + 9699FA501B3CBB1400B6D373 /* rarvm.hpp in Headers */, + 9699FA511B3CBB1400B6D373 /* rawread.hpp in Headers */, + 9699FA521B3CBB1400B6D373 /* rdwrfn.hpp in Headers */, + 9699FA531B3CBB1400B6D373 /* recvol.hpp in Headers */, + 9699FA541B3CBB1400B6D373 /* resource.hpp in Headers */, + 9699FA551B3CBB1400B6D373 /* rijndael.hpp in Headers */, + 9699FA561B3CBB1400B6D373 /* rs.hpp in Headers */, + 9699FA571B3CBB1400B6D373 /* savepos.hpp in Headers */, + 9699FA581B3CBB1400B6D373 /* scantree.hpp in Headers */, + 9699FA591B3CBB1400B6D373 /* secpassword.hpp in Headers */, + 9699FA5A1B3CBB1400B6D373 /* sha1.hpp in Headers */, + 9699FA5B1B3CBB1400B6D373 /* smallfn.hpp in Headers */, + 9699FA5C1B3CBB1400B6D373 /* strfn.hpp in Headers */, + 9699FA5D1B3CBB1400B6D373 /* strlist.hpp in Headers */, + 9699FA5E1B3CBB1400B6D373 /* suballoc.hpp in Headers */, + 9699FA5F1B3CBB1400B6D373 /* system.hpp in Headers */, + 9699FA601B3CBB1400B6D373 /* timefn.hpp in Headers */, + 9699FA611B3CBB1400B6D373 /* ulinks.hpp in Headers */, + 9699FA621B3CBB1400B6D373 /* unicode.hpp in Headers */, + 9699FA631B3CBB1400B6D373 /* unpack.hpp in Headers */, + 9699FA641B3CBB1400B6D373 /* version.hpp in Headers */, + 9699FA651B3CBB1400B6D373 /* volume.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1000,23 +982,23 @@ productReference = 964C8ABB18D28EE000AD7321 /* UnrarKit Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 969BD9AE19EDE88E002CE755 /* UnrarKit iOS */ = { + 9699F9D91B3CB83100B6D373 /* UnrarKit iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 969BDA2119EDE88E002CE755 /* Build configuration list for PBXNativeTarget "UnrarKit iOS" */; + buildConfigurationList = 9699F9ED1B3CB83200B6D373 /* Build configuration list for PBXNativeTarget "UnrarKit iOS" */; buildPhases = ( - 969BD9AF19EDE88E002CE755 /* Sources */, - 969BD9E319EDE88E002CE755 /* Frameworks */, - 969BD9E519EDE88E002CE755 /* CopyFiles */, - 969BD9E619EDE88E002CE755 /* Headers */, + 9699F9D51B3CB83100B6D373 /* Sources */, + 9699F9D61B3CB83100B6D373 /* Frameworks */, + 9699F9D71B3CB83100B6D373 /* Headers */, + 9699F9D81B3CB83100B6D373 /* Resources */, ); buildRules = ( ); dependencies = ( ); name = "UnrarKit iOS"; - productName = UnrarKit; - productReference = 969BDA2419EDE88E002CE755 /* libUnrarKit iOS.a */; - productType = "com.apple.product-type.library.static"; + productName = "UnrarKit iOS"; + productReference = 9699F9DA1B3CB83100B6D373 /* UnrarKit.framework */; + productType = "com.apple.product-type.framework"; }; 96EA532D1B3B462D00F79DC6 /* iOSUnitTestHostApp */ = { isa = PBXNativeTarget; @@ -1049,7 +1031,7 @@ dependencies = ( ); name = UnrarKit; - productName = "UnrarKit"; + productName = UnrarKit; productReference = 96EA535B1B3CB04300F79DC6 /* UnrarKit.framework */; productType = "com.apple.product-type.framework"; }; @@ -1064,7 +1046,6 @@ buildRules = ( ); dependencies = ( - 96F5BBB91B39A65F00ACB162 /* PBXTargetDependency */, 96EA53551B3B691B00F79DC6 /* PBXTargetDependency */, ); name = "UnrarKit iOS Tests"; @@ -1083,6 +1064,9 @@ 964C8ABA18D28EE000AD7321 = { TestTargetID = 96853EDA18DB71CD00B5651B; }; + 9699F9D91B3CB83100B6D373 = { + CreatedOnToolsVersion = 6.3.2; + }; 96EA532D1B3B462D00F79DC6 = { CreatedOnToolsVersion = 6.3.2; }; @@ -1114,7 +1098,7 @@ targets = ( 96EA535A1B3CB04300F79DC6 /* UnrarKit */, 964C8ABA18D28EE000AD7321 /* UnrarKit Tests */, - 969BD9AE19EDE88E002CE755 /* UnrarKit iOS */, + 9699F9D91B3CB83100B6D373 /* UnrarKit iOS */, 96F5BBB01B39A65F00ACB162 /* UnrarKit iOS Tests */, 96EA532D1B3B462D00F79DC6 /* iOSUnitTestHostApp */, ); @@ -1131,6 +1115,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9699F9D81B3CB83100B6D373 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 96EA532C1B3B462D00F79DC6 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1224,7 +1215,7 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 969BD9AF19EDE88E002CE755 /* Sources */ = { + 9699F9D51B3CB83100B6D373 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -1370,11 +1361,6 @@ target = 96EA532D1B3B462D00F79DC6 /* iOSUnitTestHostApp */; targetProxy = 96EA53541B3B691B00F79DC6 /* PBXContainerItemProxy */; }; - 96F5BBB91B39A65F00ACB162 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 969BD9AE19EDE88E002CE755 /* UnrarKit iOS */; - targetProxy = 96F5BBB81B39A65F00ACB162 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1527,7 +1513,7 @@ }; name = Release; }; - 969BDA2219EDE88E002CE755 /* Debug */ = { + 9699F9EE1B3CB83200B6D373 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1539,30 +1525,36 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphonesimulator*]" = ""; COPY_PHASE_STRIP = NO; - DSTROOT = /tmp/UnrarKit.dst; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "UnrarKit iOS"; - PUBLIC_HEADERS_FOLDER_PATH = ../../Headers/UnrarKit; + INFOPLIST_FILE = "Resources/UnrarKit-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = UnrarKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "-Wno-dangling-else", "-Wno-parentheses", @@ -1572,11 +1564,12 @@ "-Wno-shorten-64-to-32", "-Wno-unused-function", "-Wno-conditional-uninitialized", + "-Wno-error=unused-command-line-argument", ); }; name = Debug; }; - 969BDA2319EDE88E002CE755 /* Release */ = { + 9699F9EF1B3CB83200B6D373 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1588,25 +1581,32 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DSTROOT = /tmp/UnrarKit.dst; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "UnrarKit iOS"; - PUBLIC_HEADERS_FOLDER_PATH = ../../Headers/UnrarKit; + INFOPLIST_FILE = "Resources/UnrarKit-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = UnrarKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = ( "-Wno-dangling-else", @@ -1920,11 +1920,11 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 969BDA2119EDE88E002CE755 /* Build configuration list for PBXNativeTarget "UnrarKit iOS" */ = { + 9699F9ED1B3CB83200B6D373 /* Build configuration list for PBXNativeTarget "UnrarKit iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( - 969BDA2219EDE88E002CE755 /* Debug */, - 969BDA2319EDE88E002CE755 /* Release */, + 9699F9EE1B3CB83200B6D373 /* Debug */, + 9699F9EF1B3CB83200B6D373 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit iOS.xcscheme b/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit iOS.xcscheme index b852940..e862afd 100644 --- a/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit iOS.xcscheme +++ b/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit iOS.xcscheme @@ -14,26 +14,12 @@ buildForAnalyzing = "YES"> - - - - @@ -75,8 +61,8 @@ @@ -93,15 +79,15 @@ + buildConfiguration = "Debug"> Date: Thu, 25 Jun 2015 19:04:34 -0400 Subject: [PATCH 03/38] Added carthage validation, which won't work 100% until my pull request (#583) is accepted on the Carthage project --- .gitignore | 2 ++ .travis.yml | 3 +-- Scripts/carthage-validate.sh | 37 ++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100755 Scripts/carthage-validate.sh diff --git a/.gitignore b/.gitignore index d12b4e3..4cb672c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ build .DS_Store +CarthageValidation + **/*.xccheckout **/xcuserdata/* diff --git a/.travis.yml b/.travis.yml index 23b2ed2..9f56365 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,7 @@ matrix: script: - xctool -workspace $TRAVIS_XCODE_WORKSPACE -scheme "$TRAVIS_XCODE_SCHEME" -sdk $TRAVIS_XCODE_SDK -configuration Release analyze test - -after_script: + - ./Scripts/carthage-validate.sh - ./Scripts/cocoapod-validate.sh # Turn on Docker, container-based infrastructure diff --git a/Scripts/carthage-validate.sh b/Scripts/carthage-validate.sh new file mode 100755 index 0000000..1bb6d64 --- /dev/null +++ b/Scripts/carthage-validate.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +if [ -z ${TRAVIS+x} ]; then + TRAVIS_BUILD_DIR="file:///Users/Dov/Source Code/UnrarKit" + TRAVIS_BRANCH=carthage +fi + +if [ ! -d "CarthageValidation" ]; then + mkdir "CarthageValidation" +fi + +pushd CarthageValidation > /dev/null + +rm Cartfile +rm Cartfile.resolved +rm -rf Carthage + +echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile + +carthage bootstrap --configuration Debug --verbose --simulator-only +EXIT_CODE=$? + +echo "Checking for build products..." + +if [ ! -d "Carthage/Build/Mac/UnrarKit.framework" ]; then + echo "No Mac library built" + EXIT_CODE=1 +fi + +if [ ! -d "Carthage/Build/iOS/UnrarKit.framework" ]; then + echo "No iOS library built" + EXIT_CODE=1 +fi + +popd > /dev/null + +exit $EXIT_CODE \ No newline at end of file From b1d0b23aa7a465782f0e72f65dc304a3af3f0e75 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Fri, 26 Jun 2015 10:44:29 -0400 Subject: [PATCH 04/38] Updated Mac unit test target to work with framework --- UnrarKit.xcodeproj/project.pbxproj | 134 ++++------------------------- 1 file changed, 16 insertions(+), 118 deletions(-) diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index a4c87e9..313c6e4 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -7,57 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 960F667519EDDC2600512951 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667619EDDC2600512951 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667719EDDC2600512951 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667819EDDC2600512951 /* pathfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4818DB722E00B5651B /* pathfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667919EDDC2600512951 /* smallfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6918DB722E00B5651B /* smallfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667A19EDDC2600512951 /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3018DB722E00B5651B /* global.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667B19EDDC2600512951 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667C19EDDC2600512951 /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2818DB722E00B5651B /* filefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667D19EDDC2600512951 /* filcreat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2418DB722E00B5651B /* filcreat.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667E19EDDC2600512951 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0818DB722E00B5651B /* archive.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F667F19EDDC2600512951 /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668019EDDC2600512951 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7718DB722E00B5651B /* unicode.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668119EDDC2600512951 /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7118DB722E00B5651B /* system.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668219EDDC2600512951 /* isnt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3318DB722E00B5651B /* isnt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668319EDDC2600512951 /* crypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1618DB722E00B5651B /* crypt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668419EDDC2600512951 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1418DB722E00B5651B /* crc.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668519EDDC2600512951 /* rawread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5418DB722E00B5651B /* rawread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668619EDDC2600512951 /* encname.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1C18DB722E00B5651B /* encname.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668719EDDC2600512951 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5B18DB722E00B5651B /* resource.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668819EDDC2600512951 /* match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3F18DB722E00B5651B /* match.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668919EDDC2600512951 /* timefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7318DB722E00B5651B /* timefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668A19EDDC2600512951 /* rdwrfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5618DB722E00B5651B /* rdwrfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668B19EDDC2600512951 /* consio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1218DB722E00B5651B /* consio.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668C19EDDC2600512951 /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4418DB722E00B5651B /* options.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668D19EDDC2600512951 /* errhnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1E18DB722E00B5651B /* errhnd.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668E19EDDC2600512951 /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F668F19EDDC2600512951 /* secpassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6518DB722E00B5651B /* secpassword.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669019EDDC2600512951 /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669119EDDC2600512951 /* getbits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2E18DB722E00B5651B /* getbits.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669219EDDC2600512951 /* sha1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6718DB722E00B5651B /* sha1.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669319EDDC2600512951 /* sha256.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCF19ED8BB200DAF8F1 /* sha256.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669419EDDC2600512951 /* blake2s.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FB419ED8A8200DAF8F1 /* blake2s.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669519EDDC2600512951 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC419ED8B0400DAF8F1 /* hash.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669619EDDC2600512951 /* extinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2018DB722E00B5651B /* extinfo.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669719EDDC2600512951 /* extract.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2218DB722E00B5651B /* extract.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669819EDDC2600512951 /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F8218DB722F00B5651B /* volume.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669919EDDC2600512951 /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3618DB722E00B5651B /* list.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669A19EDDC2600512951 /* find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2C18DB722E00B5651B /* find.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669B19EDDC2600512951 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7A18DB722E00B5651B /* unpack.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669C19EDDC2600512951 /* headers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC619ED8B1F00DAF8F1 /* headers.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669D19EDDC2600512951 /* threadpool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD219ED8C6100DAF8F1 /* threadpool.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669E19EDDC2600512951 /* rs16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCD19ED8B9700DAF8F1 /* rs16.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F669F19EDDC2600512951 /* cmddata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0D18DB722E00B5651B /* cmddata.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F66A019EDDC2600512951 /* ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD419ED8C8000DAF8F1 /* ui.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F66A119EDDC2600512951 /* filestr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2A18DB722E00B5651B /* filestr.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F66A219EDDC2600512951 /* recvol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5918DB722E00B5651B /* recvol.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F66A319EDDC2600512951 /* rs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5F18DB722E00B5651B /* rs.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F66A419EDDC2600512951 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F66A519EDDC2600512951 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 960F66A619EDDC2600512951 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 964547D21B384F7D00202B28 /* URKArchiveTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 964547D11B384F7D00202B28 /* URKArchiveTestCase.m */; }; 964C8AC718D28EE000AD7321 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AC518D28EE000AD7321 /* InfoPlist.strings */; }; 9660D7AF1A3F4FF90059AC1E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9660D7AE1A3F4FF90059AC1E /* libz.dylib */; }; 9699F91D1B3CB4D000B6D373 /* URKArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 489CFA0E128B5169005DCC2A /* URKArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -181,6 +130,13 @@ 9699FA641B3CBB1400B6D373 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 9699FA651B3CBB1400B6D373 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 9699FA691B3CBD1000B6D373 /* UnrarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9699F9DA1B3CB83100B6D373 /* UnrarKit.framework */; }; + 9699FA6A1B3CE95D00B6D373 /* UnrarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96EA535B1B3CB04300F79DC6 /* UnrarKit.framework */; }; + 9699FA891B3D9B5700B6D373 /* URKArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 964C8AC818D28EE000AD7321 /* URKArchiveTests.m */; }; + 9699FA8A1B3D9B6F00B6D373 /* URKArchiveTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 964547D11B384F7D00202B28 /* URKArchiveTestCase.m */; }; + 9699FA8B1B3D9B6F00B6D373 /* ExtractFilesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F4507A1B385BCD00679597 /* ExtractFilesTests.m */; }; + 9699FA8C1B3D9B6F00B6D373 /* IsPasswordProtectedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450761B38552200679597 /* IsPasswordProtectedTests.m */; }; + 9699FA8D1B3D9B6F00B6D373 /* ListFilenamesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450781B385AF800679597 /* ListFilenamesTests.m */; }; + 9699FA8E1B3D9B6F00B6D373 /* ValidatePasswordTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450741B38527100679597 /* ValidatePasswordTests.m */; }; 969BD9B019EDE88E002CE755 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; }; 969BD9B119EDE88E002CE755 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; 969BD9B219EDE88E002CE755 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; }; @@ -232,11 +188,8 @@ 969BD9E019EDE88E002CE755 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; 969BD9E119EDE88E002CE755 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; 969BD9E219EDE88E002CE755 /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; - 96DBF7FC1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96DBF7FD1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96E5D345198B333200A74340 /* Test Data in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AD018D28F1600AD7321 /* Test Data */; }; - 96E5D346198B333500A74340 /* URKArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 964C8AC818D28EE000AD7321 /* URKArchiveTests.m */; }; - 96E5D347198B334500A74340 /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; 96EA53331B3B462D00F79DC6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96EA53321B3B462D00F79DC6 /* AppDelegate.swift */; }; 96EA53501B3B4A0500F79DC6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96EA53361B3B462D00F79DC6 /* Main.storyboard */; }; 96EA53511B3B4A0800F79DC6 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96EA533B1B3B462D00F79DC6 /* LaunchScreen.xib */; }; @@ -293,16 +246,11 @@ 96EA53AA1B3CB2C700F79DC6 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53AB1B3CB2C700F79DC6 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53AC1B3CB2C700F79DC6 /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; - 96F450751B38527100679597 /* ValidatePasswordTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450741B38527100679597 /* ValidatePasswordTests.m */; }; - 96F450771B38552200679597 /* IsPasswordProtectedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450761B38552200679597 /* IsPasswordProtectedTests.m */; }; - 96F450791B385AF800679597 /* ListFilenamesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450781B385AF800679597 /* ListFilenamesTests.m */; }; - 96F4507B1B385BCD00679597 /* ExtractFilesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F4507A1B385BCD00679597 /* ExtractFilesTests.m */; }; 96F5BBBD1B39A68600ACB162 /* URKArchiveTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 964547D11B384F7D00202B28 /* URKArchiveTestCase.m */; }; 96F5BBBF1B39AD3000ACB162 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9660D7AE1A3F4FF90059AC1E /* libz.dylib */; }; 96F5BBC11B39AEBC00ACB162 /* Test Data in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AD018D28F1600AD7321 /* Test Data */; }; 96F5BBC21B39AF2300ACB162 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96F5BBC31B39B18B00ACB162 /* ExtractFilesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F4507A1B385BCD00679597 /* ExtractFilesTests.m */; }; - F3FCD46E1A3262E5003612BF /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; F3FCD46F1A3262E5003612BF /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; /* End PBXBuildFile section */ @@ -515,6 +463,7 @@ buildActionMask = 2147483647; files = ( 9660D7AF1A3F4FF90059AC1E /* libz.dylib in Frameworks */, + 9699FA6A1B3CE95D00B6D373 /* UnrarKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1153,65 +1102,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 960F667519EDDC2600512951 /* rar.cpp in Sources */, - 960F667619EDDC2600512951 /* strlist.cpp in Sources */, - 960F667719EDDC2600512951 /* strfn.cpp in Sources */, - 960F667819EDDC2600512951 /* pathfn.cpp in Sources */, - 960F667919EDDC2600512951 /* smallfn.cpp in Sources */, - 960F667A19EDDC2600512951 /* global.cpp in Sources */, - 960F667B19EDDC2600512951 /* file.cpp in Sources */, - 960F667C19EDDC2600512951 /* filefn.cpp in Sources */, - 960F667D19EDDC2600512951 /* filcreat.cpp in Sources */, - 960F667E19EDDC2600512951 /* archive.cpp in Sources */, - 960F667F19EDDC2600512951 /* arcread.cpp in Sources */, - 960F668019EDDC2600512951 /* unicode.cpp in Sources */, - 960F668119EDDC2600512951 /* system.cpp in Sources */, - 960F668219EDDC2600512951 /* isnt.cpp in Sources */, - 960F668319EDDC2600512951 /* crypt.cpp in Sources */, - 960F668419EDDC2600512951 /* crc.cpp in Sources */, - 960F668519EDDC2600512951 /* rawread.cpp in Sources */, - 960F668619EDDC2600512951 /* encname.cpp in Sources */, - 960F668719EDDC2600512951 /* resource.cpp in Sources */, - 960F668819EDDC2600512951 /* match.cpp in Sources */, - 96F450771B38552200679597 /* IsPasswordProtectedTests.m in Sources */, - 960F668919EDDC2600512951 /* timefn.cpp in Sources */, - 960F668A19EDDC2600512951 /* rdwrfn.cpp in Sources */, - 960F668B19EDDC2600512951 /* consio.cpp in Sources */, - 960F668C19EDDC2600512951 /* options.cpp in Sources */, - 960F668D19EDDC2600512951 /* errhnd.cpp in Sources */, - 960F668E19EDDC2600512951 /* rarvm.cpp in Sources */, - 960F668F19EDDC2600512951 /* secpassword.cpp in Sources */, - 960F669019EDDC2600512951 /* rijndael.cpp in Sources */, - 960F669119EDDC2600512951 /* getbits.cpp in Sources */, - 960F669219EDDC2600512951 /* sha1.cpp in Sources */, - 960F669319EDDC2600512951 /* sha256.cpp in Sources */, - F3FCD46E1A3262E5003612BF /* URKFileInfo.m in Sources */, - 960F669419EDDC2600512951 /* blake2s.cpp in Sources */, - 960F669519EDDC2600512951 /* hash.cpp in Sources */, - 96F450751B38527100679597 /* ValidatePasswordTests.m in Sources */, - 960F669619EDDC2600512951 /* extinfo.cpp in Sources */, - 960F669719EDDC2600512951 /* extract.cpp in Sources */, - 960F669819EDDC2600512951 /* volume.cpp in Sources */, - 960F669919EDDC2600512951 /* list.cpp in Sources */, - 964547D21B384F7D00202B28 /* URKArchiveTestCase.m in Sources */, - 960F669A19EDDC2600512951 /* find.cpp in Sources */, - 960F669B19EDDC2600512951 /* unpack.cpp in Sources */, - 960F669C19EDDC2600512951 /* headers.cpp in Sources */, - 96F4507B1B385BCD00679597 /* ExtractFilesTests.m in Sources */, - 960F669D19EDDC2600512951 /* threadpool.cpp in Sources */, - 960F669E19EDDC2600512951 /* rs16.cpp in Sources */, - 96F450791B385AF800679597 /* ListFilenamesTests.m in Sources */, - 960F669F19EDDC2600512951 /* cmddata.cpp in Sources */, - 960F66A019EDDC2600512951 /* ui.cpp in Sources */, - 96DBF7FC1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */, - 960F66A119EDDC2600512951 /* filestr.cpp in Sources */, - 960F66A219EDDC2600512951 /* recvol.cpp in Sources */, - 960F66A319EDDC2600512951 /* rs.cpp in Sources */, - 960F66A419EDDC2600512951 /* scantree.cpp in Sources */, - 960F66A519EDDC2600512951 /* qopen.cpp in Sources */, - 960F66A619EDDC2600512951 /* dll.cpp in Sources */, - 96E5D347198B334500A74340 /* URKArchive.mm in Sources */, - 96E5D346198B333500A74340 /* URKArchiveTests.m in Sources */, + 9699FA891B3D9B5700B6D373 /* URKArchiveTests.m in Sources */, + 9699FA8C1B3D9B6F00B6D373 /* IsPasswordProtectedTests.m in Sources */, + 9699FA8E1B3D9B6F00B6D373 /* ValidatePasswordTests.m in Sources */, + 9699FA8B1B3D9B6F00B6D373 /* ExtractFilesTests.m in Sources */, + 9699FA8A1B3D9B6F00B6D373 /* URKArchiveTestCase.m in Sources */, + 9699FA8D1B3D9B6F00B6D373 /* ListFilenamesTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1461,6 +1357,7 @@ ); INFOPLIST_FILE = "Tests/UnrarKit Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; TEST_HOST = "$(BUNDLE_LOADER)"; @@ -1498,6 +1395,7 @@ ); INFOPLIST_FILE = "Tests/UnrarKit Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; TEST_HOST = "$(BUNDLE_LOADER)"; From c4b571604f72b9a496afe5494a8428f3ce98d4e6 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Fri, 26 Jun 2015 11:20:23 -0400 Subject: [PATCH 05/38] Added UnrarKit.framework to iOS test host app --- UnrarKit.xcodeproj/project.pbxproj | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index 313c6e4..07c041e 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -137,6 +137,7 @@ 9699FA8C1B3D9B6F00B6D373 /* IsPasswordProtectedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450761B38552200679597 /* IsPasswordProtectedTests.m */; }; 9699FA8D1B3D9B6F00B6D373 /* ListFilenamesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450781B385AF800679597 /* ListFilenamesTests.m */; }; 9699FA8E1B3D9B6F00B6D373 /* ValidatePasswordTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450741B38527100679597 /* ValidatePasswordTests.m */; }; + 9699FA8F1B3DA4C400B6D373 /* UnrarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9699F9DA1B3CB83100B6D373 /* UnrarKit.framework */; }; 969BD9B019EDE88E002CE755 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; }; 969BD9B119EDE88E002CE755 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; 969BD9B219EDE88E002CE755 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; }; @@ -478,6 +479,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 9699FA8F1B3DA4C400B6D373 /* UnrarKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1367,6 +1369,7 @@ "-Wno-return-type", "-Wno-unused-variable", "-Wno-switch", + "-Wno-error=unused-command-line-argument", ); WRAPPER_EXTENSION = xctest; }; @@ -1754,6 +1757,14 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSUnitTestHostApp.app/iOSUnitTestHostApp"; + WARNING_CFLAGS = ( + "-Wno-dangling-else", + "-Wno-parentheses", + "-Wno-return-type", + "-Wno-unused-variable", + "-Wno-switch", + "-Wno-error=unused-command-line-argument", + ); }; name = Debug; }; @@ -1794,6 +1805,14 @@ SDKROOT = iphoneos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSUnitTestHostApp.app/iOSUnitTestHostApp"; VALIDATE_PRODUCT = YES; + WARNING_CFLAGS = ( + "-Wno-dangling-else", + "-Wno-parentheses", + "-Wno-return-type", + "-Wno-unused-variable", + "-Wno-switch", + "-Wno-error=unused-command-line-argument", + ); }; name = Release; }; From ef28f4942159dfe954375b5b5b4f7120e51a7fdf Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Fri, 26 Jun 2015 11:57:11 -0400 Subject: [PATCH 06/38] Added before_install step to run the latest xctool --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f56365..a01eec3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: objective-c - osx_image: beta-xcode6.3 +before_install: + - brew update + - brew install xctool xcode_workspace: UnrarKit.xcworkspace From ba069549614fc0cdbf290ada5fbc50d00c0dbb49 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Fri, 26 Jun 2015 12:01:31 -0400 Subject: [PATCH 07/38] Switched from installing xctool to upgrading it --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a01eec3..00678d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: objective-c osx_image: beta-xcode6.3 before_install: - brew update - - brew install xctool + - brew upgrade xctool xcode_workspace: UnrarKit.xcworkspace From 0c3de02b265e2476abf9c74c806189397fbc7646 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 21 Jul 2015 13:30:51 -0400 Subject: [PATCH 08/38] Fixed UnrarExample to work with UnrarKit framework, instead of the static library --- .../UnrarExample.xcodeproj/project.pbxproj | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Example/UnrarExample.xcodeproj/project.pbxproj b/Example/UnrarExample.xcodeproj/project.pbxproj index 9bbe53b..2fd8ad7 100644 --- a/Example/UnrarExample.xcodeproj/project.pbxproj +++ b/Example/UnrarExample.xcodeproj/project.pbxproj @@ -16,8 +16,8 @@ 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; 28D7ACF80DDB3853001CB0EB /* UnrarExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* UnrarExampleViewController.m */; }; 964547CB1B32026700202B28 /* Test Archive (Password).rar in Resources */ = {isa = PBXBuildFile; fileRef = 964547CA1B32026700202B28 /* Test Archive (Password).rar */; }; + 9690E9D91B5EB553008FB6DA /* UnrarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9690E9D51B5EAF9E008FB6DA /* UnrarKit.framework */; }; 96CD2C1A18D4D823002D004A /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96CD2C1918D4D823002D004A /* Default-568h@2x.png */; }; - 96DBF7FF1A3FE1620033B759 /* libUnrarKit iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96DBF7FE1A3FE1620033B759 /* libUnrarKit iOS.a */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -35,9 +35,8 @@ 32CA4F630368D1EE00C91783 /* UnrarExample_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnrarExample_Prefix.pch; sourceTree = ""; }; 8D1107310486CEB800E47090 /* UnrarExample-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "UnrarExample-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; 964547CA1B32026700202B28 /* Test Archive (Password).rar */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Test Archive (Password).rar"; path = "../Tests/Test Data/Test Archive (Password).rar"; sourceTree = ""; }; - 96BBCACE18DE82D900BE9B86 /* libUnrarKit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libUnrarKit.a; path = "../build/Debug-iphoneos/libUnrarKit.a"; sourceTree = ""; }; + 9690E9D51B5EAF9E008FB6DA /* UnrarKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UnrarKit.framework; path = "../../../Library/Developer/Xcode/DerivedData/UnrarKit-gzvaaqxmnbebtugiflrvekbllxhn/Build/Products/Debug/UnrarKit.framework"; sourceTree = ""; }; 96CD2C1918D4D823002D004A /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - 96DBF7FE1A3FE1620033B759 /* libUnrarKit iOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libUnrarKit iOS.a"; path = "../build/Debug-iphoneos/libUnrarKit iOS.a"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -45,7 +44,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 96DBF7FF1A3FE1620033B759 /* libUnrarKit iOS.a in Frameworks */, + 9690E9D91B5EB553008FB6DA /* UnrarKit.framework in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */, @@ -110,8 +109,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - 96DBF7FE1A3FE1620033B759 /* libUnrarKit iOS.a */, - 96BBCACE18DE82D900BE9B86 /* libUnrarKit.a */, + 9690E9D51B5EAF9E008FB6DA /* UnrarKit.framework */, 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, 1D30AB110D05D00D00671497 /* Foundation.framework */, 288765A40DF7441C002DB57D /* CoreGraphics.framework */, @@ -210,7 +208,8 @@ "$(BUILT_PRODUCTS_DIR)/../../Headers", ); INFOPLIST_FILE = "UnrarExample-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + OTHER_CFLAGS = "-DTARGET_OS_IPHONE"; PRODUCT_NAME = UnrarExample; }; name = Debug; @@ -229,7 +228,11 @@ "$(BUILT_PRODUCTS_DIR)/../../Headers", ); INFOPLIST_FILE = "UnrarExample-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + OTHER_CFLAGS = ( + "-DTARGET_OS_IPHONE", + "-DNS_BLOCK_ASSERTIONS=1", + ); PRODUCT_NAME = UnrarExample; VALIDATE_PRODUCT = YES; }; From 09507e621bf6d883045873afe1d26496bdd0028e Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 21 Jul 2015 13:46:13 -0400 Subject: [PATCH 09/38] Updated carthage validation script to remove the '--simulator-only' flag, and trim down the build DEV directory --- Scripts/carthage-validate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/carthage-validate.sh b/Scripts/carthage-validate.sh index 1bb6d64..25b7b55 100755 --- a/Scripts/carthage-validate.sh +++ b/Scripts/carthage-validate.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -z ${TRAVIS+x} ]; then - TRAVIS_BUILD_DIR="file:///Users/Dov/Source Code/UnrarKit" + TRAVIS_BUILD_DIR="/Users/Dov/Source Code/UnrarKit" TRAVIS_BRANCH=carthage fi @@ -17,7 +17,7 @@ rm -rf Carthage echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile -carthage bootstrap --configuration Debug --verbose --simulator-only +carthage bootstrap --configuration Debug --verbose EXIT_CODE=$? echo "Checking for build products..." From 9b04ba97c724ad629857c79d568fe1ee37d7a224 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Wed, 22 Jul 2015 11:46:47 -0400 Subject: [PATCH 10/38] Added Carthage installation to .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 00678d6..f490ce5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: objective-c osx_image: beta-xcode6.3 before_install: - brew update + - brew install carthage - brew upgrade xctool xcode_workspace: UnrarKit.xcworkspace From 6babd2db2c0c292fd724d9b057a6ee6129395936 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 14:40:20 -0400 Subject: [PATCH 11/38] Updated static analyzer warning to alleviate a warning it generated --- UnrarKit.xcodeproj/project.pbxproj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index 07c041e..73c7177 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -195,17 +195,17 @@ 96EA53501B3B4A0500F79DC6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96EA53361B3B462D00F79DC6 /* Main.storyboard */; }; 96EA53511B3B4A0800F79DC6 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96EA533B1B3B462D00F79DC6 /* LaunchScreen.xib */; }; 96EA53781B3CB2C700F79DC6 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53791B3CB2C700F79DC6 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53791B3CB2C700F79DC6 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA537A1B3CB2C700F79DC6 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA537B1B3CB2C700F79DC6 /* pathfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4818DB722E00B5651B /* pathfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA537B1B3CB2C700F79DC6 /* pathfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4818DB722E00B5651B /* pathfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA537C1B3CB2C700F79DC6 /* smallfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6918DB722E00B5651B /* smallfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA537D1B3CB2C700F79DC6 /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3018DB722E00B5651B /* global.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA537E1B3CB2C700F79DC6 /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; - 96EA537F1B3CB2C700F79DC6 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA537F1B3CB2C700F79DC6 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53801B3CB2C700F79DC6 /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2818DB722E00B5651B /* filefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53811B3CB2C700F79DC6 /* filcreat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2418DB722E00B5651B /* filcreat.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53821B3CB2C700F79DC6 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0818DB722E00B5651B /* archive.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53831B3CB2C700F79DC6 /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53831B3CB2C700F79DC6 /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53841B3CB2C700F79DC6 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7718DB722E00B5651B /* unicode.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53851B3CB2C700F79DC6 /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7118DB722E00B5651B /* system.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53861B3CB2C700F79DC6 /* isnt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3318DB722E00B5651B /* isnt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; @@ -220,9 +220,9 @@ 96EA538F1B3CB2C700F79DC6 /* consio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1218DB722E00B5651B /* consio.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53901B3CB2C700F79DC6 /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4418DB722E00B5651B /* options.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53911B3CB2C700F79DC6 /* errhnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1E18DB722E00B5651B /* errhnd.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53921B3CB2C700F79DC6 /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53921B3CB2C700F79DC6 /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53931B3CB2C700F79DC6 /* secpassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6518DB722E00B5651B /* secpassword.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53941B3CB2C700F79DC6 /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53941B3CB2C700F79DC6 /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53951B3CB2C700F79DC6 /* getbits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2E18DB722E00B5651B /* getbits.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53961B3CB2C700F79DC6 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96EA53971B3CB2C700F79DC6 /* sha1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6718DB722E00B5651B /* sha1.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; @@ -240,12 +240,12 @@ 96EA53A31B3CB2C700F79DC6 /* rs16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCD19ED8B9700DAF8F1 /* rs16.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53A41B3CB2C700F79DC6 /* cmddata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0D18DB722E00B5651B /* cmddata.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53A51B3CB2C700F79DC6 /* ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD419ED8C8000DAF8F1 /* ui.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53A61B3CB2C700F79DC6 /* filestr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2A18DB722E00B5651B /* filestr.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53A61B3CB2C700F79DC6 /* filestr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2A18DB722E00B5651B /* filestr.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53A71B3CB2C700F79DC6 /* recvol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5918DB722E00B5651B /* recvol.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53A81B3CB2C700F79DC6 /* rs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5F18DB722E00B5651B /* rs.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53A81B3CB2C700F79DC6 /* rs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5F18DB722E00B5651B /* rs.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53A91B3CB2C700F79DC6 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53AA1B3CB2C700F79DC6 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96EA53AB1B3CB2C700F79DC6 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53AA1B3CB2C700F79DC6 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53AB1B3CB2C700F79DC6 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA53AC1B3CB2C700F79DC6 /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; 96F5BBBD1B39A68600ACB162 /* URKArchiveTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 964547D11B384F7D00202B28 /* URKArchiveTestCase.m */; }; 96F5BBBF1B39AD3000ACB162 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9660D7AE1A3F4FF90059AC1E /* libz.dylib */; }; From f3ce55be069269921d00386812cd57dafb0ff958 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 14:42:08 -0400 Subject: [PATCH 12/38] Updated to Xcode 7 recommended settings --- .../xcshareddata/xcschemes/UnrarExample.xcscheme | 13 ++++++++----- Resources/UnrarKit-Info.plist | 2 +- Tests/UnrarKit Tests-Info.plist | 2 +- Tests/iOSUnitTestHostApp/Info.plist | 2 +- UnrarKit.xcodeproj/project.pbxproj | 14 +++++++++++++- .../xcshareddata/xcschemes/UnrarKit iOS.xcscheme | 13 ++++++++----- .../xcshareddata/xcschemes/UnrarKit.xcscheme | 13 ++++++++----- 7 files changed, 40 insertions(+), 19 deletions(-) diff --git a/Example/UnrarExample.xcodeproj/xcshareddata/xcschemes/UnrarExample.xcscheme b/Example/UnrarExample.xcodeproj/xcshareddata/xcschemes/UnrarExample.xcscheme index 4625bab..9d08f0a 100644 --- a/Example/UnrarExample.xcodeproj/xcshareddata/xcschemes/UnrarExample.xcscheme +++ b/Example/UnrarExample.xcodeproj/xcshareddata/xcschemes/UnrarExample.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -38,15 +38,18 @@ ReferencedContainer = "container:UnrarExample.xcodeproj"> + + @@ -62,10 +65,10 @@ diff --git a/Resources/UnrarKit-Info.plist b/Resources/UnrarKit-Info.plist index 5c043cf..4a8b431 100644 --- a/Resources/UnrarKit-Info.plist +++ b/Resources/UnrarKit-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.abbey-code.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Tests/UnrarKit Tests-Info.plist b/Tests/UnrarKit Tests-Info.plist index 7a33ebd..ba72822 100644 --- a/Tests/UnrarKit Tests-Info.plist +++ b/Tests/UnrarKit Tests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.abbey-code.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Tests/iOSUnitTestHostApp/Info.plist b/Tests/iOSUnitTestHostApp/Info.plist index 31e0566..40c6215 100644 --- a/Tests/iOSUnitTestHostApp/Info.plist +++ b/Tests/iOSUnitTestHostApp/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.abbey-code.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index 73c7177..aa971e0 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -1010,7 +1010,8 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastSwiftUpdateCheck = 0700; + LastUpgradeCheck = 0700; TargetAttributes = { 964C8ABA18D28EE000AD7321 = { TestTargetID = 96853EDA18DB71CD00B5651B; @@ -1293,6 +1294,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_THUMB_SUPPORT = NO; @@ -1360,6 +1362,7 @@ INFOPLIST_FILE = "Tests/UnrarKit Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; TEST_HOST = "$(BUNDLE_LOADER)"; @@ -1399,6 +1402,7 @@ INFOPLIST_FILE = "Tests/UnrarKit Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; TEST_HOST = "$(BUNDLE_LOADER)"; @@ -1452,6 +1456,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = UnrarKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1504,6 +1509,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = UnrarKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1560,6 +1566,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1599,6 +1606,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1647,6 +1655,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; WARNING_CFLAGS = ( @@ -1699,6 +1708,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; @@ -1754,6 +1764,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSUnitTestHostApp.app/iOSUnitTestHostApp"; @@ -1801,6 +1812,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSUnitTestHostApp.app/iOSUnitTestHostApp"; diff --git a/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit iOS.xcscheme b/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit iOS.xcscheme index e862afd..a43b8b8 100644 --- a/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit iOS.xcscheme +++ b/UnrarKit.xcodeproj/xcshareddata/xcschemes/UnrarKit iOS.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -48,15 +48,18 @@ ReferencedContainer = "container:UnrarKit.xcodeproj"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:UnrarKit.xcodeproj"> + + Date: Tue, 4 Aug 2015 15:14:25 -0400 Subject: [PATCH 13/38] Completed nullability audit, deprecating class initializers, in favor of initializers that return an error when they're nil. Also removed the warning-silencing flags from the unit test bundle --- Classes/URKArchive.h | 70 +++++++++++++++++++++++++----- Classes/URKArchive.mm | 55 +++++++++++++++++------ Tests/ExtractFilesTests.m | 10 ++--- Tests/IsPasswordProtectedTests.m | 8 ++-- Tests/ListFilenamesTests.m | 16 +++---- Tests/URKArchiveTests.m | 69 +++++++++++++++-------------- Tests/ValidatePasswordTests.m | 8 ++-- UnrarKit.xcodeproj/project.pbxproj | 18 +------- 8 files changed, 158 insertions(+), 96 deletions(-) diff --git a/Classes/URKArchive.h b/Classes/URKArchive.h index 4bb5bd2..995f68a 100644 --- a/Classes/URKArchive.h +++ b/Classes/URKArchive.h @@ -90,6 +90,8 @@ typedef NS_ENUM(NSInteger, URKErrorCode) { #define ERAR_ARCHIVE_NOT_FOUND 101 +NS_ASSUME_NONNULL_BEGIN + extern NSString *URKErrorDomain; /** @@ -106,48 +108,91 @@ extern NSString *URKErrorDomain; /** * The URL of the archive */ -@property(weak, readonly) NSURL *fileURL; +@property(nullable, weak, readonly) NSURL *fileURL; /** * The filename of the archive */ -@property(weak, readonly) NSString *filename; +@property(nullable, weak, readonly) NSString *filename; /** * The password of the archive */ -@property(nonatomic, strong) NSString *password; +@property(nullable, nonatomic, strong) NSString *password; + + +/** + * Creates and returns an archive at the given path + * + * @param filePath A path to the archive file + */ ++ (nullable instancetype)rarArchiveAtPath:(NSString *)filePath __deprecated_msg("Use -initWithPath:error: instead"); + +/** + * Creates and returns an archive at the given URL + * + * @param fileURL The URL of the archive file + */ ++ (nullable instancetype)rarArchiveAtURL:(NSURL *)fileURL __deprecated_msg("Use -initWithURL:error: instead"); + +/** + * Creates and returns an archive at the given path, with a given password + * + * @param filePath A path to the archive file + * @param password The passowrd of the given archive + */ ++ (nullable instancetype)rarArchiveAtPath:(NSString *)filePath password:(NSString *)password __deprecated_msg("Use -initWithPath:password:error: instead"); + +/** + * Creates and returns an archive at the given URL, with a given password + * + * @param fileURL The URL of the archive file + * @param password The passowrd of the given archive + */ ++ (nullable instancetype)rarArchiveAtURL:(NSURL *)fileURL password:(NSString *)password __deprecated_msg("Use -initWithURL:password:error: instead"); /** * Creates and returns an archive at the given path * * @param filePath A path to the archive file + * @param error Contains any error during initialization + * + * @return Returns an initialized URKArchive, unless there's a problem creating a bookmark to the path */ -+ (instancetype)rarArchiveAtPath:(NSString *)filePath; +- (nullable instancetype)initWithPath:(NSString *)filePath error:(NSError **)error; /** * Creates and returns an archive at the given URL * * @param fileURL The URL of the archive file + * @param error Contains any error during initialization + * + * @return Returns an initialized URKArchive, unless there's a problem creating a bookmark to the URL */ -+ (instancetype)rarArchiveAtURL:(NSURL *)fileURL; +- (nullable instancetype)initWithURL:(NSURL *)fileURL error:(NSError **)error; /** * Creates and returns an archive at the given path, with a given password * * @param filePath A path to the archive file * @param password The passowrd of the given archive + * @param error Contains any error during initialization + * + * @return Returns an initialized URKArchive, unless there's a problem creating a bookmark to the path */ -+ (instancetype)rarArchiveAtPath:(NSString *)filePath password:(NSString *)password; +- (nullable instancetype)initWithPath:(NSString *)filePath password:(NSString *)password error:(NSError **)error; /** * Creates and returns an archive at the given URL, with a given password * * @param fileURL The URL of the archive file * @param password The passowrd of the given archive + * @param error Contains any error during initialization + * + * @return Returns an initialized URKArchive, unless there's a problem creating a bookmark to the URL */ -+ (instancetype)rarArchiveAtURL:(NSURL *)fileURL password:(NSString *)password; +- (nullable instancetype)initWithURL:(NSURL *)fileURL password:(NSString *)password error:(NSError **)error; /** @@ -175,7 +220,7 @@ extern NSString *URKErrorDomain; * * @return Returns a list of NSString containing the paths within the archive's contents, or nil if an error was encountered */ -- (NSArray *)listFilenames:(NSError **)error; +- (nullable NSArray *)listFilenames:(NSError **)error; /** * Lists the various attributes of each file in the archive @@ -184,7 +229,7 @@ extern NSString *URKErrorDomain; * * @return Returns a list of URKFileInfo objects, which contain metadata about the archive's files, or nil if an error was encountered */ -- (NSArray *)listFileInfo:(NSError **)error; +- (nullable NSArray *)listFileInfo:(NSError **)error; /** * Writes all files in the archive to the given path @@ -202,7 +247,7 @@ extern NSString *URKErrorDomain; */ - (BOOL)extractFilesTo:(NSString *)filePath overwrite:(BOOL)overwrite - progress:(void (^)(URKFileInfo *currentFile, CGFloat percentArchiveDecompressed))progress + progress:(nullable void (^)(URKFileInfo *currentFile, CGFloat percentArchiveDecompressed))progress error:(NSError **)error; /** @@ -218,7 +263,7 @@ extern NSString *URKErrorDomain; * @return An NSData object containing the bytes of the file, or nil if an error was encountered */ - (NSData *)extractData:(URKFileInfo *)fileInfo - progress:(void (^)(CGFloat percentDecompressed))progress + progress:(nullable void (^)(CGFloat percentDecompressed))progress error:(NSError **)error; /** @@ -234,7 +279,7 @@ extern NSString *URKErrorDomain; * @return An NSData object containing the bytes of the file, or nil if an error was encountered */ - (NSData *)extractDataFromFile:(NSString *)filePath - progress:(void (^)(CGFloat percentDecompressed))progress + progress:(nullable void (^)(CGFloat percentDecompressed))progress error:(NSError **)error; /** @@ -298,3 +343,4 @@ extern NSString *URKErrorDomain; @end +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/Classes/URKArchive.mm b/Classes/URKArchive.mm index 8126504..bdf1f3f 100644 --- a/Classes/URKArchive.mm +++ b/Classes/URKArchive.mm @@ -16,7 +16,7 @@ @interface URKArchive () -- (instancetype)initWithFile:(NSURL *)fileURL password:(NSString*)password +- (instancetype)initWithFile:(NSURL *)fileURL password:(NSString*)password error:(NSError **)error #if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_0 || MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_9 NS_DESIGNATED_INITIALIZER #endif @@ -34,28 +34,27 @@ @implementation URKArchive -#pragma mark - Convenience Methods +#pragma mark - Deprecated Convenience Methods + (URKArchive *)rarArchiveAtPath:(NSString *)filePath { - return [[URKArchive alloc] initWithFile:[NSURL fileURLWithPath:filePath]]; + return [[URKArchive alloc] initWithPath:filePath error:nil]; } + (URKArchive *)rarArchiveAtURL:(NSURL *)fileURL { - return [[URKArchive alloc] initWithFile:fileURL]; + return [[URKArchive alloc] initWithURL:fileURL error:nil]; } + (URKArchive *)rarArchiveAtPath:(NSString *)filePath password:(NSString *)password { - return [[URKArchive alloc] initWithFile:[NSURL fileURLWithPath:filePath] - password:password]; + return [[URKArchive alloc] initWithPath:filePath password:password error:nil]; } + (URKArchive *)rarArchiveAtURL:(NSURL *)fileURL password:(NSString *)password { - return [[URKArchive alloc] initWithFile:fileURL password:password]; + return [[URKArchive alloc] initWithURL:fileURL password:password error:nil]; } @@ -63,24 +62,52 @@ + (URKArchive *)rarArchiveAtURL:(NSURL *)fileURL password:(NSString *)password #pragma mark - Initializers -- (instancetype)initWithFile:(NSURL *)fileURL +- (instancetype)initWithPath:(NSString *)filePath error:(NSError **)error { - return [self initWithFile:fileURL password:nil]; + return [self initWithFile:[NSURL fileURLWithPath:filePath] error:error]; } -- (instancetype)initWithFile:(NSURL *)fileURL password:(NSString*)password +- (instancetype)initWithURL:(NSURL *)fileURL error:(NSError **)error +{ + return [self initWithFile:fileURL error:error]; +} + +- (instancetype)initWithPath:(NSString *)filePath password:(NSString *)password error:(NSError **)error +{ + return [self initWithFile:[NSURL fileURLWithPath:filePath] password:password error:error]; +} + +- (instancetype)initWithURL:(NSURL *)fileURL password:(NSString *)password error:(NSError **)error +{ + return [self initWithFile:fileURL password:password error:error]; +} + +- (instancetype)initWithFile:(NSURL *)fileURL error:(NSError **)error +{ + return [self initWithFile:fileURL password:nil error:error]; +} + +- (instancetype)initWithFile:(NSURL *)fileURL password:(NSString*)password error:(NSError **)error { if ((self = [super init])) { - NSError *error = nil; + if (error) { + *error = nil; + } + + NSError *bookmarkError = nil; _fileBookmark = [fileURL bookmarkDataWithOptions:0 includingResourceValuesForKeys:@[] relativeToURL:nil - error:&error]; + error:&bookmarkError]; _password = password; _threadLock = [[NSObject alloc] init]; - if (error) { - NSLog(@"Error creating bookmark to RAR archive: %@", error); + if (bookmarkError) { + NSLog(@"Error creating bookmark to RAR archive: %@", bookmarkError); + + if (error) { + *error = bookmarkError; + } } } diff --git a/Tests/ExtractFilesTests.m b/Tests/ExtractFilesTests.m index b6c811b..46dcb89 100644 --- a/Tests/ExtractFilesTests.m +++ b/Tests/ExtractFilesTests.m @@ -38,7 +38,7 @@ - (void)testExtractFiles NSString *password = ([testArchiveName rangeOfString:@"Password"].location != NSNotFound ? @"password" : nil); - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL password:password]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL password:password error:nil]; NSError *error = nil; BOOL success = [archive extractFilesTo:extractURL.path @@ -110,7 +110,7 @@ - (void)testExtractFiles_RAR5 NSString *extractDir = [NSString stringWithFormat:@"%ld_%@", (long)i, testArchiveName.stringByDeletingPathExtension]; NSURL *extractURL = [extractRootDirectory URLByAppendingPathComponent:extractDir]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; BOOL success = [archive extractFilesTo:extractURL.path @@ -159,7 +159,7 @@ - (void)testExtractFiles_Unicode [testArchiveName stringByDeletingPathExtension]]; NSURL *extractURL = [self.tempDirectory URLByAppendingPathComponent:extractDirectory]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; BOOL success = [archive extractFilesTo:extractURL.path @@ -209,7 +209,7 @@ - (void)testExtractFiles_NoPasswordGiven for (NSString *testArchiveName in testArchives) { NSLog(@"Testing extraction archive (no password given): %@", testArchiveName); - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[testArchiveName]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[testArchiveName] error:nil]; NSString *extractDirectory = [self randomDirectoryWithPrefix: [testArchiveName stringByDeletingPathExtension]]; @@ -237,7 +237,7 @@ - (void)testExtractFiles_InvalidArchive { NSFileManager *fm = [NSFileManager defaultManager]; - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[@"Test File A.txt"]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[@"Test File A.txt"] error:nil]; NSString *extractDirectory = [self randomDirectoryWithPrefix:@"ExtractInvalidArchive"]; NSURL *extractURL = [self.tempDirectory URLByAppendingPathComponent:extractDirectory]; diff --git a/Tests/IsPasswordProtectedTests.m b/Tests/IsPasswordProtectedTests.m index 1be8df2..b688935 100644 --- a/Tests/IsPasswordProtectedTests.m +++ b/Tests/IsPasswordProtectedTests.m @@ -19,7 +19,7 @@ - (void)testIsPasswordProtected_PasswordRequired { NSURL *archiveURL = self.testFileURLs[@"Test Archive (Password).rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; XCTAssertTrue(archive.isPasswordProtected, @"isPasswordProtected = NO for password-protected archive"); } @@ -28,7 +28,7 @@ - (void)testIsPasswordProtected_PasswordRequired_RAR5 { NSURL *archiveURL = self.testFileURLs[@"Test Archive (RAR5, Password).rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; XCTAssertTrue(archive.isPasswordProtected, @"isPasswordProtected = NO for password-protected RAR5 archive"); } @@ -37,7 +37,7 @@ - (void)testIsPasswordProtected_HeaderPasswordRequired { NSURL *archiveURL = self.testFileURLs[@"Test Archive (Header Password).rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; XCTAssertTrue(archive.isPasswordProtected, @"isPasswordProtected = NO for password-protected archive"); } @@ -46,7 +46,7 @@ - (void)testIsPasswordProtected_PasswordNotRequired { NSURL *archiveURL = self.testFileURLs[@"Test Archive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; XCTAssertFalse(archive.isPasswordProtected, @"isPasswordProtected = YES for password-protected archive"); } diff --git a/Tests/ListFilenamesTests.m b/Tests/ListFilenamesTests.m index 090f672..95b1ea8 100644 --- a/Tests/ListFilenamesTests.m +++ b/Tests/ListFilenamesTests.m @@ -30,7 +30,7 @@ - (void)testListFilenames NSLog(@"Testing list files of archive %@", testArchiveName); NSURL *testArchiveURL = self.testFileURLs[testArchiveName]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; NSArray *filesInArchive = [archive listFilenames:&error]; @@ -60,7 +60,7 @@ - (void)testListFilenames_Unicode NSArray *expectedFiles = [[expectedFileSet allObjects] sortedArrayUsingSelector:@selector(compare:)]; NSURL *testArchiveURL = self.unicodeFileURLs[@"Ⓣest Ⓐrchive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; NSArray *filesInArchive = [archive listFilenames:&error]; @@ -84,7 +84,7 @@ - (void)testListFilenames_RAR5 @"nopw.txt"]; NSURL *testArchiveURL = self.testFileURLs[@"Test Archive (RAR5).rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; NSArray *filesInArchive = [archive listFilenames:&error]; @@ -116,7 +116,7 @@ - (void)testListFilenames_HeaderPassword NSLog(@"Testing list files of archive %@", testArchiveName); NSURL *testArchiveURL = self.testFileURLs[testArchiveName]; - URKArchive *archiveNoPassword = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archiveNoPassword = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; NSArray *filesInArchive = [archiveNoPassword listFilenames:&error]; @@ -124,7 +124,7 @@ - (void)testListFilenames_HeaderPassword XCTAssertNotNil(error, @"No error returned by listFilenames (no password given)"); XCTAssertNil(filesInArchive, @"List of files returned (no password given)"); - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL password:@"password"]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL password:@"password" error:nil]; filesInArchive = nil; error = nil; @@ -147,7 +147,7 @@ - (void)testListFilenames_HeaderPassword - (void)testListFilenames_NoHeaderPasswordGiven { - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[@"Test Archive (Header Password).rar"]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[@"Test Archive (Header Password).rar"] error:nil]; NSError *error = nil; NSArray *files = [archive listFilenames:&error]; @@ -159,7 +159,7 @@ - (void)testListFilenames_NoHeaderPasswordGiven - (void)testListFilenames_NoFilePasswordGiven { - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[@"Test Archive (Password).rar"]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[@"Test Archive (Password).rar"] error:nil]; NSError *error = nil; NSArray *files = [archive listFilenames:&error]; @@ -170,7 +170,7 @@ - (void)testListFilenames_NoFilePasswordGiven - (void)testListFilenames_InvalidArchive { - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[@"Test File A.txt"]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[@"Test File A.txt"] error:nil]; NSError *error = nil; NSArray *files = [archive listFilenames:&error]; diff --git a/Tests/URKArchiveTests.m b/Tests/URKArchiveTests.m index 133ccd9..7c024dd 100644 --- a/Tests/URKArchiveTests.m +++ b/Tests/URKArchiveTests.m @@ -32,7 +32,7 @@ - (void)testFileURL { NSLog(@"Testing fileURL of archive %@", testArchiveName); NSURL *testArchiveURL = self.testFileURLs[testArchiveName]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSURL *resolvedURL = archive.fileURL.URLByResolvingSymlinksInPath; XCTAssertNotNil(resolvedURL, @"Nil URL returned for valid archive"); @@ -50,7 +50,7 @@ - (void)testFilename { NSLog(@"Testing filename of archive %@", testArchiveName); NSURL *testArchiveURL = self.testFileURLs[testArchiveName]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSString *resolvedFilename = archive.filename; XCTAssertNotNil(resolvedFilename, @"Nil filename returned for valid archive"); @@ -183,7 +183,7 @@ - (void)testurlIsARAR_FileHandleLeaks - (void)testListFileInfo { - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[@"Test Archive.rar"]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[@"Test Archive.rar"] error:nil]; NSSet *expectedFileSet = [self.testFileURLs keysOfEntriesPassingTest:^BOOL(NSString *key, id obj, BOOL *stop) { return ![key hasSuffix:@"rar"]; @@ -259,7 +259,7 @@ - (void)testListFileInfo_Unicode NSArray *expectedFiles = [[expectedFileSet allObjects] sortedArrayUsingSelector:@selector(compare:)]; NSURL *testArchiveURL = self.unicodeFileURLs[@"Ⓣest Ⓐrchive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; NSArray *filesInArchive = [archive listFileInfo:&error]; @@ -290,7 +290,7 @@ - (void)testListFileInfo_HeaderPassword for (NSString *testArchiveName in testArchives) { NSURL *testArchiveURL = self.testFileURLs[testArchiveName]; - URKArchive *archiveNoPassword = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archiveNoPassword = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; NSArray *filesInArchive = [archiveNoPassword listFileInfo:&error]; @@ -298,7 +298,7 @@ - (void)testListFileInfo_HeaderPassword XCTAssertNotNil(error, @"No error returned by listFileInfo (no password given)"); XCTAssertNil(filesInArchive, @"List of files returned (no password given)"); - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL password:@"password"]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL password:@"password" error:nil]; filesInArchive = nil; error = nil; @@ -319,7 +319,7 @@ - (void)testListFileInfo_HeaderPassword } - (void)testListFileInfo_NoHeaderPasswordGiven { - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[@"Test Archive (Header Password).rar"]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[@"Test Archive (Header Password).rar"] error:nil]; NSError *error = nil; NSArray *files = [archive listFileInfo:&error]; @@ -331,7 +331,7 @@ - (void)testListFileInfo_NoHeaderPasswordGiven { - (void)testListFileInfo_InvalidArchive { - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[@"Test File A.txt"]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[@"Test File A.txt"] error:nil]; NSError *error = nil; NSArray *files = [archive listFileInfo:&error]; @@ -363,7 +363,7 @@ - (void)testExtractData NSString *password = ([testArchiveName rangeOfString:@"Password"].location != NSNotFound ? @"password" : nil); - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL password:password]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL password:password error:nil]; NSError *error = nil; NSArray *fileInfos = [archive listFileInfo:&error]; @@ -411,7 +411,7 @@ - (void)testExtractData_Unicode NSArray *expectedFiles = [[expectedFileSet allObjects] sortedArrayUsingSelector:@selector(compare:)]; NSURL *testArchiveURL = self.unicodeFileURLs[@"Ⓣest Ⓐrchive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSError *error = nil; NSArray *fileInfos = [archive listFileInfo:&error]; @@ -455,7 +455,7 @@ - (void)testExtractData_NoPassword @"Test Archive (Header Password).rar"]; for (NSString *testArchiveName in testArchives) { - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[testArchiveName]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[testArchiveName] error:nil]; NSError *error = nil; NSData *data = [archive extractDataFromFile:@"Test File A.txt" @@ -474,7 +474,7 @@ - (void)testExtractData_NoPassword - (void)testExtractData_InvalidArchive { - URKArchive *archive = [URKArchive rarArchiveAtURL:self.testFileURLs[@"Test File A.txt"]]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.testFileURLs[@"Test File A.txt"] error:nil]; NSError *error = nil; NSData *data = [archive extractDataFromFile:@"Any file.txt" @@ -511,7 +511,7 @@ - (void)testPerformOnFiles NSString *password = ([testArchiveName rangeOfString:@"Password"].location != NSNotFound ? @"password" : nil); - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL password:password]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL password:password error:nil]; __block NSUInteger fileIndex = 0; NSError *error = nil; @@ -536,7 +536,7 @@ - (void)testPerformOnFiles_Unicode NSArray *expectedFiles = [[expectedFileSet allObjects] sortedArrayUsingSelector:@selector(compare:)]; NSURL *testArchiveURL = self.unicodeFileURLs[@"Ⓣest Ⓐrchive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; __block NSUInteger fileIndex = 0; NSError *error = nil; @@ -574,7 +574,7 @@ - (void)testPerformOnFiles_Ordering NSError *error = nil; __block NSUInteger index = 0; - URKArchive *archive = [URKArchive rarArchiveAtURL:reversedArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:reversedArchiveURL error:nil]; [archive performOnFilesInArchive:^(URKFileInfo *fileInfo, BOOL *stop) { NSString *expectedFilename = testFilenames[index++]; XCTAssertEqualObjects(fileInfo.filename, expectedFilename, @"Archive files not iterated through in correct order"); @@ -602,7 +602,7 @@ - (void)testPerformOnData NSString *password = ([testArchiveName rangeOfString:@"Password"].location != NSNotFound ? @"password" : nil); - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL password:password]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL password:password error:nil]; __block NSUInteger fileIndex = 0; NSError *error = nil; @@ -632,7 +632,7 @@ - (void)testPerformOnData_Unicode NSArray *expectedFiles = [[expectedFileSet allObjects] sortedArrayUsingSelector:@selector(compare:)]; NSURL *testArchiveURL = self.unicodeFileURLs[@"Ⓣest Ⓐrchive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; __block NSUInteger fileIndex = 0; NSError *error = nil; @@ -656,11 +656,12 @@ - (void)testPerformOnData_FileMoved { NSURL *largeArchiveURL = self.testFileURLs[@"Large Archive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:largeArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:largeArchiveURL error:nil]; NSError *error = nil; NSArray *archiveFiles = [archive listFilenames:&error]; + XCTAssertNotNil(archiveFiles, @"No filenames listed from test archive"); XCTAssertNil(error, @"Error listing files in test archive: %@", error); dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ @@ -695,11 +696,12 @@ - (void)testPerformOnData_FileDeleted { NSURL *largeArchiveURL = self.testFileURLs[@"Large Archive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:largeArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:largeArchiveURL error:nil]; NSError *error = nil; NSArray *archiveFiles = [archive listFilenames:&error]; + XCTAssertNotNil(archiveFiles, @"No filenames listed from test archive"); XCTAssertNil(error, @"Error listing files in test archive: %@", error); dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ @@ -732,11 +734,12 @@ - (void)testPerformOnData_FileMovedBeforeBegin { NSURL *largeArchiveURL = self.testFileURLs[@"Large Archive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:largeArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:largeArchiveURL error:nil]; NSError *error = nil; NSArray *archiveFiles = [archive listFilenames:&error]; + XCTAssertNotNil(archiveFiles, @"No filenames listed from test archive"); XCTAssertNil(error, @"Error listing files in test archive: %@", error); NSURL *movedURL = [largeArchiveURL URLByAppendingPathExtension:@"FileMovedBeforeBegin"]; @@ -766,7 +769,7 @@ - (void)testPerformOnData_FileMovedBeforeBegin - (void)testPerformOnData_Folder { NSURL *testArchiveURL = self.testFileURLs[@"Folder Archive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveURL error:nil]; NSArray *expectedFiles = @[@"G070-Cliff", @"G070-Cliff/image.jpg"]; @@ -791,7 +794,7 @@ - (void)testExtractBufferedData { NSURL *archiveURL = self.testFileURLs[@"Test Archive.rar"]; NSString *extractedFile = @"Test File B.jpg"; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; NSError *error = nil; NSMutableData *reconstructedFile = [NSMutableData data]; @@ -836,7 +839,7 @@ - (void)testExtractBufferedData_VeryLarge error:&handleError]; XCTAssertNil(handleError, @"Error creating a file handle"); - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; DTSendSignalFlag("Begin extracting buffered data", DT_START_SIGNAL, TRUE); @@ -891,7 +894,7 @@ - (void)testFileDescriptorUsage [fm copyItemAtURL:testArchiveOriginalURL toURL:testArchiveCopyURL error:&error]; XCTAssertNil(error, @"Error copying test archive \n from: %@ \n\n to: %@", testArchiveOriginalURL, testArchiveCopyURL); - URKArchive *archive = [URKArchive rarArchiveAtURL:testArchiveCopyURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:testArchiveCopyURL error:nil]; NSArray *fileList = [archive listFilenames:&error]; XCTAssertNotNil(fileList); @@ -929,9 +932,9 @@ - (void)testMultiThreading { XCTAssertTrue([fm copyItemAtURL:largeArchiveURL_A toURL:largeArchiveURL_C error:&archiveCCopyError], @"Failed to copy archive C"); XCTAssertNil(archiveCCopyError, @"Error copying archive C"); - URKArchive *largeArchiveA = [URKArchive rarArchiveAtURL:largeArchiveURL_A]; - URKArchive *largeArchiveB = [URKArchive rarArchiveAtURL:largeArchiveURL_B]; - URKArchive *largeArchiveC = [URKArchive rarArchiveAtURL:largeArchiveURL_C]; + URKArchive *largeArchiveA = [[URKArchive alloc] initWithURL:largeArchiveURL_A error:nil]; + URKArchive *largeArchiveB = [[URKArchive alloc] initWithURL:largeArchiveURL_B error:nil]; + URKArchive *largeArchiveC = [[URKArchive alloc] initWithURL:largeArchiveURL_C error:nil]; XCTestExpectation *expectationA = [self expectationWithDescription:@"A finished"]; XCTestExpectation *expectationB = [self expectationWithDescription:@"B finished"]; @@ -987,9 +990,9 @@ - (void)testMultiThreading { - (void)testMultiThreading_SingleFile { NSURL *largeArchiveURL = self.testFileURLs[@"Large Archive.rar"]; - URKArchive *largeArchiveA = [URKArchive rarArchiveAtURL:largeArchiveURL]; - URKArchive *largeArchiveB = [URKArchive rarArchiveAtURL:largeArchiveURL]; - URKArchive *largeArchiveC = [URKArchive rarArchiveAtURL:largeArchiveURL]; + URKArchive *largeArchiveA = [[URKArchive alloc] initWithURL:largeArchiveURL error:nil]; + URKArchive *largeArchiveB = [[URKArchive alloc] initWithURL:largeArchiveURL error:nil]; + URKArchive *largeArchiveC = [[URKArchive alloc] initWithURL:largeArchiveURL error:nil]; XCTestExpectation *expectationA = [self expectationWithDescription:@"A finished"]; XCTestExpectation *expectationB = [self expectationWithDescription:@"B finished"]; @@ -1045,7 +1048,7 @@ - (void)testMultiThreading_SingleFile { - (void)testMultiThreading_SingleArchiveObject { NSURL *largeArchiveURL = self.testFileURLs[@"Large Archive.rar"]; - URKArchive *largeArchive = [URKArchive rarArchiveAtURL:largeArchiveURL]; + URKArchive *largeArchive = [[URKArchive alloc] initWithURL:largeArchiveURL error:nil]; XCTestExpectation *expectationA = [self expectationWithDescription:@"A finished"]; XCTestExpectation *expectationB = [self expectationWithDescription:@"B finished"]; @@ -1101,7 +1104,7 @@ - (void)testMultiThreading_SingleArchiveObject { - (void)testErrorIsCorrect { NSError *error = nil; - URKArchive *archive = [URKArchive rarArchiveAtURL:self.corruptArchive]; + URKArchive *archive = [[URKArchive alloc] initWithURL:self.corruptArchive error:nil]; XCTAssertNil([archive listFilenames:&error], "Listing filenames in corrupt archive should return nil"); XCTAssertNotNil(error, @"An error should be returned when listing filenames in a corrupt archive"); XCTAssertNotNil(error.description, @"Error's description is nil"); @@ -1128,7 +1131,7 @@ - (void)testUnicodeArchiveName NSURL *extractURL = [self.tempDirectory URLByAppendingPathComponent:extractDirectory]; NSError *extractFilesError = nil; - URKArchive *unicodeNamedArchive = [URKArchive rarArchiveAtURL:newArchiveURL]; + URKArchive *unicodeNamedArchive = [[URKArchive alloc] initWithURL:newArchiveURL error:nil]; BOOL extractSuccess = [unicodeNamedArchive extractFilesTo:extractURL.path overwrite:NO progress:nil diff --git a/Tests/ValidatePasswordTests.m b/Tests/ValidatePasswordTests.m index bcb82b7..265a076 100644 --- a/Tests/ValidatePasswordTests.m +++ b/Tests/ValidatePasswordTests.m @@ -17,7 +17,7 @@ - (void)testValidatePassword_PasswordRequired { NSURL *archiveURL = self.testFileURLs[@"Test Archive (Password).rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; XCTAssertFalse(archive.validatePassword, @"validatePassword = YES when no password supplied"); @@ -32,7 +32,7 @@ - (void)testValidatePassword_HeaderPasswordRequired { NSURL *archiveURL = self.testFileURLs[@"Test Archive (Header Password).rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; XCTAssertFalse(archive.validatePassword, @"validatePassword = YES when no password supplied"); @@ -47,7 +47,7 @@ - (void)testValidatePassword_PasswordNotRequired { NSURL *archiveURL = self.testFileURLs[@"Test Archive.rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; XCTAssertTrue(archive.validatePassword, @"validatePassword = NO when no password supplied"); @@ -59,7 +59,7 @@ - (void)testValidatePassword_RAR5 { NSURL *archiveURL = self.testFileURLs[@"Test Archive (RAR5, Password).rar"]; - URKArchive *archive = [URKArchive rarArchiveAtURL:archiveURL]; + URKArchive *archive = [[URKArchive alloc] initWithURL:archiveURL error:nil]; XCTAssertFalse(archive.validatePassword, @"validatePassword = YES when no password supplied"); diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index aa971e0..649f047 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -1366,14 +1366,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; TEST_HOST = "$(BUNDLE_LOADER)"; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-error=unused-command-line-argument", - ); + WARNING_CFLAGS = ""; WRAPPER_EXTENSION = xctest; }; name = Debug; @@ -1406,14 +1399,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; TEST_HOST = "$(BUNDLE_LOADER)"; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-error=unused-command-line-argument", - ); + WARNING_CFLAGS = ""; WRAPPER_EXTENSION = xctest; }; name = Release; From e73fb41d6b3e25e51befbf2c77aeeb7f15633b06 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:08:38 -0400 Subject: [PATCH 14/38] Removed global warning suppressions, adding them per-file for each rarlib file (except for the 64-32 bit conversion error, which affected suballoc.cpp, imported by almost every file, but not compiled directly) --- UnrarKit.xcodeproj/project.pbxproj | 166 ++++++++++------------------- 1 file changed, 54 insertions(+), 112 deletions(-) diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index 649f047..295d54b 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -139,55 +139,55 @@ 9699FA8E1B3D9B6F00B6D373 /* ValidatePasswordTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 96F450741B38527100679597 /* ValidatePasswordTests.m */; }; 9699FA8F1B3DA4C400B6D373 /* UnrarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9699F9DA1B3CB83100B6D373 /* UnrarKit.framework */; }; 969BD9B019EDE88E002CE755 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; }; - 969BD9B119EDE88E002CE755 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; - 969BD9B219EDE88E002CE755 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; }; - 969BD9B319EDE88E002CE755 /* pathfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4818DB722E00B5651B /* pathfn.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; + 969BD9B119EDE88E002CE755 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; + 969BD9B219EDE88E002CE755 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; settings = {COMPILER_FLAGS = "-Wno-logical-op-parentheses"; }; }; + 969BD9B319EDE88E002CE755 /* pathfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4818DB722E00B5651B /* pathfn.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -Wno-parentheses"; }; }; 969BD9B419EDE88E002CE755 /* smallfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6918DB722E00B5651B /* smallfn.cpp */; }; 969BD9B519EDE88E002CE755 /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3018DB722E00B5651B /* global.cpp */; }; - 969BD9B619EDE88E002CE755 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; + 969BD9B619EDE88E002CE755 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -Wno-parentheses -Wno-unused-variable"; }; }; 969BD9B719EDE88E002CE755 /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2818DB722E00B5651B /* filefn.cpp */; }; 969BD9B819EDE88E002CE755 /* filcreat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2418DB722E00B5651B /* filcreat.cpp */; }; - 969BD9B919EDE88E002CE755 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0818DB722E00B5651B /* archive.cpp */; }; - 969BD9BA19EDE88E002CE755 /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; - 969BD9BB19EDE88E002CE755 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7718DB722E00B5651B /* unicode.cpp */; }; + 969BD9B919EDE88E002CE755 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0818DB722E00B5651B /* archive.cpp */; settings = {COMPILER_FLAGS = "-Wno-logical-op-parentheses -Wno-parentheses -Wno-unused-function"; }; }; + 969BD9BA19EDE88E002CE755 /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -Wno-parentheses -Wno-switch -Wno-conditional-uninitialized"; }; }; + 969BD9BB19EDE88E002CE755 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7718DB722E00B5651B /* unicode.cpp */; settings = {COMPILER_FLAGS = "-Wno-shorten-64-to-32 -Wno-parentheses -Wno-unused-function"; }; }; 969BD9BC19EDE88E002CE755 /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7118DB722E00B5651B /* system.cpp */; }; 969BD9BD19EDE88E002CE755 /* isnt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3318DB722E00B5651B /* isnt.cpp */; }; - 969BD9BE19EDE88E002CE755 /* crypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1618DB722E00B5651B /* crypt.cpp */; }; + 969BD9BE19EDE88E002CE755 /* crypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1618DB722E00B5651B /* crypt.cpp */; settings = {COMPILER_FLAGS = "-Wno-logical-op-parentheses -Wno-switch -Wno-switch"; }; }; 969BD9BF19EDE88E002CE755 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1418DB722E00B5651B /* crc.cpp */; }; 969BD9C019EDE88E002CE755 /* rawread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5418DB722E00B5651B /* rawread.cpp */; }; 969BD9C119EDE88E002CE755 /* encname.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1C18DB722E00B5651B /* encname.cpp */; }; 969BD9C219EDE88E002CE755 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5B18DB722E00B5651B /* resource.cpp */; }; - 969BD9C319EDE88E002CE755 /* match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3F18DB722E00B5651B /* match.cpp */; }; + 969BD9C319EDE88E002CE755 /* match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3F18DB722E00B5651B /* match.cpp */; settings = {COMPILER_FLAGS = "-Wno-parentheses"; }; }; 969BD9C419EDE88E002CE755 /* timefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7318DB722E00B5651B /* timefn.cpp */; }; - 969BD9C519EDE88E002CE755 /* rdwrfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5618DB722E00B5651B /* rdwrfn.cpp */; }; - 969BD9C619EDE88E002CE755 /* consio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1218DB722E00B5651B /* consio.cpp */; }; + 969BD9C519EDE88E002CE755 /* rdwrfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5618DB722E00B5651B /* rdwrfn.cpp */; settings = {COMPILER_FLAGS = "-Wno-logical-op-parentheses"; }; }; + 969BD9C619EDE88E002CE755 /* consio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1218DB722E00B5651B /* consio.cpp */; settings = {COMPILER_FLAGS = "-Wno-unused-variable"; }; }; 969BD9C719EDE88E002CE755 /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4418DB722E00B5651B /* options.cpp */; }; 969BD9C819EDE88E002CE755 /* errhnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1E18DB722E00B5651B /* errhnd.cpp */; }; - 969BD9C919EDE88E002CE755 /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; + 969BD9C919EDE88E002CE755 /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -Wno-switch"; }; }; 969BD9CA19EDE88E002CE755 /* secpassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6518DB722E00B5651B /* secpassword.cpp */; }; - 969BD9CB19EDE88E002CE755 /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; + 969BD9CB19EDE88E002CE755 /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -Wno-conditional-uninitialized"; }; }; 969BD9CC19EDE88E002CE755 /* getbits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2E18DB722E00B5651B /* getbits.cpp */; }; 969BD9CD19EDE88E002CE755 /* sha1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6718DB722E00B5651B /* sha1.cpp */; }; 969BD9CE19EDE88E002CE755 /* sha256.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCF19ED8BB200DAF8F1 /* sha256.cpp */; }; 969BD9CF19EDE88E002CE755 /* blake2s.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FB419ED8A8200DAF8F1 /* blake2s.cpp */; }; - 969BD9D019EDE88E002CE755 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC419ED8B0400DAF8F1 /* hash.cpp */; }; - 969BD9D119EDE88E002CE755 /* extinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2018DB722E00B5651B /* extinfo.cpp */; }; - 969BD9D219EDE88E002CE755 /* extract.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2218DB722E00B5651B /* extract.cpp */; }; - 969BD9D319EDE88E002CE755 /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F8218DB722F00B5651B /* volume.cpp */; }; - 969BD9D419EDE88E002CE755 /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3618DB722E00B5651B /* list.cpp */; }; + 969BD9D019EDE88E002CE755 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC419ED8B0400DAF8F1 /* hash.cpp */; settings = {COMPILER_FLAGS = "-Wno-logical-op-parentheses"; }; }; + 969BD9D119EDE88E002CE755 /* extinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2018DB722E00B5651B /* extinfo.cpp */; settings = {COMPILER_FLAGS = "-Wno-shorten-64-to-32"; }; }; + 969BD9D219EDE88E002CE755 /* extract.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2218DB722E00B5651B /* extract.cpp */; settings = {COMPILER_FLAGS = "-Wno-parentheses"; }; }; + 969BD9D319EDE88E002CE755 /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F8218DB722F00B5651B /* volume.cpp */; settings = {COMPILER_FLAGS = "-Wno-logical-op-parentheses"; }; }; + 969BD9D419EDE88E002CE755 /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3618DB722E00B5651B /* list.cpp */; settings = {COMPILER_FLAGS = "-Wno-parentheses -Wno-switch -Wno-unused-function"; }; }; 969BD9D519EDE88E002CE755 /* find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2C18DB722E00B5651B /* find.cpp */; }; - 969BD9D619EDE88E002CE755 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7A18DB722E00B5651B /* unpack.cpp */; }; + 969BD9D619EDE88E002CE755 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7A18DB722E00B5651B /* unpack.cpp */; settings = {COMPILER_FLAGS = "-Wno-parentheses -Wno-conditional-uninitialized"; }; }; 969BD9D719EDE88E002CE755 /* headers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC619ED8B1F00DAF8F1 /* headers.cpp */; }; 969BD9D819EDE88E002CE755 /* threadpool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD219ED8C6100DAF8F1 /* threadpool.cpp */; }; - 969BD9D919EDE88E002CE755 /* rs16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCD19ED8B9700DAF8F1 /* rs16.cpp */; }; - 969BD9DA19EDE88E002CE755 /* cmddata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0D18DB722E00B5651B /* cmddata.cpp */; }; + 969BD9D919EDE88E002CE755 /* rs16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCD19ED8B9700DAF8F1 /* rs16.cpp */; settings = {COMPILER_FLAGS = "-Wno-unused-variable"; }; }; + 969BD9DA19EDE88E002CE755 /* cmddata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0D18DB722E00B5651B /* cmddata.cpp */; settings = {COMPILER_FLAGS = "-Wno-parentheses -Wno-shorten-64-to-32"; }; }; 969BD9DB19EDE88E002CE755 /* ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD419ED8C8000DAF8F1 /* ui.cpp */; }; - 969BD9DC19EDE88E002CE755 /* filestr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2A18DB722E00B5651B /* filestr.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; - 969BD9DD19EDE88E002CE755 /* recvol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5918DB722E00B5651B /* recvol.cpp */; }; - 969BD9DE19EDE88E002CE755 /* rs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5F18DB722E00B5651B /* rs.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; - 969BD9DF19EDE88E002CE755 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; }; - 969BD9E019EDE88E002CE755 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; - 969BD9E119EDE88E002CE755 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-Xanalyzer -analyzer-disable-all-checks"; }; }; + 969BD9DC19EDE88E002CE755 /* filestr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2A18DB722E00B5651B /* filestr.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -Wno-parentheses"; }; }; + 969BD9DD19EDE88E002CE755 /* recvol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5918DB722E00B5651B /* recvol.cpp */; settings = {COMPILER_FLAGS = "-Wno-parentheses"; }; }; + 969BD9DE19EDE88E002CE755 /* rs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5F18DB722E00B5651B /* rs.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; + 969BD9DF19EDE88E002CE755 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; settings = {COMPILER_FLAGS = "-Wno-logical-op-parentheses"; }; }; + 969BD9E019EDE88E002CE755 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -Wno-unused-variable"; }; }; + 969BD9E119EDE88E002CE755 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -Wno-parentheses"; }; }; 969BD9E219EDE88E002CE755 /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; 96DBF7FD1A3F72800033B759 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96E5D345198B333200A74340 /* Test Data in Resources */ = {isa = PBXBuildFile; fileRef = 964C8AD018D28F1600AD7321 /* Test Data */; }; @@ -196,56 +196,56 @@ 96EA53511B3B4A0800F79DC6 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96EA533B1B3B462D00F79DC6 /* LaunchScreen.xib */; }; 96EA53781B3CB2C700F79DC6 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4A18DB722E00B5651B /* rar.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53791B3CB2C700F79DC6 /* strlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6D18DB722E00B5651B /* strlist.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96EA537A1B3CB2C700F79DC6 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA537A1B3CB2C700F79DC6 /* strfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6B18DB722E00B5651B /* strfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-logical-op-parentheses"; }; }; 96EA537B1B3CB2C700F79DC6 /* pathfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4818DB722E00B5651B /* pathfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 96EA537C1B3CB2C700F79DC6 /* smallfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6918DB722E00B5651B /* smallfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA537D1B3CB2C700F79DC6 /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3018DB722E00B5651B /* global.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA537E1B3CB2C700F79DC6 /* URKFileInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FCD46A1A3262E5003612BF /* URKFileInfo.m */; }; - 96EA537F1B3CB2C700F79DC6 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA537F1B3CB2C700F79DC6 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2618DB722E00B5651B /* file.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks -Wno-unused-variable"; }; }; 96EA53801B3CB2C700F79DC6 /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2818DB722E00B5651B /* filefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53811B3CB2C700F79DC6 /* filcreat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2418DB722E00B5651B /* filcreat.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53821B3CB2C700F79DC6 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0818DB722E00B5651B /* archive.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53831B3CB2C700F79DC6 /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96EA53841B3CB2C700F79DC6 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7718DB722E00B5651B /* unicode.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53821B3CB2C700F79DC6 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0818DB722E00B5651B /* archive.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-logical-op-parentheses -Wno-parentheses -Wno-unused-function"; }; }; + 96EA53831B3CB2C700F79DC6 /* arcread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0A18DB722E00B5651B /* arcread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks -Wno-switch -Wno-conditional-uninitialized"; }; }; + 96EA53841B3CB2C700F79DC6 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7718DB722E00B5651B /* unicode.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-shorten-64-to-32 -Wno-parentheses -Wno-unused-function"; }; }; 96EA53851B3CB2C700F79DC6 /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7118DB722E00B5651B /* system.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53861B3CB2C700F79DC6 /* isnt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3318DB722E00B5651B /* isnt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53871B3CB2C700F79DC6 /* crypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1618DB722E00B5651B /* crypt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53871B3CB2C700F79DC6 /* crypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1618DB722E00B5651B /* crypt.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-logical-op-parentheses -Wno-switch"; }; }; 96EA53881B3CB2C700F79DC6 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1418DB722E00B5651B /* crc.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53891B3CB2C700F79DC6 /* rawread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5418DB722E00B5651B /* rawread.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA538A1B3CB2C700F79DC6 /* encname.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1C18DB722E00B5651B /* encname.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA538B1B3CB2C700F79DC6 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5B18DB722E00B5651B /* resource.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA538C1B3CB2C700F79DC6 /* match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3F18DB722E00B5651B /* match.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA538C1B3CB2C700F79DC6 /* match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3F18DB722E00B5651B /* match.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-parentheses"; }; }; 96EA538D1B3CB2C700F79DC6 /* timefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7318DB722E00B5651B /* timefn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA538E1B3CB2C700F79DC6 /* rdwrfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5618DB722E00B5651B /* rdwrfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA538F1B3CB2C700F79DC6 /* consio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1218DB722E00B5651B /* consio.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA538E1B3CB2C700F79DC6 /* rdwrfn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5618DB722E00B5651B /* rdwrfn.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-logical-op-parentheses"; }; }; + 96EA538F1B3CB2C700F79DC6 /* consio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1218DB722E00B5651B /* consio.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-unused-variable"; }; }; 96EA53901B3CB2C700F79DC6 /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F4418DB722E00B5651B /* options.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53911B3CB2C700F79DC6 /* errhnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1E18DB722E00B5651B /* errhnd.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53921B3CB2C700F79DC6 /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53921B3CB2C700F79DC6 /* rarvm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5118DB722E00B5651B /* rarvm.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks -Wno-switch"; }; }; 96EA53931B3CB2C700F79DC6 /* secpassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6518DB722E00B5651B /* secpassword.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53941B3CB2C700F79DC6 /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53941B3CB2C700F79DC6 /* rijndael.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5D18DB722E00B5651B /* rijndael.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks -Wno-conditional-uninitialized"; }; }; 96EA53951B3CB2C700F79DC6 /* getbits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2E18DB722E00B5651B /* getbits.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53961B3CB2C700F79DC6 /* NSString+UnrarKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF7F81A3F72800033B759 /* NSString+UnrarKit.mm */; }; 96EA53971B3CB2C700F79DC6 /* sha1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6718DB722E00B5651B /* sha1.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53981B3CB2C700F79DC6 /* sha256.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCF19ED8BB200DAF8F1 /* sha256.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53991B3CB2C700F79DC6 /* blake2s.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FB419ED8A8200DAF8F1 /* blake2s.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA539A1B3CB2C700F79DC6 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC419ED8B0400DAF8F1 /* hash.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA539B1B3CB2C700F79DC6 /* extinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2018DB722E00B5651B /* extinfo.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA539C1B3CB2C700F79DC6 /* extract.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2218DB722E00B5651B /* extract.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA539D1B3CB2C700F79DC6 /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F8218DB722F00B5651B /* volume.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA539E1B3CB2C700F79DC6 /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3618DB722E00B5651B /* list.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA539A1B3CB2C700F79DC6 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC419ED8B0400DAF8F1 /* hash.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-logical-op-parentheses"; }; }; + 96EA539B1B3CB2C700F79DC6 /* extinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2018DB722E00B5651B /* extinfo.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-shorten-64-to-32"; }; }; + 96EA539C1B3CB2C700F79DC6 /* extract.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2218DB722E00B5651B /* extract.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-parentheses"; }; }; + 96EA539D1B3CB2C700F79DC6 /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F8218DB722F00B5651B /* volume.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-logical-op-parentheses"; }; }; + 96EA539E1B3CB2C700F79DC6 /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F3618DB722E00B5651B /* list.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-parentheses -Wno-switch -Wno-unused-function"; }; }; 96EA539F1B3CB2C700F79DC6 /* find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2C18DB722E00B5651B /* find.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53A01B3CB2C700F79DC6 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7A18DB722E00B5651B /* unpack.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A01B3CB2C700F79DC6 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F7A18DB722E00B5651B /* unpack.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-parentheses -Wno-conditional-uninitialized"; }; }; 96EA53A11B3CB2C700F79DC6 /* headers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC619ED8B1F00DAF8F1 /* headers.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53A21B3CB2C700F79DC6 /* threadpool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD219ED8C6100DAF8F1 /* threadpool.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53A31B3CB2C700F79DC6 /* rs16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCD19ED8B9700DAF8F1 /* rs16.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53A41B3CB2C700F79DC6 /* cmddata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0D18DB722E00B5651B /* cmddata.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A31B3CB2C700F79DC6 /* rs16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FCD19ED8B9700DAF8F1 /* rs16.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-unused-variable"; }; }; + 96EA53A41B3CB2C700F79DC6 /* cmddata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F0D18DB722E00B5651B /* cmddata.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-parentheses -Wno-shorten-64-to-32"; }; }; 96EA53A51B3CB2C700F79DC6 /* ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FD419ED8C8000DAF8F1 /* ui.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 96EA53A61B3CB2C700F79DC6 /* filestr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F2A18DB722E00B5651B /* filestr.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96EA53A71B3CB2C700F79DC6 /* recvol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5918DB722E00B5651B /* recvol.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 96EA53A71B3CB2C700F79DC6 /* recvol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5918DB722E00B5651B /* recvol.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-parentheses"; }; }; 96EA53A81B3CB2C700F79DC6 /* rs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F5F18DB722E00B5651B /* rs.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96EA53A91B3CB2C700F79DC6 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 96EA53AA1B3CB2C700F79DC6 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; - 96EA53AB1B3CB2C700F79DC6 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; }; + 96EA53A91B3CB2C700F79DC6 /* scantree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F6318DB722E00B5651B /* scantree.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-logical-op-parentheses"; }; }; + 96EA53AA1B3CB2C700F79DC6 /* qopen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96370FC919ED8B4E00DAF8F1 /* qopen.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks -Wno-unused-variable"; }; }; + 96EA53AB1B3CB2C700F79DC6 /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96853F1818DB722E00B5651B /* dll.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks -Wno-parentheses"; }; }; 96EA53AC1B3CB2C700F79DC6 /* URKArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 489CFA0F128B5169005DCC2A /* URKArchive.mm */; }; 96F5BBBD1B39A68600ACB162 /* URKArchiveTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 964547D11B384F7D00202B28 /* URKArchiveTestCase.m */; }; 96F5BBBF1B39AD3000ACB162 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9660D7AE1A3F4FF90059AC1E /* libz.dylib */; }; @@ -1366,7 +1366,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; TEST_HOST = "$(BUNDLE_LOADER)"; - WARNING_CFLAGS = ""; WRAPPER_EXTENSION = xctest; }; name = Debug; @@ -1399,7 +1398,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; TEST_HOST = "$(BUNDLE_LOADER)"; - WARNING_CFLAGS = ""; WRAPPER_EXTENSION = xctest; }; name = Release; @@ -1447,17 +1445,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-shorten-64-to-32", - "-Wno-unused-function", - "-Wno-conditional-uninitialized", - "-Wno-error=unused-command-line-argument", - ); + WARNING_CFLAGS = " -Wno-shorten-64-to-32"; }; name = Debug; }; @@ -1501,17 +1489,7 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-shorten-64-to-32", - "-Wno-unused-function", - "-Wno-conditional-uninitialized", - "-Wno-error=unused-command-line-argument", - ); + WARNING_CFLAGS = " -Wno-shorten-64-to-32"; }; name = Release; }; @@ -1644,17 +1622,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-shorten-64-to-32", - "-Wno-unused-function", - "-Wno-conditional-uninitialized", - "-Wno-error=unused-command-line-argument", - ); + WARNING_CFLAGS = "-Wno-shorten-64-to-32"; }; name = Debug; }; @@ -1698,17 +1666,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-shorten-64-to-32", - "-Wno-unused-function", - "-Wno-conditional-uninitialized", - "-Wno-error=unused-command-line-argument", - ); + WARNING_CFLAGS = "-Wno-shorten-64-to-32"; }; name = Release; }; @@ -1754,14 +1712,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSUnitTestHostApp.app/iOSUnitTestHostApp"; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-error=unused-command-line-argument", - ); }; name = Debug; }; @@ -1803,14 +1753,6 @@ SDKROOT = iphoneos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSUnitTestHostApp.app/iOSUnitTestHostApp"; VALIDATE_PRODUCT = YES; - WARNING_CFLAGS = ( - "-Wno-dangling-else", - "-Wno-parentheses", - "-Wno-return-type", - "-Wno-unused-variable", - "-Wno-switch", - "-Wno-error=unused-command-line-argument", - ); }; name = Release; }; From b66fbc9991310395183097d96c5583b856a043e3 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:12:30 -0400 Subject: [PATCH 15/38] Adopted lightweight generics for NSArray-returning methods --- Classes/URKArchive.h | 4 ++-- Classes/URKArchive.mm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Classes/URKArchive.h b/Classes/URKArchive.h index 995f68a..915281a 100644 --- a/Classes/URKArchive.h +++ b/Classes/URKArchive.h @@ -220,7 +220,7 @@ extern NSString *URKErrorDomain; * * @return Returns a list of NSString containing the paths within the archive's contents, or nil if an error was encountered */ -- (nullable NSArray *)listFilenames:(NSError **)error; +- (nullable NSArray *)listFilenames:(NSError **)error; /** * Lists the various attributes of each file in the archive @@ -229,7 +229,7 @@ extern NSString *URKErrorDomain; * * @return Returns a list of URKFileInfo objects, which contain metadata about the archive's files, or nil if an error was encountered */ -- (nullable NSArray *)listFileInfo:(NSError **)error; +- (nullable NSArray *)listFileInfo:(NSError **)error; /** * Writes all files in the archive to the given path diff --git a/Classes/URKArchive.mm b/Classes/URKArchive.mm index bdf1f3f..11c6f84 100644 --- a/Classes/URKArchive.mm +++ b/Classes/URKArchive.mm @@ -223,13 +223,13 @@ + (BOOL)urlIsARAR:(NSURL *)fileURL #pragma mark - Public Methods -- (NSArray *)listFilenames:(NSError **)error +- (NSArray *)listFilenames:(NSError **)error { NSArray *files = [self listFileInfo:error]; return [files valueForKey:@"filename"]; } -- (NSArray *)listFileInfo:(NSError **)error +- (NSArray *)listFileInfo:(NSError **)error { __block NSMutableArray *fileInfos = [NSMutableArray array]; From d1d3913cfaeffc86a983c80ec42b46018db84429 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:14:06 -0400 Subject: [PATCH 16/38] Added default initializer, which throws an exception. Also updated the default initializer to return nil when there is an error, or when no URL is given --- Classes/URKArchive.mm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Classes/URKArchive.mm b/Classes/URKArchive.mm index 11c6f84..c7d721d 100644 --- a/Classes/URKArchive.mm +++ b/Classes/URKArchive.mm @@ -61,6 +61,12 @@ + (URKArchive *)rarArchiveAtURL:(NSURL *)fileURL password:(NSString *)password #pragma mark - Initializers +- (instancetype)init { + @throw [NSException exceptionWithName:NSInternalInconsistencyException + reason:@"-init is not a valid initializer for the class URKArchive" + userInfo:nil]; + return [self initWithFile:nil password:nil error:nil]; +} - (instancetype)initWithPath:(NSString *)filePath error:(NSError **)error { @@ -89,6 +95,10 @@ - (instancetype)initWithFile:(NSURL *)fileURL error:(NSError **)error - (instancetype)initWithFile:(NSURL *)fileURL password:(NSString*)password error:(NSError **)error { + if (!fileURL) { + return nil; + } + if ((self = [super init])) { if (error) { *error = nil; @@ -108,6 +118,8 @@ - (instancetype)initWithFile:(NSURL *)fileURL password:(NSString*)password error if (error) { *error = bookmarkError; } + + return nil; } } From 207a06a2d553dfba568fe04b91898f1960ca3981 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:19:53 -0400 Subject: [PATCH 17/38] Added NS_UNAVAILABLE macro to generate a compiler error if using -init --- Classes/URKArchive.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Classes/URKArchive.h b/Classes/URKArchive.h index 915281a..dd0702e 100644 --- a/Classes/URKArchive.h +++ b/Classes/URKArchive.h @@ -152,6 +152,11 @@ extern NSString *URKErrorDomain; + (nullable instancetype)rarArchiveAtURL:(NSURL *)fileURL password:(NSString *)password __deprecated_msg("Use -initWithURL:password:error: instead"); +/** + * Do not use the default initializer + */ +- (instancetype)init NS_UNAVAILABLE; + /** * Creates and returns an archive at the given path * From f360d7b400ec0bb0d2551fb9e06fd05a80dbb031 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:51:28 -0400 Subject: [PATCH 18/38] Upgraded example project to recommended settings (Xcode 7 beta 4), and got it to build by connecting the rootViewController outlet in the main xib --- Example/MainWindow.xib | 477 ++---------------- Example/UnrarExample-Info.plist | 2 +- .../UnrarExample.xcodeproj/project.pbxproj | 5 +- 3 files changed, 38 insertions(+), 446 deletions(-) diff --git a/Example/MainWindow.xib b/Example/MainWindow.xib index 50fb8ff..f0a54e5 100644 --- a/Example/MainWindow.xib +++ b/Example/MainWindow.xib @@ -1,444 +1,33 @@ - - - - 1024 - 10D571 - 786 - 1038.29 - 460.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 112 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - IBCocoaTouchFramework - - - UnrarExampleViewController - - - 1 - - IBCocoaTouchFramework - NO - - - - 292 - {320, 480} - - 1 - MSAxIDEAA - - NO - NO - - IBCocoaTouchFramework - YES - - - - - YES - - - delegate - - - - 4 - - - - viewController - - - - 11 - - - - window - - - - 14 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - 3 - - - UnrarExample App Delegate - - - -2 - - - - - 10 - - - - - 12 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 10.CustomClassName - 10.IBEditorWindowLastContentRect - 10.IBPluginDependency - 12.IBEditorWindowLastContentRect - 12.IBPluginDependency - 3.CustomClassName - 3.IBPluginDependency - - - YES - UIApplication - UIResponder - UnrarExampleViewController - {{234, 376}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{525, 346}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UnrarExampleAppDelegate - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 15 - - - - YES - - UIWindow - UIView - - IBUserSource - - - - - UnrarExampleAppDelegate - NSObject - - YES - - YES - viewController - window - - - YES - UnrarExampleViewController - UIWindow - - - - YES - - YES - viewController - window - - - YES - - viewController - UnrarExampleViewController - - - window - UIWindow - - - - - IBProjectSource - Classes/UnrarExampleAppDelegate.h - - - - UnrarExampleAppDelegate - NSObject - - IBUserSource - - - - - UnrarExampleViewController - UIViewController - - IBProjectSource - Classes/UnrarExampleViewController.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIApplication - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIApplication.h - - - - UIResponder - NSObject - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - UIWindow - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIWindow.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - UnrarExample.xcodeproj - 3 - 112 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/UnrarExample-Info.plist b/Example/UnrarExample-Info.plist index 3289444..276e6f6 100644 --- a/Example/UnrarExample-Info.plist +++ b/Example/UnrarExample-Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Example/UnrarExample.xcodeproj/project.pbxproj b/Example/UnrarExample.xcodeproj/project.pbxproj index 2fd8ad7..005145b 100644 --- a/Example/UnrarExample.xcodeproj/project.pbxproj +++ b/Example/UnrarExample.xcodeproj/project.pbxproj @@ -143,7 +143,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0700; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "UnrarExample" */; compatibilityVersion = "Xcode 3.2"; @@ -210,6 +210,7 @@ INFOPLIST_FILE = "UnrarExample-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DTARGET_OS_IPHONE"; + PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = UnrarExample; }; name = Debug; @@ -233,6 +234,7 @@ "-DTARGET_OS_IPHONE", "-DNS_BLOCK_ASSERTIONS=1", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = UnrarExample; VALIDATE_PRODUCT = YES; }; @@ -242,6 +244,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; From ceec64d9ec411c2b33aadfaeeea356b143b917e7 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:52:03 -0400 Subject: [PATCH 19/38] Updated example project to complement the current UnrarKit syntax --- Example/Classes/UnrarExampleViewController.m | 56 +++++--------------- 1 file changed, 13 insertions(+), 43 deletions(-) diff --git a/Example/Classes/UnrarExampleViewController.m b/Example/Classes/UnrarExampleViewController.m index 073724e..3e10492 100644 --- a/Example/Classes/UnrarExampleViewController.m +++ b/Example/Classes/UnrarExampleViewController.m @@ -9,44 +9,22 @@ @implementation UnrarExampleViewController -/* -// The designated initializer. Override to perform setup that is required before the view is loaded. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; - if (self) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} -*/ - - -/* -// Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationPortrait); -} -*/ - - (IBAction)decompress:(id)sender { NSString *filePath = [[NSBundle mainBundle] pathForResource:@"Test Archive (Password)" ofType:@"rar"]; - URKArchive *archive = [URKArchive rarArchiveAtPath:filePath]; + NSError *archiveError = nil; + URKArchive *archive = [[URKArchive alloc] initWithPath:filePath error:&archiveError]; + + if (!archive) { + UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Failed to create archive" + message:@"Error creating the archive" + preferredStyle:UIAlertControllerStyleAlert]; + [controller addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil]]; + + [self presentViewController:controller animated:YES completion:nil]; + return; + } + NSError *error = nil; NSArray *filenames = [archive listFilenames:&error]; @@ -74,14 +52,6 @@ - (IBAction)decompress:(id)sender { } } -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - - - (void)dealloc { [super dealloc]; } From 50085cab6e3b31735c2159bc39b8b553144e710d Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:56:00 -0400 Subject: [PATCH 20/38] Converted example project to ARC and modern Objective-C syntax --- Example/Classes/UnrarExampleAppDelegate.h | 9 +++------ Example/Classes/UnrarExampleAppDelegate.m | 10 +--------- Example/Classes/UnrarExampleViewController.m | 3 --- Example/UnrarExample.xcodeproj/project.pbxproj | 2 ++ Example/main.m | 8 ++++---- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/Example/Classes/UnrarExampleAppDelegate.h b/Example/Classes/UnrarExampleAppDelegate.h index 139fae9..170c048 100644 --- a/Example/Classes/UnrarExampleAppDelegate.h +++ b/Example/Classes/UnrarExampleAppDelegate.h @@ -8,13 +8,10 @@ @class UnrarExampleViewController; -@interface UnrarExampleAppDelegate : NSObject { - UIWindow *window; - UnrarExampleViewController *viewController; -} +@interface UnrarExampleAppDelegate : NSObject -@property (nonatomic, retain) IBOutlet UIWindow *window; -@property (nonatomic, retain) IBOutlet UnrarExampleViewController *viewController; +@property (nonatomic, strong) IBOutlet UIWindow *window; +@property (nonatomic, strong) IBOutlet UnrarExampleViewController *viewController; @end diff --git a/Example/Classes/UnrarExampleAppDelegate.m b/Example/Classes/UnrarExampleAppDelegate.m index 30e1427..8e1238f 100644 --- a/Example/Classes/UnrarExampleAppDelegate.m +++ b/Example/Classes/UnrarExampleAppDelegate.m @@ -9,9 +9,6 @@ @implementation UnrarExampleAppDelegate -@synthesize window; -@synthesize viewController; - #pragma mark - #pragma mark Application lifecycle @@ -21,7 +18,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( // Override point for customization after application launch. // Add the view controller's view to the window and display. - [self.window addSubview:viewController.view]; + [self.window addSubview:self.viewController.view]; [self.window makeKeyAndVisible]; return YES; @@ -76,11 +73,6 @@ Free up as much memory as possible by purging cached data objects that can be re } -- (void)dealloc { - [viewController release]; - [window release]; - [super dealloc]; -} @end diff --git a/Example/Classes/UnrarExampleViewController.m b/Example/Classes/UnrarExampleViewController.m index 3e10492..1cc8c6f 100644 --- a/Example/Classes/UnrarExampleViewController.m +++ b/Example/Classes/UnrarExampleViewController.m @@ -52,8 +52,5 @@ - (IBAction)decompress:(id)sender { } } -- (void)dealloc { - [super dealloc]; -} @end diff --git a/Example/UnrarExample.xcodeproj/project.pbxproj b/Example/UnrarExample.xcodeproj/project.pbxproj index 005145b..f6857bb 100644 --- a/Example/UnrarExample.xcodeproj/project.pbxproj +++ b/Example/UnrarExample.xcodeproj/project.pbxproj @@ -196,6 +196,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; GCC_DYNAMIC_NO_PIC = NO; @@ -219,6 +220,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/Example/main.m b/Example/main.m index 57d505e..b055753 100644 --- a/Example/main.m +++ b/Example/main.m @@ -10,8 +10,8 @@ int main(int argc, char *argv[]) { - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, nil); - [pool release]; - return retVal; + @autoreleasepool { + int retVal = UIApplicationMain(argc, argv, nil, nil); + return retVal; + } } From fb4ce96a0e52a0380a064cd492cc8777b8e3bce7 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:56:28 -0400 Subject: [PATCH 21/38] Tweaked --- Example/Classes/UnrarExampleAppDelegate.m | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Example/Classes/UnrarExampleAppDelegate.m b/Example/Classes/UnrarExampleAppDelegate.m index 8e1238f..59c8bd6 100644 --- a/Example/Classes/UnrarExampleAppDelegate.m +++ b/Example/Classes/UnrarExampleAppDelegate.m @@ -10,8 +10,7 @@ @implementation UnrarExampleAppDelegate -#pragma mark - -#pragma mark Application lifecycle +#pragma mark - Application lifecycle - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { @@ -63,8 +62,7 @@ - (void)applicationWillTerminate:(UIApplication *)application { } -#pragma mark - -#pragma mark Memory management +#pragma mark - Memory management - (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { /* From 4a4c23934bf0a97d594c6adbb2433ce3361e505b Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 16:58:22 -0400 Subject: [PATCH 22/38] Updated readme to reflect API changes --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3c88c3b..b29230f 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,14 @@ I'm always open to improvements, so please submit your pull requests, or [create # Example Usage ```Objective-C -URKArchive *archive = [URKArchive rarArchiveAtPath:@"An Archive.rar"]; +NSError *archiveError = nil; +URKArchive *archive = [[URKArchive alloc] initWithPath:@"An Archive.rar" error:&archiveError]; NSError *error = nil; ``` ## Listing the file names in an archive ```Objective-C -NSArray *filesInArchive = [archive listFilenames:&error]; +NSArray *filesInArchive = [archive listFilenames:&error]; for (NSString *name in filesInArchive) { NSLog(@"Archived file: %@", name); } @@ -26,7 +27,7 @@ for (NSString *name in filesInArchive) { ## Listing the file details in an archive ```Objective-C -NSArray *fileInfosInArchive = [archive listFileInfo:&error]; +NSArray *fileInfosInArchive = [archive listFileInfo:&error]; for (URKFileInfo *info in fileInfosInArchive) { NSLog(@"Archive name: %@ | File name: %@ | Size: %lld", info.archiveName, info.filename, info.uncompressedSize); } @@ -34,7 +35,7 @@ for (URKFileInfo *info in fileInfosInArchive) { ## Working with passwords ```Objective-C -NSArray *fileInfosInArchive = [archive listFileInfo:&error]; +NSArray *fileInfosInArchive = [archive listFileInfo:&error]; if (archive.isPasswordProtected) { NSString *givenPassword = // prompt user archive.password = givenPassword From a45342f54e0c622174557b7de87b0c30f3e49c09 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Tue, 4 Aug 2015 17:00:53 -0400 Subject: [PATCH 23/38] Updated Travis yaml to exclude the swift 2.0 branch until Travis supports Xcode 7 --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f490ce5..2ac8e15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,12 @@ language: objective-c -osx_image: beta-xcode6.3 + +osx_image: xcode6.4 + +# Until Xcode 7 is supported +branches: + except: + - swift-2.0 + before_install: - brew update - brew install carthage From 6f3628ab98a019ff9445a5e0e592d45f1f22ae8f Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Wed, 5 Aug 2015 15:52:21 -0400 Subject: [PATCH 24/38] Updated build settings for iOS target to use a signing identity for Debug builds for device SDKs --- UnrarKit.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index 07c041e..0901ef5 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -1428,7 +1428,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphonesimulator*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; From 52777c6235fb2e1ba93ee9c966a3a7a2816bef7c Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Thu, 10 Sep 2015 14:49:55 -0400 Subject: [PATCH 25/38] Switched to Xcode 7, removed Mavericks build --- .travis.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ac8e15..d6ff2c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,6 @@ language: objective-c -osx_image: xcode6.4 - -# Until Xcode 7 is supported -branches: - except: - - swift-2.0 +osx_image: xcode7 before_install: - brew update @@ -24,9 +19,9 @@ matrix: xcode_sdk: iphonesimulator env: NAME=iOSTests - - xcode_scheme: UnrarKit - xcode_sdk: macosx10.9 - env: NAME=Mavericks +# - xcode_scheme: UnrarKit +# xcode_sdk: macosx10.9 +# env: NAME=Mavericks - xcode_scheme: UnrarExample xcode_sdk: iphonesimulator From 294c11b73a8d1d257fc061e03a8f8476816413af Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Thu, 10 Sep 2015 14:52:55 -0400 Subject: [PATCH 26/38] Removed XCTool upgrade --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6ff2c1..42ac033 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ osx_image: xcode7 before_install: - brew update - brew install carthage - - brew upgrade xctool +# - brew upgrade xctool xcode_workspace: UnrarKit.xcworkspace From fade5e2e688dc8cd6d09ea6964779723c161336e Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Thu, 10 Sep 2015 15:05:23 -0400 Subject: [PATCH 27/38] Updating XCTool to head version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 42ac033..513f696 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ osx_image: xcode7 before_install: - brew update - brew install carthage -# - brew upgrade xctool + - brew upgrade xctool --HEAD xcode_workspace: UnrarKit.xcworkspace From 412c6ee53b21399e7ef2dca64c1cba90b10158de Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Thu, 10 Sep 2015 15:38:23 -0400 Subject: [PATCH 28/38] Trying out installation of Carthage's HEAD, which includes my pull request --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f490ce5..f686401 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: objective-c -osx_image: beta-xcode6.3 +osx_image: xcode6.3 before_install: - brew update - - brew install carthage + - brew install carthage --HEAD - brew upgrade xctool xcode_workspace: UnrarKit.xcworkspace From f5cbc9e7a32ba0a35cbb59a2534e1765f90b5d10 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Thu, 10 Sep 2015 15:45:45 -0400 Subject: [PATCH 29/38] Trying to use old 'beta-xcode6.3' OS X image --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f686401..6be7005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode6.3 +osx_image: beta-xcode6.3 before_install: - brew update - brew install carthage --HEAD From ca29cf98f27940e4b1be8dcad5009d3b3814f43e Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Thu, 10 Sep 2015 16:10:27 -0400 Subject: [PATCH 30/38] Removed Carthage validation until pull request 583 is incorporated into an official release --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index abb547a..5fe09ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ osx_image: xcode7 before_install: - brew update - - brew install carthage --HEAD +# - brew install carthage --HEAD - brew upgrade xctool --HEAD xcode_workspace: UnrarKit.xcworkspace @@ -29,7 +29,8 @@ matrix: script: - xctool -workspace $TRAVIS_XCODE_WORKSPACE -scheme "$TRAVIS_XCODE_SCHEME" -sdk $TRAVIS_XCODE_SDK -configuration Release analyze test - - ./Scripts/carthage-validate.sh +# Commented out because v0.8 requires signing identities, and installing with --HEAD requires Swift 1.2 +# - ./Scripts/carthage-validate.sh - ./Scripts/cocoapod-validate.sh # Turn on Docker, container-based infrastructure From 70b77bce6e2674240e0e82f3e23cd49e5ea69a64 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Mon, 2 Nov 2015 11:59:41 -0500 Subject: [PATCH 31/38] Fixed Issue #28 by specifying which headers should be public --- UnrarKit.podspec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/UnrarKit.podspec b/UnrarKit.podspec index 6abfe43..a44121c 100644 --- a/UnrarKit.podspec +++ b/UnrarKit.podspec @@ -8,10 +8,13 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/abbeycode/UnrarKit.git", :tag => "#{s.version}" } s.ios.deployment_target = "5.0" s.osx.deployment_target = "10.7" - s.requires_arc = 'Classes/**/*' + s.requires_arc = "Classes/**/*" s.source_files = "Classes/**/*.{mm,m,h}" + s.public_header_files = "Classes/*.h" s.subspec "unrar-lib" do |ss| + ss.public_header_files = "Libraries/unrar/raros.hpp", + "Libraries/unrar/dll.hpp" ss.source_files = "Libraries/unrar/*.hpp", "Libraries/unrar/rar.cpp", "Libraries/unrar/strlist.cpp", From 8ce86106ab4b9d4805f95fd9e6bbda85f648196d Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Mon, 2 Nov 2015 12:09:18 -0500 Subject: [PATCH 32/38] Updated build to Xcode 7.1, trying to remove teh xctool upgrade --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fe09ff..50613f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ language: objective-c -osx_image: xcode7 +osx_image: xcode7.1 before_install: - - brew update +# - brew update # - brew install carthage --HEAD - - brew upgrade xctool --HEAD +# - brew upgrade xctool --HEAD xcode_workspace: UnrarKit.xcworkspace From 3a3ef2dcef8bc28212305728494cedcd6cba409e Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Mon, 2 Nov 2015 12:40:11 -0500 Subject: [PATCH 33/38] Switched from #import to @import in example project to fix build error --- Example/Classes/UnrarExampleViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Example/Classes/UnrarExampleViewController.m b/Example/Classes/UnrarExampleViewController.m index 1cc8c6f..c0964e3 100644 --- a/Example/Classes/UnrarExampleViewController.m +++ b/Example/Classes/UnrarExampleViewController.m @@ -5,7 +5,7 @@ // #import "UnrarExampleViewController.h" -#import +@import UnrarKit; @implementation UnrarExampleViewController @@ -13,7 +13,7 @@ - (IBAction)decompress:(id)sender { NSString *filePath = [[NSBundle mainBundle] pathForResource:@"Test Archive (Password)" ofType:@"rar"]; NSError *archiveError = nil; - URKArchive *archive = [[URKArchive alloc] initWithPath:filePath error:&archiveError]; + URKArchive *archive = [[URKArchive alloc] initWithPath:filePath error:&archiveError]; if (!archive) { UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Failed to create archive" From 5876450e6cb1aee1bd596a518010cb7898ac40b6 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Mon, 2 Nov 2015 14:11:37 -0500 Subject: [PATCH 34/38] Moved unrar lib headers to Project section (fixing UnrarExample app build error) --- UnrarKit.xcodeproj/project.pbxproj | 228 ++++++++++++++--------------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index 9e6709c..847d289 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -12,123 +12,123 @@ 9699F91D1B3CB4D000B6D373 /* URKArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 489CFA0E128B5169005DCC2A /* URKArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9699F91E1B3CB4D000B6D373 /* URKFileInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FCD4691A3262E5003612BF /* URKFileInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9699F91F1B3CB4D000B6D373 /* UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 969F17361A60297700665453 /* UnrarKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9201B3CB4D000B6D373 /* archive.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0918DB722E00B5651B /* archive.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9211B3CB4D000B6D373 /* array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0B18DB722E00B5651B /* array.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9221B3CB4D000B6D373 /* cmddata.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0E18DB722E00B5651B /* cmddata.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9231B3CB4D000B6D373 /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1018DB722E00B5651B /* coder.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9241B3CB4D000B6D373 /* compress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1118DB722E00B5651B /* compress.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9251B3CB4D000B6D373 /* consio.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1318DB722E00B5651B /* consio.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9261B3CB4D000B6D373 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1518DB722E00B5651B /* crc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9271B3CB4D000B6D373 /* crypt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1718DB722E00B5651B /* crypt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9201B3CB4D000B6D373 /* archive.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0918DB722E00B5651B /* archive.hpp */; }; + 9699F9211B3CB4D000B6D373 /* array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0B18DB722E00B5651B /* array.hpp */; }; + 9699F9221B3CB4D000B6D373 /* cmddata.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0E18DB722E00B5651B /* cmddata.hpp */; }; + 9699F9231B3CB4D000B6D373 /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1018DB722E00B5651B /* coder.hpp */; }; + 9699F9241B3CB4D000B6D373 /* compress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1118DB722E00B5651B /* compress.hpp */; }; + 9699F9251B3CB4D000B6D373 /* consio.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1318DB722E00B5651B /* consio.hpp */; }; + 9699F9261B3CB4D000B6D373 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1518DB722E00B5651B /* crc.hpp */; }; + 9699F9271B3CB4D000B6D373 /* crypt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1718DB722E00B5651B /* crypt.hpp */; }; 9699F9281B3CB4D000B6D373 /* dll.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1A18DB722E00B5651B /* dll.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9291B3CB4D000B6D373 /* encname.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1D18DB722E00B5651B /* encname.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F92A1B3CB4D000B6D373 /* errhnd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1F18DB722E00B5651B /* errhnd.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F92B1B3CB4D000B6D373 /* extinfo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2118DB722E00B5651B /* extinfo.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F92C1B3CB4D000B6D373 /* extract.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2318DB722E00B5651B /* extract.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F92D1B3CB4D000B6D373 /* filcreat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2518DB722E00B5651B /* filcreat.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F92E1B3CB4D000B6D373 /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2718DB722E00B5651B /* file.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F92F1B3CB4D000B6D373 /* filefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2918DB722E00B5651B /* filefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9301B3CB4D000B6D373 /* filestr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2B18DB722E00B5651B /* filestr.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9311B3CB4D000B6D373 /* find.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2D18DB722E00B5651B /* find.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9321B3CB4D000B6D373 /* getbits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2F18DB722E00B5651B /* getbits.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9331B3CB4D000B6D373 /* global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3118DB722E00B5651B /* global.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9341B3CB4D000B6D373 /* headers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3218DB722E00B5651B /* headers.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9351B3CB4D000B6D373 /* isnt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3418DB722E00B5651B /* isnt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9361B3CB4D000B6D373 /* list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3718DB722E00B5651B /* list.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9371B3CB4D000B6D373 /* loclang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3818DB722E00B5651B /* loclang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9381B3CB4D000B6D373 /* log.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3A18DB722E00B5651B /* log.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9391B3CB4D000B6D373 /* match.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4018DB722E00B5651B /* match.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F93A1B3CB4D000B6D373 /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4218DB722E00B5651B /* model.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F93B1B3CB4D000B6D373 /* options.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4518DB722E00B5651B /* options.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F93C1B3CB4D000B6D373 /* os.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4618DB722E00B5651B /* os.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F93D1B3CB4D000B6D373 /* pathfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4918DB722E00B5651B /* pathfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F93E1B3CB4D000B6D373 /* rar.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4B18DB722E00B5651B /* rar.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F93F1B3CB4D000B6D373 /* rardefs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4C18DB722E00B5651B /* rardefs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9401B3CB4D000B6D373 /* rarlang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4D18DB722E00B5651B /* rarlang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9291B3CB4D000B6D373 /* encname.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1D18DB722E00B5651B /* encname.hpp */; }; + 9699F92A1B3CB4D000B6D373 /* errhnd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1F18DB722E00B5651B /* errhnd.hpp */; }; + 9699F92B1B3CB4D000B6D373 /* extinfo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2118DB722E00B5651B /* extinfo.hpp */; }; + 9699F92C1B3CB4D000B6D373 /* extract.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2318DB722E00B5651B /* extract.hpp */; }; + 9699F92D1B3CB4D000B6D373 /* filcreat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2518DB722E00B5651B /* filcreat.hpp */; }; + 9699F92E1B3CB4D000B6D373 /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2718DB722E00B5651B /* file.hpp */; }; + 9699F92F1B3CB4D000B6D373 /* filefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2918DB722E00B5651B /* filefn.hpp */; }; + 9699F9301B3CB4D000B6D373 /* filestr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2B18DB722E00B5651B /* filestr.hpp */; }; + 9699F9311B3CB4D000B6D373 /* find.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2D18DB722E00B5651B /* find.hpp */; }; + 9699F9321B3CB4D000B6D373 /* getbits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2F18DB722E00B5651B /* getbits.hpp */; }; + 9699F9331B3CB4D000B6D373 /* global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3118DB722E00B5651B /* global.hpp */; }; + 9699F9341B3CB4D000B6D373 /* headers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3218DB722E00B5651B /* headers.hpp */; }; + 9699F9351B3CB4D000B6D373 /* isnt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3418DB722E00B5651B /* isnt.hpp */; }; + 9699F9361B3CB4D000B6D373 /* list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3718DB722E00B5651B /* list.hpp */; }; + 9699F9371B3CB4D000B6D373 /* loclang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3818DB722E00B5651B /* loclang.hpp */; }; + 9699F9381B3CB4D000B6D373 /* log.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3A18DB722E00B5651B /* log.hpp */; }; + 9699F9391B3CB4D000B6D373 /* match.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4018DB722E00B5651B /* match.hpp */; }; + 9699F93A1B3CB4D000B6D373 /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4218DB722E00B5651B /* model.hpp */; }; + 9699F93B1B3CB4D000B6D373 /* options.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4518DB722E00B5651B /* options.hpp */; }; + 9699F93C1B3CB4D000B6D373 /* os.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4618DB722E00B5651B /* os.hpp */; }; + 9699F93D1B3CB4D000B6D373 /* pathfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4918DB722E00B5651B /* pathfn.hpp */; }; + 9699F93E1B3CB4D000B6D373 /* rar.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4B18DB722E00B5651B /* rar.hpp */; }; + 9699F93F1B3CB4D000B6D373 /* rardefs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4C18DB722E00B5651B /* rardefs.hpp */; }; + 9699F9401B3CB4D000B6D373 /* rarlang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4D18DB722E00B5651B /* rarlang.hpp */; }; 9699F9411B3CB4D000B6D373 /* raros.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4E18DB722E00B5651B /* raros.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9421B3CB4D000B6D373 /* rartypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5018DB722E00B5651B /* rartypes.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9431B3CB4D000B6D373 /* rarvm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5218DB722E00B5651B /* rarvm.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9441B3CB4D000B6D373 /* rawread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5518DB722E00B5651B /* rawread.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9451B3CB4D000B6D373 /* rdwrfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5718DB722E00B5651B /* rdwrfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9461B3CB4D000B6D373 /* recvol.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5A18DB722E00B5651B /* recvol.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9471B3CB4D000B6D373 /* resource.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5C18DB722E00B5651B /* resource.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9481B3CB4D000B6D373 /* rijndael.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5E18DB722E00B5651B /* rijndael.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9491B3CB4D000B6D373 /* rs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6018DB722E00B5651B /* rs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F94B1B3CB4D000B6D373 /* savepos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6218DB722E00B5651B /* savepos.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F94C1B3CB4D000B6D373 /* scantree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6418DB722E00B5651B /* scantree.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F94D1B3CB4D000B6D373 /* secpassword.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6618DB722E00B5651B /* secpassword.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F94E1B3CB4D000B6D373 /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6818DB722E00B5651B /* sha1.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F94F1B3CB4D000B6D373 /* smallfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6A18DB722E00B5651B /* smallfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9501B3CB4D000B6D373 /* strfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6C18DB722E00B5651B /* strfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9511B3CB4D000B6D373 /* strlist.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6E18DB722E00B5651B /* strlist.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9521B3CB4D000B6D373 /* suballoc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7018DB722E00B5651B /* suballoc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9531B3CB4D000B6D373 /* system.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7218DB722E00B5651B /* system.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9541B3CB4D000B6D373 /* timefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7418DB722E00B5651B /* timefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9551B3CB4D000B6D373 /* ulinks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7618DB722E00B5651B /* ulinks.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9561B3CB4D000B6D373 /* unicode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7818DB722E00B5651B /* unicode.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9571B3CB4D000B6D373 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9581B3CB4D000B6D373 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699F9591B3CB4D000B6D373 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699F9421B3CB4D000B6D373 /* rartypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5018DB722E00B5651B /* rartypes.hpp */; }; + 9699F9431B3CB4D000B6D373 /* rarvm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5218DB722E00B5651B /* rarvm.hpp */; }; + 9699F9441B3CB4D000B6D373 /* rawread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5518DB722E00B5651B /* rawread.hpp */; }; + 9699F9451B3CB4D000B6D373 /* rdwrfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5718DB722E00B5651B /* rdwrfn.hpp */; }; + 9699F9461B3CB4D000B6D373 /* recvol.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5A18DB722E00B5651B /* recvol.hpp */; }; + 9699F9471B3CB4D000B6D373 /* resource.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5C18DB722E00B5651B /* resource.hpp */; }; + 9699F9481B3CB4D000B6D373 /* rijndael.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5E18DB722E00B5651B /* rijndael.hpp */; }; + 9699F9491B3CB4D000B6D373 /* rs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6018DB722E00B5651B /* rs.hpp */; }; + 9699F94B1B3CB4D000B6D373 /* savepos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6218DB722E00B5651B /* savepos.hpp */; }; + 9699F94C1B3CB4D000B6D373 /* scantree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6418DB722E00B5651B /* scantree.hpp */; }; + 9699F94D1B3CB4D000B6D373 /* secpassword.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6618DB722E00B5651B /* secpassword.hpp */; }; + 9699F94E1B3CB4D000B6D373 /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6818DB722E00B5651B /* sha1.hpp */; }; + 9699F94F1B3CB4D000B6D373 /* smallfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6A18DB722E00B5651B /* smallfn.hpp */; }; + 9699F9501B3CB4D000B6D373 /* strfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6C18DB722E00B5651B /* strfn.hpp */; }; + 9699F9511B3CB4D000B6D373 /* strlist.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6E18DB722E00B5651B /* strlist.hpp */; }; + 9699F9521B3CB4D000B6D373 /* suballoc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7018DB722E00B5651B /* suballoc.hpp */; }; + 9699F9531B3CB4D000B6D373 /* system.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7218DB722E00B5651B /* system.hpp */; }; + 9699F9541B3CB4D000B6D373 /* timefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7418DB722E00B5651B /* timefn.hpp */; }; + 9699F9551B3CB4D000B6D373 /* ulinks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7618DB722E00B5651B /* ulinks.hpp */; }; + 9699F9561B3CB4D000B6D373 /* unicode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7818DB722E00B5651B /* unicode.hpp */; }; + 9699F9571B3CB4D000B6D373 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; }; + 9699F9581B3CB4D000B6D373 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; }; + 9699F9591B3CB4D000B6D373 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; }; 9699FA2A1B3CBB1400B6D373 /* URKArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 489CFA0E128B5169005DCC2A /* URKArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9699FA2B1B3CBB1400B6D373 /* URKFileInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FCD4691A3262E5003612BF /* URKFileInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9699FA2C1B3CBB1400B6D373 /* UnrarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 969F17361A60297700665453 /* UnrarKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA2D1B3CBB1400B6D373 /* archive.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0918DB722E00B5651B /* archive.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA2E1B3CBB1400B6D373 /* array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0B18DB722E00B5651B /* array.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA2F1B3CBB1400B6D373 /* cmddata.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0E18DB722E00B5651B /* cmddata.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA301B3CBB1400B6D373 /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1018DB722E00B5651B /* coder.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA311B3CBB1400B6D373 /* compress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1118DB722E00B5651B /* compress.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA321B3CBB1400B6D373 /* consio.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1318DB722E00B5651B /* consio.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA331B3CBB1400B6D373 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1518DB722E00B5651B /* crc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA341B3CBB1400B6D373 /* crypt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1718DB722E00B5651B /* crypt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA2D1B3CBB1400B6D373 /* archive.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0918DB722E00B5651B /* archive.hpp */; }; + 9699FA2E1B3CBB1400B6D373 /* array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0B18DB722E00B5651B /* array.hpp */; }; + 9699FA2F1B3CBB1400B6D373 /* cmddata.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F0E18DB722E00B5651B /* cmddata.hpp */; }; + 9699FA301B3CBB1400B6D373 /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1018DB722E00B5651B /* coder.hpp */; }; + 9699FA311B3CBB1400B6D373 /* compress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1118DB722E00B5651B /* compress.hpp */; }; + 9699FA321B3CBB1400B6D373 /* consio.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1318DB722E00B5651B /* consio.hpp */; }; + 9699FA331B3CBB1400B6D373 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1518DB722E00B5651B /* crc.hpp */; }; + 9699FA341B3CBB1400B6D373 /* crypt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1718DB722E00B5651B /* crypt.hpp */; }; 9699FA351B3CBB1400B6D373 /* dll.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1A18DB722E00B5651B /* dll.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA361B3CBB1400B6D373 /* encname.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1D18DB722E00B5651B /* encname.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA371B3CBB1400B6D373 /* errhnd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1F18DB722E00B5651B /* errhnd.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA381B3CBB1400B6D373 /* extinfo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2118DB722E00B5651B /* extinfo.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA391B3CBB1400B6D373 /* extract.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2318DB722E00B5651B /* extract.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA3A1B3CBB1400B6D373 /* filcreat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2518DB722E00B5651B /* filcreat.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA3B1B3CBB1400B6D373 /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2718DB722E00B5651B /* file.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA3C1B3CBB1400B6D373 /* filefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2918DB722E00B5651B /* filefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA3D1B3CBB1400B6D373 /* filestr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2B18DB722E00B5651B /* filestr.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA3E1B3CBB1400B6D373 /* find.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2D18DB722E00B5651B /* find.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA3F1B3CBB1400B6D373 /* getbits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2F18DB722E00B5651B /* getbits.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA401B3CBB1400B6D373 /* global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3118DB722E00B5651B /* global.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA411B3CBB1400B6D373 /* headers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3218DB722E00B5651B /* headers.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA421B3CBB1400B6D373 /* isnt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3418DB722E00B5651B /* isnt.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA431B3CBB1400B6D373 /* list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3718DB722E00B5651B /* list.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA441B3CBB1400B6D373 /* loclang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3818DB722E00B5651B /* loclang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA451B3CBB1400B6D373 /* log.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3A18DB722E00B5651B /* log.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA461B3CBB1400B6D373 /* match.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4018DB722E00B5651B /* match.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA471B3CBB1400B6D373 /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4218DB722E00B5651B /* model.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA481B3CBB1400B6D373 /* options.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4518DB722E00B5651B /* options.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA491B3CBB1400B6D373 /* os.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4618DB722E00B5651B /* os.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA4A1B3CBB1400B6D373 /* pathfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4918DB722E00B5651B /* pathfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA4B1B3CBB1400B6D373 /* rar.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4B18DB722E00B5651B /* rar.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA4C1B3CBB1400B6D373 /* rardefs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4C18DB722E00B5651B /* rardefs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA4D1B3CBB1400B6D373 /* rarlang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4D18DB722E00B5651B /* rarlang.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA361B3CBB1400B6D373 /* encname.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1D18DB722E00B5651B /* encname.hpp */; }; + 9699FA371B3CBB1400B6D373 /* errhnd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F1F18DB722E00B5651B /* errhnd.hpp */; }; + 9699FA381B3CBB1400B6D373 /* extinfo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2118DB722E00B5651B /* extinfo.hpp */; }; + 9699FA391B3CBB1400B6D373 /* extract.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2318DB722E00B5651B /* extract.hpp */; }; + 9699FA3A1B3CBB1400B6D373 /* filcreat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2518DB722E00B5651B /* filcreat.hpp */; }; + 9699FA3B1B3CBB1400B6D373 /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2718DB722E00B5651B /* file.hpp */; }; + 9699FA3C1B3CBB1400B6D373 /* filefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2918DB722E00B5651B /* filefn.hpp */; }; + 9699FA3D1B3CBB1400B6D373 /* filestr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2B18DB722E00B5651B /* filestr.hpp */; }; + 9699FA3E1B3CBB1400B6D373 /* find.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2D18DB722E00B5651B /* find.hpp */; }; + 9699FA3F1B3CBB1400B6D373 /* getbits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F2F18DB722E00B5651B /* getbits.hpp */; }; + 9699FA401B3CBB1400B6D373 /* global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3118DB722E00B5651B /* global.hpp */; }; + 9699FA411B3CBB1400B6D373 /* headers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3218DB722E00B5651B /* headers.hpp */; }; + 9699FA421B3CBB1400B6D373 /* isnt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3418DB722E00B5651B /* isnt.hpp */; }; + 9699FA431B3CBB1400B6D373 /* list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3718DB722E00B5651B /* list.hpp */; }; + 9699FA441B3CBB1400B6D373 /* loclang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3818DB722E00B5651B /* loclang.hpp */; }; + 9699FA451B3CBB1400B6D373 /* log.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F3A18DB722E00B5651B /* log.hpp */; }; + 9699FA461B3CBB1400B6D373 /* match.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4018DB722E00B5651B /* match.hpp */; }; + 9699FA471B3CBB1400B6D373 /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4218DB722E00B5651B /* model.hpp */; }; + 9699FA481B3CBB1400B6D373 /* options.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4518DB722E00B5651B /* options.hpp */; }; + 9699FA491B3CBB1400B6D373 /* os.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4618DB722E00B5651B /* os.hpp */; }; + 9699FA4A1B3CBB1400B6D373 /* pathfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4918DB722E00B5651B /* pathfn.hpp */; }; + 9699FA4B1B3CBB1400B6D373 /* rar.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4B18DB722E00B5651B /* rar.hpp */; }; + 9699FA4C1B3CBB1400B6D373 /* rardefs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4C18DB722E00B5651B /* rardefs.hpp */; }; + 9699FA4D1B3CBB1400B6D373 /* rarlang.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4D18DB722E00B5651B /* rarlang.hpp */; }; 9699FA4E1B3CBB1400B6D373 /* raros.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F4E18DB722E00B5651B /* raros.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA4F1B3CBB1400B6D373 /* rartypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5018DB722E00B5651B /* rartypes.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA501B3CBB1400B6D373 /* rarvm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5218DB722E00B5651B /* rarvm.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA511B3CBB1400B6D373 /* rawread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5518DB722E00B5651B /* rawread.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA521B3CBB1400B6D373 /* rdwrfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5718DB722E00B5651B /* rdwrfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA531B3CBB1400B6D373 /* recvol.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5A18DB722E00B5651B /* recvol.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA541B3CBB1400B6D373 /* resource.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5C18DB722E00B5651B /* resource.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA551B3CBB1400B6D373 /* rijndael.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5E18DB722E00B5651B /* rijndael.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA561B3CBB1400B6D373 /* rs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6018DB722E00B5651B /* rs.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA571B3CBB1400B6D373 /* savepos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6218DB722E00B5651B /* savepos.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA581B3CBB1400B6D373 /* scantree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6418DB722E00B5651B /* scantree.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA591B3CBB1400B6D373 /* secpassword.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6618DB722E00B5651B /* secpassword.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA5A1B3CBB1400B6D373 /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6818DB722E00B5651B /* sha1.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA5B1B3CBB1400B6D373 /* smallfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6A18DB722E00B5651B /* smallfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA5C1B3CBB1400B6D373 /* strfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6C18DB722E00B5651B /* strfn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA5D1B3CBB1400B6D373 /* strlist.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6E18DB722E00B5651B /* strlist.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA5E1B3CBB1400B6D373 /* suballoc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7018DB722E00B5651B /* suballoc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA5F1B3CBB1400B6D373 /* system.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7218DB722E00B5651B /* system.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA601B3CBB1400B6D373 /* timefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7418DB722E00B5651B /* timefn.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA611B3CBB1400B6D373 /* ulinks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7618DB722E00B5651B /* ulinks.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA621B3CBB1400B6D373 /* unicode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7818DB722E00B5651B /* unicode.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA631B3CBB1400B6D373 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA641B3CBB1400B6D373 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 9699FA651B3CBB1400B6D373 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 9699FA4F1B3CBB1400B6D373 /* rartypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5018DB722E00B5651B /* rartypes.hpp */; }; + 9699FA501B3CBB1400B6D373 /* rarvm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5218DB722E00B5651B /* rarvm.hpp */; }; + 9699FA511B3CBB1400B6D373 /* rawread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5518DB722E00B5651B /* rawread.hpp */; }; + 9699FA521B3CBB1400B6D373 /* rdwrfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5718DB722E00B5651B /* rdwrfn.hpp */; }; + 9699FA531B3CBB1400B6D373 /* recvol.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5A18DB722E00B5651B /* recvol.hpp */; }; + 9699FA541B3CBB1400B6D373 /* resource.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5C18DB722E00B5651B /* resource.hpp */; }; + 9699FA551B3CBB1400B6D373 /* rijndael.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F5E18DB722E00B5651B /* rijndael.hpp */; }; + 9699FA561B3CBB1400B6D373 /* rs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6018DB722E00B5651B /* rs.hpp */; }; + 9699FA571B3CBB1400B6D373 /* savepos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6218DB722E00B5651B /* savepos.hpp */; }; + 9699FA581B3CBB1400B6D373 /* scantree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6418DB722E00B5651B /* scantree.hpp */; }; + 9699FA591B3CBB1400B6D373 /* secpassword.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6618DB722E00B5651B /* secpassword.hpp */; }; + 9699FA5A1B3CBB1400B6D373 /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6818DB722E00B5651B /* sha1.hpp */; }; + 9699FA5B1B3CBB1400B6D373 /* smallfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6A18DB722E00B5651B /* smallfn.hpp */; }; + 9699FA5C1B3CBB1400B6D373 /* strfn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6C18DB722E00B5651B /* strfn.hpp */; }; + 9699FA5D1B3CBB1400B6D373 /* strlist.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F6E18DB722E00B5651B /* strlist.hpp */; }; + 9699FA5E1B3CBB1400B6D373 /* suballoc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7018DB722E00B5651B /* suballoc.hpp */; }; + 9699FA5F1B3CBB1400B6D373 /* system.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7218DB722E00B5651B /* system.hpp */; }; + 9699FA601B3CBB1400B6D373 /* timefn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7418DB722E00B5651B /* timefn.hpp */; }; + 9699FA611B3CBB1400B6D373 /* ulinks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7618DB722E00B5651B /* ulinks.hpp */; }; + 9699FA621B3CBB1400B6D373 /* unicode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7818DB722E00B5651B /* unicode.hpp */; }; + 9699FA631B3CBB1400B6D373 /* unpack.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F7B18DB722E00B5651B /* unpack.hpp */; }; + 9699FA641B3CBB1400B6D373 /* version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8118DB722F00B5651B /* version.hpp */; }; + 9699FA651B3CBB1400B6D373 /* volume.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 96853F8318DB722F00B5651B /* volume.hpp */; }; 9699FA691B3CBD1000B6D373 /* UnrarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9699F9DA1B3CB83100B6D373 /* UnrarKit.framework */; }; 9699FA6A1B3CE95D00B6D373 /* UnrarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96EA535B1B3CB04300F79DC6 /* UnrarKit.framework */; }; 9699FA891B3D9B5700B6D373 /* URKArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 964C8AC818D28EE000AD7321 /* URKArchiveTests.m */; }; @@ -785,6 +785,8 @@ 9699FA2A1B3CBB1400B6D373 /* URKArchive.h in Headers */, 9699FA2B1B3CBB1400B6D373 /* URKFileInfo.h in Headers */, 9699FA2C1B3CBB1400B6D373 /* UnrarKit.h in Headers */, + 9699FA351B3CBB1400B6D373 /* dll.hpp in Headers */, + 9699FA4E1B3CBB1400B6D373 /* raros.hpp in Headers */, 9699FA2D1B3CBB1400B6D373 /* archive.hpp in Headers */, 9699FA2E1B3CBB1400B6D373 /* array.hpp in Headers */, 9699FA2F1B3CBB1400B6D373 /* cmddata.hpp in Headers */, @@ -793,7 +795,6 @@ 9699FA321B3CBB1400B6D373 /* consio.hpp in Headers */, 9699FA331B3CBB1400B6D373 /* crc.hpp in Headers */, 9699FA341B3CBB1400B6D373 /* crypt.hpp in Headers */, - 9699FA351B3CBB1400B6D373 /* dll.hpp in Headers */, 9699FA361B3CBB1400B6D373 /* encname.hpp in Headers */, 9699FA371B3CBB1400B6D373 /* errhnd.hpp in Headers */, 9699FA381B3CBB1400B6D373 /* extinfo.hpp in Headers */, @@ -818,7 +819,6 @@ 9699FA4B1B3CBB1400B6D373 /* rar.hpp in Headers */, 9699FA4C1B3CBB1400B6D373 /* rardefs.hpp in Headers */, 9699FA4D1B3CBB1400B6D373 /* rarlang.hpp in Headers */, - 9699FA4E1B3CBB1400B6D373 /* raros.hpp in Headers */, 9699FA4F1B3CBB1400B6D373 /* rartypes.hpp in Headers */, 9699FA501B3CBB1400B6D373 /* rarvm.hpp in Headers */, 9699FA511B3CBB1400B6D373 /* rawread.hpp in Headers */, @@ -852,6 +852,8 @@ 9699F91D1B3CB4D000B6D373 /* URKArchive.h in Headers */, 9699F91E1B3CB4D000B6D373 /* URKFileInfo.h in Headers */, 9699F91F1B3CB4D000B6D373 /* UnrarKit.h in Headers */, + 9699F9281B3CB4D000B6D373 /* dll.hpp in Headers */, + 9699F9411B3CB4D000B6D373 /* raros.hpp in Headers */, 9699F9201B3CB4D000B6D373 /* archive.hpp in Headers */, 9699F9211B3CB4D000B6D373 /* array.hpp in Headers */, 9699F9221B3CB4D000B6D373 /* cmddata.hpp in Headers */, @@ -860,7 +862,6 @@ 9699F9251B3CB4D000B6D373 /* consio.hpp in Headers */, 9699F9261B3CB4D000B6D373 /* crc.hpp in Headers */, 9699F9271B3CB4D000B6D373 /* crypt.hpp in Headers */, - 9699F9281B3CB4D000B6D373 /* dll.hpp in Headers */, 9699F9291B3CB4D000B6D373 /* encname.hpp in Headers */, 9699F92A1B3CB4D000B6D373 /* errhnd.hpp in Headers */, 9699F92B1B3CB4D000B6D373 /* extinfo.hpp in Headers */, @@ -885,7 +886,6 @@ 9699F93E1B3CB4D000B6D373 /* rar.hpp in Headers */, 9699F93F1B3CB4D000B6D373 /* rardefs.hpp in Headers */, 9699F9401B3CB4D000B6D373 /* rarlang.hpp in Headers */, - 9699F9411B3CB4D000B6D373 /* raros.hpp in Headers */, 9699F9421B3CB4D000B6D373 /* rartypes.hpp in Headers */, 9699F9431B3CB4D000B6D373 /* rarvm.hpp in Headers */, 9699F9441B3CB4D000B6D373 /* rawread.hpp in Headers */, From 0685ec284b75d8ec7facdf492f643751f7aca5bc Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Fri, 6 Nov 2015 08:54:51 -0500 Subject: [PATCH 35/38] Switched build to Xcode 7.1, removed Mavericks build since only 10.11 (ElCap) is supported by that build image --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6be7005..9073c3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: beta-xcode6.3 +osx_image: xcode7.1 before_install: - brew update - brew install carthage --HEAD @@ -17,10 +17,6 @@ matrix: xcode_sdk: iphonesimulator env: NAME=iOSTests - - xcode_scheme: UnrarKit - xcode_sdk: macosx10.9 - env: NAME=Mavericks - - xcode_scheme: UnrarExample xcode_sdk: iphonesimulator env: NAME=ExampleAppBuild From cecc3ee1550d7795c42f68dd35685329169c75dc Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Fri, 6 Nov 2015 09:09:50 -0500 Subject: [PATCH 36/38] Removed '--HEAD' from Carthage update, since the changes I need have been released --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fb07e71..6290a04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ osx_image: xcode7.1 before_install: - brew update - - brew install carthage --HEAD + - brew install carthage - brew upgrade xctool xcode_workspace: UnrarKit.xcworkspace From 3b4a6cb5d0e7339ae2f48a215003ec22d033f0d7 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Fri, 6 Nov 2015 09:26:57 -0500 Subject: [PATCH 37/38] Removed Framework Search Paths from iOS Test Target --- UnrarKit.xcodeproj/project.pbxproj | 8 -------- 1 file changed, 8 deletions(-) diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index 847d289..c8228f2 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -1688,10 +1688,6 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1734,10 +1730,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; From 162eabc68a31301f214f4ed531efb40ded365e48 Mon Sep 17 00:00:00 2001 From: Dov Frankel Date: Fri, 6 Nov 2015 09:38:31 -0500 Subject: [PATCH 38/38] Defining TARGET_OS_IPHONE for the iOS unit test bundle, so that UnrarKit includes the correct framework (UIKit instead of Cocoa) --- Tests/URKArchiveTestCase.h | 4 ++-- UnrarKit.xcodeproj/project.pbxproj | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Tests/URKArchiveTestCase.h b/Tests/URKArchiveTestCase.h index ca166d1..49a4113 100644 --- a/Tests/URKArchiveTestCase.h +++ b/Tests/URKArchiveTestCase.h @@ -6,8 +6,8 @@ // // -#import -#import +@import XCTest; +@import UnrarKit; @interface URKArchiveTestCase : XCTestCase diff --git a/UnrarKit.xcodeproj/project.pbxproj b/UnrarKit.xcodeproj/project.pbxproj index c8228f2..d25699e 100644 --- a/UnrarKit.xcodeproj/project.pbxproj +++ b/UnrarKit.xcodeproj/project.pbxproj @@ -1704,6 +1704,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + OTHER_CFLAGS = "-DTARGET_OS_IPHONE"; PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -1740,6 +1741,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + OTHER_CFLAGS = "-DTARGET_OS_IPHONE"; PRODUCT_BUNDLE_IDENTIFIER = "com.abbey-code.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos;