Skip to content

Commit 951b9ca

Browse files
sisongsisong
committed
cmdline $hsync_make support create .zsync file by "-zsync" (now unsupport compressed info Z-Map2); ref #41 
1 parent 0d68b1d commit 951b9ca

7 files changed

Lines changed: 177 additions & 41 deletions

File tree

‎HDiffPatch‎

Submodule HDiffPatch updated 26 files

‎Makefile‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ else
7979
HDiffPatch/libhsync/zsync_client_wrapper/zsync_client_wrapper.o \
8080
HDiffPatch/libhsync/zsync_client_wrapper/zsync_info_client.o \
8181
HDiffPatch/libhsync/zsync_client_wrapper/zsync_match_in_old.o
82+
83+
MAKE_OBJ += \
84+
HDiffPatch/libhsync/zsync_make_wrapper/zsync_make_wrapper.o \
85+
HDiffPatch/libhsync/zsync_make_wrapper/zsync_info_make.o
8286
endif
8387

8488
LDEF_PATH := libdeflate
@@ -145,9 +149,9 @@ endif
145149
# https://github.com/sisong/minihttp
146150
HTTP_PATH := minihttp
147151
HTTP_OBJ := $(HTTP_PATH)/minihttp.o
152+
HTTPS_C:= $(HTTP_PATH)/mbedtls/library
148153
ifeq ($(HTTPS),0)
149154
else
150-
HTTPS_C:= $(HTTP_PATH)/mbedtls/library
151155
CLIENT_OBJ+=$(HTTPS_C)/md5.o $(HTTPS_C)/sha256.o $(HTTPS_C)/sha512.o
152156
HTTP_OBJ += $(HTTPS_C)/aes.o $(HTTPS_C)/aesni.o $(HTTPS_C)/arc4.o \
153157
$(HTTPS_C)/asn1parse.o $(HTTPS_C)/asn1write.o $(HTTPS_C)/base64.o \
@@ -159,13 +163,13 @@ else
159163
$(HTTPS_C)/ecp.o $(HTTPS_C)/ecp_curves.o $(HTTPS_C)/entropy.o \
160164
$(HTTPS_C)/entropy_poll.o $(HTTPS_C)/error.o $(HTTPS_C)/gcm.o \
161165
$(HTTPS_C)/havege.o $(HTTPS_C)/hmac_drbg.o $(HTTPS_C)/md.o \
162-
$(HTTPS_C)/md_wrap.o $(HTTPS_C)/md2.o $(HTTPS_C)/md4.o \
166+
$(HTTPS_C)/md_wrap.o \
163167
$(HTTPS_C)/memory_buffer_alloc.o $(HTTPS_C)/net_sockets.o \
164168
$(HTTPS_C)/oid.o $(HTTPS_C)/padlock.o $(HTTPS_C)/pem.o \
165169
$(HTTPS_C)/pk.o $(HTTPS_C)/pk_wrap.o $(HTTPS_C)/pkcs5.o \
166170
$(HTTPS_C)/pkcs11.o $(HTTPS_C)/pkcs12.o $(HTTPS_C)/pkparse.o \
167171
$(HTTPS_C)/pkwrite.o $(HTTPS_C)/platform.o $(HTTPS_C)/ripemd160.o \
168-
$(HTTPS_C)/rsa.o $(HTTPS_C)/rsa_internal.o $(HTTPS_C)/sha1.o \
172+
$(HTTPS_C)/rsa.o $(HTTPS_C)/rsa_internal.o \
169173
$(HTTPS_C)/ssl_cache.o \
170174
$(HTTPS_C)/ssl_ciphersuites.o $(HTTPS_C)/ssl_cli.o $(HTTPS_C)/ssl_cookie.o \
171175
$(HTTPS_C)/ssl_srv.o $(HTTPS_C)/ssl_ticket.o $(HTTPS_C)/ssl_tls.o \
@@ -174,6 +178,10 @@ else
174178
$(HTTPS_C)/x509_crl.o $(HTTPS_C)/x509_crt.o $(HTTPS_C)/x509_csr.o \
175179
$(HTTPS_C)/x509write_crt.o $(HTTPS_C)/x509write_csr.o $(HTTPS_C)/xtea.o
176180
endif
181+
ifeq ($(ZSYNC),0)
182+
else
183+
CLIENT_OBJ+=$(HTTPS_C)/md4.o $(HTTPS_C)/sha1.o
184+
endif
177185

