Skip to content

Commit

Permalink
iOS static lib test link to app ok;
Browse files Browse the repository at this point in the history
  • Loading branch information
@sisong
sisong committed Aug 26, 2023
1 parent 344ed80 commit c61dbab
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 19 deletions.
2 changes: 1 addition & 1 deletion ...de_iOS_hpatchz/hpatch_objc/hpatch_objc.mm → ...ode_iOS_hpatchz/hpatch_objc/hpatch_objc.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ + (int)patchWithOld:(NSString *)oldFileName
withDiff:(NSString *)diffFileName
toNew:(NSString *)outNewFileName
{
return [self patchWithOld:oldFileName withDiff:diffFileName toNew:outNewFileName byMemory:-1];
return [hpatcher patchWithOld:oldFileName withDiff:diffFileName toNew:outNewFileName byMemory:-1];
}

+ (int)patchWithOld:(NSString *)oldFileName
Expand Down
46 changes: 28 additions & 18 deletions builds/xcode_iOS_hpatchz/hpatchz.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
objects = {

/* Begin PBXBuildFile section */
0D29812D2A984AC300B5F9D9 /* hpatch_objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0D29812C2A984AC300B5F9D9 /* hpatch_objc.mm */; };
0D225B692A99D1A200DBD5B1 /* adler_roll.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D225B682A99D1A200DBD5B1 /* adler_roll.c */; };
0D225B6A2A99D1A200DBD5B1 /* adler_roll.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D225B682A99D1A200DBD5B1 /* adler_roll.c */; };
0D225B6C2A99D62600DBD5B1 /* Sha256Opt.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D225B6B2A99D62600DBD5B1 /* Sha256Opt.c */; };
0D225B6D2A99D62600DBD5B1 /* Sha256Opt.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D225B6B2A99D62600DBD5B1 /* Sha256Opt.c */; };
0D225B6F2A99D6C800DBD5B1 /* Alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D225B6E2A99D6C800DBD5B1 /* Alloc.c */; };
0D225B702A99D6C800DBD5B1 /* Alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D225B6E2A99D6C800DBD5B1 /* Alloc.c */; };
0D29812D2A984AC300B5F9D9 /* hpatch_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D29812C2A984AC300B5F9D9 /* hpatch_objc.m */; };
0D29812E2A984AC300B5F9D9 /* hpatch_objc.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 0D29812B2A984AC300B5F9D9 /* hpatch_objc.h */; };
0D2981372A984B6700B5F9D9 /* hpatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D2981352A984B6700B5F9D9 /* hpatch.c */; };
0D29813A2A984BEA00B5F9D9 /* patch.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D2981392A984BEA00B5F9D9 /* patch.c */; };
Expand Down Expand Up @@ -39,8 +45,6 @@
0D9B72122A9897FF00B06C94 /* zstd_ddict.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B720E2A9897FF00B06C94 /* zstd_ddict.c */; };
0D9B72132A9897FF00B06C94 /* huf_decompress.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B720F2A9897FF00B06C94 /* huf_decompress.c */; };
0D9B72142A9897FF00B06C94 /* zstd_decompress_block.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B72102A9897FF00B06C94 /* zstd_decompress_block.c */; };
0D9B72172A989CA100B06C94 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D9B72162A989CA100B06C94 /* libz.tbd */; };
0D9B72192A989CAD00B06C94 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D9B72182A989CAD00B06C94 /* libbz2.tbd */; };
0D9B72462A98D17B00B06C94 /* Bra.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B71E32A98911400B06C94 /* Bra.c */; };
0D9B72472A98D17B00B06C94 /* zstd_ddict.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B720E2A9897FF00B06C94 /* zstd_ddict.c */; };
0D9B72482A98D17B00B06C94 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B72062A9897DA00B06C94 /* debug.c */; };
Expand All @@ -54,7 +58,7 @@
0D9B72502A98D17B00B06C94 /* patch.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D2981392A984BEA00B5F9D9 /* patch.c */; };
0D9B72512A98D17B00B06C94 /* zstd_decompress_block.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B72102A9897FF00B06C94 /* zstd_decompress_block.c */; };
0D9B72522A98D17B00B06C94 /* LzmaDec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B71E12A98911400B06C94 /* LzmaDec.c */; };
0D9B72532A98D17B00B06C94 /* hpatch_objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0D29812C2A984AC300B5F9D9 /* hpatch_objc.mm */; };
0D9B72532A98D17B00B06C94 /* hpatch_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D29812C2A984AC300B5F9D9 /* hpatch_objc.m */; };
0D9B72542A98D17B00B06C94 /* hpatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D2981352A984B6700B5F9D9 /* hpatch.c */; };
0D9B72552A98D17B00B06C94 /* Bra86.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B71DF2A98911400B06C94 /* Bra86.c */; };
0D9B72562A98D17B00B06C94 /* Lzma2Dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B71E02A98911400B06C94 /* Lzma2Dec.c */; };
Expand All @@ -71,8 +75,6 @@
0D9B72612A98D17B00B06C94 /* zstd_decompress.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B720D2A9897FF00B06C94 /* zstd_decompress.c */; };
0D9B72622A98D17B00B06C94 /* zstd_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B72052A9897DA00B06C94 /* zstd_common.c */; };
0D9B72632A98D17B00B06C94 /* BraIA64.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B71EC2A98915D00B06C94 /* BraIA64.c */; };
0D9B72652A98D17B00B06C94 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D9B72182A989CAD00B06C94 /* libbz2.tbd */; };
0D9B72662A98D17B00B06C94 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D9B72162A989CA100B06C94 /* libz.tbd */; };
0D9B726F2A98D17B00B06C94 /* LzmaDecOpt.S in Sources */ = {isa = PBXBuildFile; fileRef = 0D9B726E2A98D17B00B06C94 /* LzmaDecOpt.S */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -102,9 +104,12 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0D225B682A99D1A200DBD5B1 /* adler_roll.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = adler_roll.c; path = ../../libHDiffPatch/HDiff/private_diff/limit_mem_diff/adler_roll.c; sourceTree = "<group>"; };
0D225B6B2A99D62600DBD5B1 /* Sha256Opt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sha256Opt.c; path = ../../../lzma/C/Sha256Opt.c; sourceTree = "<group>"; };
0D225B6E2A99D6C800DBD5B1 /* Alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Alloc.c; path = ../../../lzma/C/Alloc.c; sourceTree = "<group>"; };
0D2981282A984AC300B5F9D9 /* libhpatchz.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhpatchz.a; sourceTree = BUILT_PRODUCTS_DIR; };
0D29812B2A984AC300B5F9D9 /* hpatch_objc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hpatch_objc.h; sourceTree = "<group>"; };
0D29812C2A984AC300B5F9D9 /* hpatch_objc.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = hpatch_objc.mm; sourceTree = "<group>"; };
0D29812C2A984AC300B5F9D9 /* hpatch_objc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = hpatch_objc.m; sourceTree = "<group>"; };
0D2981352A984B6700B5F9D9 /* hpatch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hpatch.c; path = ../android_ndk_jni_mk/hpatch.c; sourceTree = "<group>"; };
0D2981362A984B6700B5F9D9 /* hpatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hpatch.h; path = ../android_ndk_jni_mk/hpatch.h; sourceTree = "<group>"; };
0D2981392A984BEA00B5F9D9 /* patch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = patch.c; path = ../../libHDiffPatch/HPatch/patch.c; sourceTree = "<group>"; };
Expand Down Expand Up @@ -135,8 +140,6 @@
0D9B720E2A9897FF00B06C94 /* zstd_ddict.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zstd_ddict.c; path = ../../../zstd/lib/decompress/zstd_ddict.c; sourceTree = "<group>"; };
0D9B720F2A9897FF00B06C94 /* huf_decompress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = huf_decompress.c; path = ../../../zstd/lib/decompress/huf_decompress.c; sourceTree = "<group>"; };
0D9B72102A9897FF00B06C94 /* zstd_decompress_block.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zstd_decompress_block.c; path = ../../../zstd/lib/decompress/zstd_decompress_block.c; sourceTree = "<group>"; };
0D9B72162A989CA100B06C94 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
0D9B72182A989CAD00B06C94 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk/usr/lib/libbz2.tbd; sourceTree = DEVELOPER_DIR; };
0D9B726D2A98D17B00B06C94 /* libhpatchz_arm64.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhpatchz_arm64.a; sourceTree = BUILT_PRODUCTS_DIR; };
0D9B726E2A98D17B00B06C94 /* LzmaDecOpt.S */ = {isa = PBXFileReference; explicitFileType = sourcecode.asm.llvm; fileEncoding = 4; name = LzmaDecOpt.S; path = ../../../lzma/Asm/arm64/LzmaDecOpt.S; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -146,17 +149,13 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0D9B72192A989CAD00B06C94 /* libbz2.tbd in Frameworks */,
0D9B72172A989CA100B06C94 /* libz.tbd in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
0D9B72642A98D17B00B06C94 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0D9B72652A98D17B00B06C94 /* libbz2.tbd in Frameworks */,
0D9B72662A98D17B00B06C94 /* libz.tbd in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -189,7 +188,7 @@
isa = PBXGroup;
children = (
0D29812B2A984AC300B5F9D9 /* hpatch_objc.h */,
0D29812C2A984AC300B5F9D9 /* hpatch_objc.mm */,
0D29812C2A984AC300B5F9D9 /* hpatch_objc.m */,
);
path = hpatch_objc;
sourceTree = "<group>";
Expand All @@ -206,6 +205,7 @@
0D2981382A984BC600B5F9D9 /* libHDiffPatch */ = {
isa = PBXGroup;
children = (
0D225B682A99D1A200DBD5B1 /* adler_roll.c */,
0D29813F2A984C4600B5F9D9 /* file_for_patch.c */,
0D29813D2A984C2200B5F9D9 /* vcpatch_wrapper.c */,
0D29813B2A984C0700B5F9D9 /* bspatch_wrapper.c */,
Expand All @@ -217,11 +217,13 @@
0D9B71DE2A98903D00B06C94 /* lzma */ = {
isa = PBXGroup;
children = (
0D225B6E2A99D6C800DBD5B1 /* Alloc.c */,
0D9B726E2A98D17B00B06C94 /* LzmaDecOpt.S */,
0D9B71EC2A98915D00B06C94 /* BraIA64.c */,
0D9B71F22A98915D00B06C94 /* CpuArch.c */,
0D9B71F32A98915D00B06C94 /* Delta.c */,
0D9B71EE2A98915D00B06C94 /* Sha256.c */,
0D225B6B2A99D62600DBD5B1 /* Sha256Opt.c */,
0D9B71F02A98915D00B06C94 /* Xz.c */,
0D9B71EB2A98915D00B06C94 /* XzCrc64.c */,
0D9B71ED2A98915D00B06C94 /* XzCrc64Opt.c */,
Expand Down Expand Up @@ -256,8 +258,6 @@
0D9B72152A989CA100B06C94 /* Frameworks */ = {
isa = PBXGroup;
children = (
0D9B72182A989CAD00B06C94 /* libbz2.tbd */,
0D9B72162A989CA100B06C94 /* libz.tbd */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -345,14 +345,17 @@
0D9B71F72A98915D00B06C94 /* Sha256.c in Sources */,
0D9B71F92A98915D00B06C94 /* Xz.c in Sources */,
0D9B72132A9897FF00B06C94 /* huf_decompress.c in Sources */,
0D225B6C2A99D62600DBD5B1 /* Sha256Opt.c in Sources */,
0D225B6F2A99D6C800DBD5B1 /* Alloc.c in Sources */,
0D9B71FB2A98915D00B06C94 /* CpuArch.c in Sources */,
0D9B71FA2A98915D00B06C94 /* XzDec.c in Sources */,
0D29813A2A984BEA00B5F9D9 /* patch.c in Sources */,
0D9B72142A9897FF00B06C94 /* zstd_decompress_block.c in Sources */,
0D9B71E72A98911400B06C94 /* LzmaDec.c in Sources */,
0D29812D2A984AC300B5F9D9 /* hpatch_objc.mm in Sources */,
0D29812D2A984AC300B5F9D9 /* hpatch_objc.m in Sources */,
0D2981372A984B6700B5F9D9 /* hpatch.c in Sources */,
0D9B71E52A98911400B06C94 /* Bra86.c in Sources */,
0D225B692A99D1A200DBD5B1 /* adler_roll.c in Sources */,
0D9B71E62A98911400B06C94 /* Lzma2Dec.c in Sources */,
0D9B720A2A9897DA00B06C94 /* xxhash.c in Sources */,
0D29813C2A984C0700B5F9D9 /* bspatch_wrapper.c in Sources */,
Expand Down Expand Up @@ -382,18 +385,20 @@
0D9B724B2A98D17B00B06C94 /* Sha256.c in Sources */,
0D9B724C2A98D17B00B06C94 /* Xz.c in Sources */,
0D9B724D2A98D17B00B06C94 /* huf_decompress.c in Sources */,
0D225B6D2A99D62600DBD5B1 /* Sha256Opt.c in Sources */,
0D9B724E2A98D17B00B06C94 /* CpuArch.c in Sources */,
0D9B724F2A98D17B00B06C94 /* XzDec.c in Sources */,
0D9B72502A98D17B00B06C94 /* patch.c in Sources */,
0D9B72512A98D17B00B06C94 /* zstd_decompress_block.c in Sources */,
0D9B72522A98D17B00B06C94 /* LzmaDec.c in Sources */,
0D9B726F2A98D17B00B06C94 /* LzmaDecOpt.S in Sources */,
0D9B72532A98D17B00B06C94 /* hpatch_objc.mm in Sources */,
0D9B72532A98D17B00B06C94 /* hpatch_objc.m in Sources */,
0D9B72542A98D17B00B06C94 /* hpatch.c in Sources */,
0D9B72552A98D17B00B06C94 /* Bra86.c in Sources */,
0D9B72562A98D17B00B06C94 /* Lzma2Dec.c in Sources */,
0D9B72572A98D17B00B06C94 /* xxhash.c in Sources */,
0D9B72582A98D17B00B06C94 /* bspatch_wrapper.c in Sources */,
0D225B702A99D6C800DBD5B1 /* Alloc.c in Sources */,
0D9B72592A98D17B00B06C94 /* entropy_common.c in Sources */,
0D9B725A2A98D17B00B06C94 /* XzCrc64Opt.c in Sources */,
0D9B725B2A98D17B00B06C94 /* Delta.c in Sources */,
Expand All @@ -403,6 +408,7 @@
0D9B725F2A98D17B00B06C94 /* fse_decompress.c in Sources */,
0D9B72602A98D17B00B06C94 /* 7zCrcOpt.c in Sources */,
0D9B72612A98D17B00B06C94 /* zstd_decompress.c in Sources */,
0D225B6A2A99D1A200DBD5B1 /* adler_roll.c in Sources */,
0D9B72622A98D17B00B06C94 /* zstd_common.c in Sources */,
0D9B72632A98D17B00B06C94 /* BraIA64.c in Sources */,
);
Expand Down Expand Up @@ -453,6 +459,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Z7_ST,
USE_CRC_EMU,
ZSTD_STATIC_LINKING_ONLY,
"ZSTD_HAVE_WEAK_SYMBOLS=0",
Expand Down Expand Up @@ -525,6 +532,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
Z7_ST,
USE_CRC_EMU,
ZSTD_STATIC_LINKING_ONLY,
"ZSTD_HAVE_WEAK_SYMBOLS=0",
Expand Down Expand Up @@ -584,6 +592,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Z7_LZMA_DEC_OPT,
Z7_ST,
USE_CRC_EMU,
ZSTD_STATIC_LINKING_ONLY,
"ZSTD_HAVE_WEAK_SYMBOLS=0",
Expand All @@ -606,6 +615,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
Z7_LZMA_DEC_OPT,
Z7_ST,
USE_CRC_EMU,
ZSTD_STATIC_LINKING_ONLY,
"ZSTD_HAVE_WEAK_SYMBOLS=0",
Expand Down

0 comments on commit c61dbab

Please sign in to comment.