update version & doc;

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 full changelog at: https://github.com/sisong/HDiffPatch/commits   
 
+## [v4.7.0](https://github.com/sisong/HDiffPatch/tree/v4.7.0) - 2024-07-12
+### Added
+* cmdline hdiffz support option "-BSD -SD", to create diffFile compatible with another BSDIFF format "ENDSLEY/BSDIFF43", https://github.com/mendsley/bsdiff ; patch support this format from v4.6.7
+* cmdline hdiffz support option "-neq"; if opened, hdiffz will refuse to created diffFile when oldData==newData.
+### Fixed
+* fixed SFX auto extract logic (SFX executable file is hpatchz file + diffFile)   
+SFX extract with default option `$selfExtractArchive -f ".\" -X ".\"` when diffFile created by directories;   
+if diffFile created by empty oldPath, then extract with default option `$selfExtractArchive -f "" -X ".\"`.   
+
 ## [v4.6.9](https://github.com/sisong/HDiffPatch/tree/v4.6.9) - 2023-12-01
 ### Added
 * cmdline hdiffz & hpatchz support option "-info diffFile", print infos of diffFile;

README.md

@@ -1,5 +1,5 @@
 # [HDiffPatch]
-[![release](https://img.shields.io/badge/release-v4.6.10-blue.svg)](https://github.com/sisong/HDiffPatch/releases) 
+[![release](https://img.shields.io/badge/release-v4.7.0-blue.svg)](https://github.com/sisong/HDiffPatch/releases) 
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/sisong/HDiffPatch/blob/master/LICENSE) 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/sisong/HDiffPatch/pulls)
 [![+issue Welcome](https://img.shields.io/github/issues-raw/sisong/HDiffPatch?color=green&label=%2Bissue%20welcome)](https://github.com/sisong/HDiffPatch/issues)   
@@ -122,6 +122,8 @@ options:
       stepSize>=(1024*4), DEFAULT -SD-256k, recommended 64k,2m etc...
   -BSD
       create diffFile compatible with bsdiff4, unsupport input directory(folder).
+      support run with -SD (not used stepSize), then create single compressed
+      diffFile compatible with endsley/bsdiff (https://github.com/mendsley/bsdiff).
   -VCD[-compressLevel[-dictSize]]
       create diffFile compatible with VCDIFF, unsupport input directory(folder).
       DEFAULT no compress, out format same as $open-vcdiff ... or $xdelta3 -S -e -n ...
@@ -195,6 +197,9 @@ options:
       newManifestFile is created from newPath;
   -D  force run Directory diff between two files; DEFAULT (no -D) run
       directory diff need oldPath or newPath is directory.
+  -neq
+      open check: if newPath & oldPath's all datas are equal, then return error;
+      DEFAULT not check equal.
   -d  Diff only, do't run patch check, DEFAULT run patch check.
   -t  Test only, run patch check, patch(oldPath,testDiffFile)==newPath ?
   -f  Force overwrite, ignore write path already exists;
@@ -215,7 +220,7 @@ uncompress usage: **hpatchz** [options] **"" diffFile outNewPath**
 print  info: **hpatchz** -info **diffFile**   
 create  SFX: **hpatchz** [-X-exe#selfExecuteFile] **diffFile -X#outSelfExtractArchive**   
 run     SFX: **selfExtractArchive** [options] **oldPath -X outNewPath**   
-extract SFX: **selfExtractArchive**   (same as: selfExtractArchive -f "" -X "./")
+extract SFX: **selfExtractArchive**  (same as: $selfExtractArchive -f {""|".\"} -X ".\")
 ```
   if oldPath is empty input parameter ""
 options:
@@ -305,7 +310,7 @@ options:
 * **create_lite_diff()**
 * **hpatch_lite_open()**
 * **hpatch_lite_patch()**
-#### bsdiff wrapper API:
+#### bsdiff4 & endsley/bsdiff wrapper API:
 * **create_bsdiff()**
 * **create_bsdiff_stream()** 
 * **bspatch_with_cache()**

README_cn.md

@@ -1,5 +1,5 @@
 # [HDiffPatch]
-[![release](https://img.shields.io/badge/release-v4.6.10-blue.svg)](https://github.com/sisong/HDiffPatch/releases) 
+[![release](https://img.shields.io/badge/release-v4.7.0-blue.svg)](https://github.com/sisong/HDiffPatch/releases) 
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/sisong/HDiffPatch/blob/master/LICENSE) 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/sisong/HDiffPatch/pulls)
 [![+issue Welcome](https://img.shields.io/github/issues-raw/sisong/HDiffPatch?color=green&label=%2Bissue%20welcome)](https://github.com/sisong/HDiffPatch/issues)   
@@ -122,6 +122,8 @@ $ git clone https://github.com/sisong/bzip2.git  ../bzip2
       压缩步长stepSize>=(1024*4), 默认为256k, 推荐64k,2m等。
   -BSD
       创建一个和bsdiff4兼容的补丁, 不支持参数为文件夹。
+      支持和-SD选项一起运行(不使用其stepSize), 创建单压缩流的补丁文件，
+      兼容endsley/bsdiff格式 (https://github.com/mendsley/bsdiff)。
   -VCD[-compressLevel[-dictSize]]
       创建一个标准规范VCDIFF格式的补丁, 不支持参数为文件夹。
       默认输出补丁不带压缩, 格式和 $open-vcdiff ... 或 $xdelta3 -S -e -n ... 命令输出的补丁格式兼容；
@@ -191,6 +193,9 @@ $ git clone https://github.com/sisong/bzip2.git  ../bzip2
       设置newPath的清单文件newManifestFile;
   -D  强制执行文件夹间的diff, 即使输入的是2个文件; 从而为文件间的补丁添加校验功能。
       默认情况下oldPath或newPath有一个是文件夹时才会执行文件夹间的diff。
+  -neq
+      打开检查: 如果newPath和oldPath的数据都相同，则返回错误；
+      默认不执行该相等检查。
   -d  只执行diff, 不要执行patch检查, 默认会执行patch检查.
   -t  只执行patch检查, 检查是否 patch(oldPath,testDiffFile)==newPath ?
   -f  强制文件写覆盖, 忽略输出的路径是否已经存在;
@@ -213,7 +218,7 @@ $ git clone https://github.com/sisong/bzip2.git  ../bzip2
   (将目标平台的hpatchz可执行文件和补丁包文件合并成一个可执行文件, 称作自释放包SFX)   
 执行一个自释放包： **selfExtractArchive** [options] **oldPath -X outNewPath**   
   (利用自释放包来打补丁,将包中自带的补丁数据应用到oldPath上, 合成outNewPath)   
-执行一个自解压包： **selfExtractArchive**   (等价于： selfExtractArchive -f "" -X "./")
+执行一个自解压包： **selfExtractArchive**  (等价于：$selfExtractArchive -f {""|".\"} -X "./")
 ```
   oldPath可以为空, 输入参数为 ""
 选项:
@@ -301,7 +306,7 @@ $ git clone https://github.com/sisong/bzip2.git  ../bzip2
 * **create_lite_diff()**
 * **hpatch_lite_open()**
 * **hpatch_lite_patch()**
-#### bsdiff 兼容包装 API:
+#### bsdiff4 和 endsley/bsdiff 兼容包装 API:
 * **create_bsdiff()**
 * **create_bsdiff_stream()** 
 * **bspatch_with_cache()**

hdiffz.cpp

@@ -357,7 +357,7 @@ static void printUsage(){
            "      directory diff need oldPath or newPath is directory.\n"
 #endif //_IS_NEED_DIR_DIFF_PATCH
            "  -neq\n"
-           "      open check: if newPach & oldPach's all datas are equal, then return error; \n"
+           "      open check: if newPath & oldPath's all datas are equal, then return error; \n"
            "      DEFAULT not check equal.\n"
            "  -d  Diff only, do't run patch check, DEFAULT run patch check.\n"
            "  -t  Test only, run patch check, patch(oldPath,testDiffFile)==newPath ? \n"

libHDiffPatch/HPatch/patch_types.h

@@ -37,8 +37,8 @@ extern "C" {
 #endif
 
 #define HDIFFPATCH_VERSION_MAJOR    4
-#define HDIFFPATCH_VERSION_MINOR    6
-#define HDIFFPATCH_VERSION_RELEASE  10
+#define HDIFFPATCH_VERSION_MINOR    7
+#define HDIFFPATCH_VERSION_RELEASE  0
 
 #define _HDIFFPATCH_VERSION          HDIFFPATCH_VERSION_MAJOR.HDIFFPATCH_VERSION_MINOR.HDIFFPATCH_VERSION_RELEASE
 #define _HDIFFPATCH_QUOTE(str) #str