前言:本文是對之前apk增量更新文章的補充內容,單獨拎出來梳理一下bsdiff在mac上的編譯和使用。下面的介紹流程就是我在自己電腦的操作實現步驟。
第一步:下載
下載請點擊:bsdiff/bspatch壓縮包
第二步:編譯
先解壓下載的bsdiff-4.3.tar.gz壓縮包;
再進入bsdiff-4.3目錄,在終端下執行構建用 make 命令;
此時應該會報錯: Makefile:13: *** missing separator. Stop.
這是makefile文件的內容的格式不對,修改Makefile文件,修改後的文件內容如下:
CFLAGS += -O3 -lbz2
PREFIX ?= /usr/local
INSTALL_PROGRAM ?= ${INSTALL} -c -s -m 555
INSTALL_MAN ?= ${INSTALL} -c -m 444
all: bsdiff bspatch
bsdiff: bsdiff.c
bspatch: bspatch.c
install:
${INSTALL_PROGRAM} bsdiff bspatch ${PREFIX}/bin
.ifndef WITHOUT_MAN
${INSTALL_MAN} bsdiff.1 bspatch.1 ${PREFIX}/man/man1
.endif
即在 .ifndef WITHOUT_MAN、 .endi語句前面加TAB鍵進行縮進。
然後再執行make,此時又報錯:
bspatch.c:39:21: error: unknown type name 'u_char'; did you mean 'char'?
static off_t offtin(u_char *buf)
^~~~~~
char
bspatch.c:65:8: error: expected ';' after expression
u_char header[32],buf[8];
^
;
bspatch.c:65:2: error: use of undeclared identifier 'u_char'; did you mean 'putchar'?
u_char header[32],buf[8];
^~~~~~
putchar
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/stdio.h:261:6: note:
'putchar' declared here
int putchar(int);
^
bspatch.c:65:9: error: use of undeclared identifier 'header'
u_char header[32],buf[8];
^
bspatch.c:65:20: error: use of undeclared identifier 'buf'
u_char header[32],buf[8];
^
bspatch.c:66:2: error: use of undeclared identifier 'u_char'; did you mean 'putchar'?
u_char *old, *new;
^~~~~~
putchar
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/stdio.h:261:6: note:
'putchar' declared here
int putchar(int);
^
bspatch.c:66:10: error: use of undeclared identifier 'old'
u_char *old, *new;
^
bspatch.c:66:16: error: use of undeclared identifier 'new'
u_char *old, *new;
^
bspatch.c:93:12: error: use of undeclared identifier 'header'
if (fread(header, 1, 32, f) < 32) {
^
bspatch.c:100:13: error: use of undeclared identifier 'header'
if (memcmp(header, "BSDIFF40", 8) != 0)
^
bspatch.c:104:19: error: use of undeclared identifier 'header'
bzctrllen=offtin(header+8);
^
bspatch.c:105:19: error: use of undeclared identifier 'header'
bzdatalen=offtin(header+16);
^
bspatch.c:106:17: error: use of undeclared identifier 'header'
newsize=offtin(header+24);
^
bspatch.c:137:5: error: use of undeclared identifier 'old'
((old=malloc(oldsize+1))==NULL) ||
^
bspatch.c:139:12: error: use of undeclared identifier 'old'
(read(fd,old,oldsize)!=oldsize) ||
^
bspatch.c:141:6: error: use of undeclared identifier 'new'
if((new=malloc(newsize+1))==NULL) err(1,NULL);
^
bspatch.c:147:43: error: use of undeclared identifier 'buf'
lenread = BZ2_bzRead(&cbz2err, cpfbz2, buf, 8);
^
bspatch.c:151:19: error: use of undeclared identifier 'buf'
ctrl[i]=offtin(buf);
^
bspatch.c:159:42: error: use of undeclared identifier 'new'
lenread = BZ2_bzRead(&dbz2err, dpfbz2, new + newpos, ctrl[0]);
^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
errors generated.
make: *** [bspatch] Error 1
解決辦法是在 bspatch.c 文件中加入 #include <sys/types.h> 。
然後再執行make命令,此時命令執行成功,會在當前目錄下生成bsdiff,bspatch文件。
接下來簡單介紹一下bsdiff、bspatch命令的使用。
bsdiff:生成差異文件,常用於服務端生成差異包。
命令:bsdiff oldfile newfile patchfile
oldfile: 舊的文件;
newfile:新的文件;
patchfile:生成的差異文件。
bspatch:合併文件,常用於客戶端根據差異包合併生成新的文件。
命令:bspatch oldfile newfile2 patchfile
oldfile:舊的文件;
newfile2:生成的新的文件;
patchfile:差異文件;
最後舉個例子,測試一下使用bsdiff進行增量更新。
命令 :./bsdiff old.apk new.apk old-new.patch
命令 :./bspatch old.apk new2.apk old-new.patch
命令:md5 new.apk
得到:MD5 (new.apk) = fc8bdb15f80abef22eb25f9601063cf0
命令:md5 new2.apk
得到:MD5 (new2.apk) = fc8bdb15f80abef22eb25f9601063cf0
會發現此時new.apk和new2.apk的md5值是一致的,證明差分包的生成和合並過程是沒問題的。