178186
MAKE_OBJ += $(CLIENT_OBJ)
179187

@@ -227,6 +235,11 @@ else
227235
DEF_FLAGS += -I$(HTTP_PATH)/mbedtls/include -DMINIHTTP_USE_MBEDTLS \
228236
-D_ChecksumPlugin_mbedtls_md5 -D_ChecksumPlugin_mbedtls_sha256 -D_ChecksumPlugin_mbedtls_sha512
229237
endif
238+
ifeq ($(ZSYNC),0)
239+
else
240+
DEF_FLAGS += -I$(HTTP_PATH)/mbedtls/include -DMBEDTLS_MD4_C \
241+
-D_ChecksumPlugin_mbedtls_md4 -D_ChecksumPlugin_mbedtls_sha1
242+
endif
230243

231244
ifeq ($(M32),0)
232245
else

‎builds/vc/hsign_diff.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
<ClCompile>
189189
<WarningLevel>Level3</WarningLevel>
190190
<SDLCheck>true</SDLCheck>
191-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
191+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
192192
<ConformanceMode>true</ConformanceMode>
193193
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
194194
</ClCompile>
@@ -216,7 +216,7 @@
216216
<FunctionLevelLinking>true</FunctionLevelLinking>
217217
<IntrinsicFunctions>true</IntrinsicFunctions>
218218
<SDLCheck>true</SDLCheck>
219-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
219+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
220220
<ConformanceMode>true</ConformanceMode>
221221
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
222222
</ClCompile>

‎builds/vc/hsync_make.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@
242242
<ClCompile Include="..\..\HDiffPatch\libhsync\sync_make\match_in_new.cpp" />
243243
<ClCompile Include="..\..\HDiffPatch\libhsync\sync_make\sync_info_make.cpp" />
244244
<ClCompile Include="..\..\HDiffPatch\libhsync\sync_make\sync_make.cpp" />
245+
<ClCompile Include="..\..\HDiffPatch\libhsync\zsync_make_wrapper\zsync_info_make.cpp" />
246+
<ClCompile Include="..\..\HDiffPatch\libhsync\zsync_make_wrapper\zsync_make_wrapper.cpp" />
245247
<ClCompile Include="..\..\hsync_import_patch.cpp" />
246248
<ClCompile Include="..\..\hsync_make.cpp" />
247249
</ItemGroup>

‎builds/xcode/hsync_make.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
0DA686322E20F281002A6651 /* zsync_make_wrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DA6862F2E20F281002A6651 /* zsync_make_wrapper.cpp */; };
11+
0DA686332E20F281002A6651 /* zsync_info_make.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DA686312E20F281002A6651 /* zsync_info_make.cpp */; };
1012
0DD68AB529EFF932000EFD20 /* libMiniHttps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DD68AB429EFF932000EFD20 /* libMiniHttps.a */; };
1113
0DD68B3229F01783000EFD20 /* hsync_import_patch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DD68B3029F01783000EFD20 /* hsync_import_patch.cpp */; };
1214
0DD68B3329F01783000EFD20 /* client_download_demo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DD68B3129F01783000EFD20 /* client_download_demo.cpp */; };
@@ -31,6 +33,10 @@
3133
/* End PBXCopyFilesBuildPhase section */
3234

3335
/* Begin PBXFileReference section */
36+
0DA6862E2E20F281002A6651 /* zsync_info_make.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zsync_info_make.h; path = ../../HDiffPatch/libhsync/zsync_make_wrapper/zsync_info_make.h; sourceTree = "<group>"; };
37+
0DA6862F2E20F281002A6651 /* zsync_make_wrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = zsync_make_wrapper.cpp; path = ../../HDiffPatch/libhsync/zsync_make_wrapper/zsync_make_wrapper.cpp; sourceTree = "<group>"; };
38+
0DA686302E20F281002A6651 /* zsync_make_wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zsync_make_wrapper.h; path = ../../HDiffPatch/libhsync/zsync_make_wrapper/zsync_make_wrapper.h; sourceTree = "<group>"; };
39+
0DA686312E20F281002A6651 /* zsync_info_make.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = zsync_info_make.cpp; path = ../../HDiffPatch/libhsync/zsync_make_wrapper/zsync_info_make.cpp; sourceTree = "<group>"; };
3440
0DD68AB429EFF932000EFD20 /* libMiniHttps.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libMiniHttps.a; sourceTree = BUILT_PRODUCTS_DIR; };
3541
0DD68B3029F01783000EFD20 /* hsync_import_patch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hsync_import_patch.cpp; path = ../../hsync_import_patch.cpp; sourceTree = "<group>"; };
3642
0DD68B3129F01783000EFD20 /* client_download_demo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = client_download_demo.cpp; path = ../../client_download_demo.cpp; sourceTree = "<group>"; };
@@ -64,6 +70,17 @@
6470
/* End PBXFrameworksBuildPhase section */
6571

6672
/* Begin PBXGroup section */
73+
0DA6862D2E20F281002A6651 /* zsync_make_wrapper */ = {
74+
isa = PBXGroup;
75+
children = (
76+
0DA686312E20F281002A6651 /* zsync_info_make.cpp */,
77+
0DA6862E2E20F281002A6651 /* zsync_info_make.h */,
78+
0DA6862F2E20F281002A6651 /* zsync_make_wrapper.cpp */,
79+
0DA686302E20F281002A6651 /* zsync_make_wrapper.h */,
80+
);
81+
name = zsync_make_wrapper;
82+
sourceTree = "<group>";
83+
};
6784
0DD68B3429F0179C000EFD20 /* sync_make */ = {
6885
isa = PBXGroup;
6986
children = (
@@ -96,6 +113,7 @@
96113
D65C6A482330A3C700A3C89C = {
97114
isa = PBXGroup;
98115
children = (
116+
0DA6862D2E20F281002A6651 /* zsync_make_wrapper */,
99117
0DD68B3429F0179C000EFD20 /* sync_make */,
100118
0DD68B3129F01783000EFD20 /* client_download_demo.cpp */,
101119
0DD68B3029F01783000EFD20 /* hsync_import_patch.cpp */,
@@ -173,10 +191,12 @@
173191
0DD68B4329F0179C000EFD20 /* dir_sync_make.cpp in Sources */,
174192
0DD68B4229F0179C000EFD20 /* sync_info_make.cpp in Sources */,
175193
0DD68B4129F0179C000EFD20 /* sync_make.cpp in Sources */,
194+
0DA686322E20F281002A6651 /* zsync_make_wrapper.cpp in Sources */,
176195
D68E3226241BC59A00C1C06F /* hsync_make.cpp in Sources */,
177196
0DD68B4029F0179C000EFD20 /* match_in_new.cpp in Sources */,
178197
0DD68B3229F01783000EFD20 /* hsync_import_patch.cpp in Sources */,
179198
0DD68B3329F01783000EFD20 /* client_download_demo.cpp in Sources */,
199+
0DA686332E20F281002A6651 /* zsync_info_make.cpp in Sources */,
180200
);
181201
runOnlyForDeploymentPostprocessing = 0;
182202
};

0 commit comments

Comments
 (0)