Skip to content

Commit fb544f9

Browse files
sisongsisong
authored
Merge pull request #87 from sisong/dev
support single compressed stream;
2 parents a4dfa55 + fa5f954 commit fb544f9

26 files changed

+142
-667
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
ndk-build:
4040
strategy:
4141
matrix:
42-
platform: [ubuntu-latest, macos-latest, windows-latest]
42+
platform: [macos-latest, windows-latest]
4343
runs-on: ${{ matrix.platform }}
4444
steps:
4545
- uses: actions/checkout@v2
@@ -52,6 +52,21 @@ jobs:
5252
cd ./builds/android_ndk_jni_mk
5353
ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
5454
55+
ubuntu-ndk-build:
56+
runs-on: ubuntu-latest
57+
steps:
58+
- uses: actions/checkout@v2
59+
- uses: nttld/[email protected]
60+
with:
61+
ndk-version: r16b
62+
- name: buildByAndroidNDK
63+
run: |
64+
sudo apt install libncurses5
65+
git submodule update --init --recursive
66+
cd ./builds/android_ndk_jni_mk
67+
ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
68+
69+
5570
vc-build:
5671
runs-on: windows-latest
5772
steps:
@@ -62,4 +77,4 @@ jobs:
6277
- name: buildByVC
6378
run: |
6479
git submodule update --init --recursive
65-
msbuild builds/vc2019/ApkDiffPatch.sln -t:rebuild -verbosity:diag -property:Configuration=Release
80+
msbuild builds/vc/ApkDiffPatch.sln -t:rebuild -verbosity:diag -property:Configuration=Release

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ xcshareddata
1414
*.sdf
1515
*.ipch
1616
xcuserdata/
17-
builds/vc2019/Release/
18-
builds/vc2019/x64/
17+
builds/vc/Release/
18+
builds/vc/x64/

‎HDiffPatch‎

Submodule HDiffPatch updated 110 files

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# [ApkDiffPatch]
2-
[![release](https://img.shields.io/badge/release-v1.5.0-blue.svg)](https://github.com/sisong/ApkDiffPatch/releases)
2+
[![release](https://img.shields.io/badge/release-v1.6.0-blue.svg)](https://github.com/sisong/ApkDiffPatch/releases)
33
[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/sisong/ApkDiffPatch/blob/master/LICENSE)
44
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/sisong/ApkDiffPatch/pulls)
55
[![+issue Welcome](https://img.shields.io/github/issues-raw/sisong/ApkDiffPatch?color=green&label=%2Bissue%20welcome)](https://github.com/sisong/ApkDiffPatch/issues)

‎builds/vc/ApkDiffPatch.sln‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31402.337
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApkNormalized", "ApkNormalized.vcxproj", "{B7BA5C32-5DC9-431D-BFD7-35ED679CD797}"
57
EndProject
68
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZipPatch", "ZipPatch.vcxproj", "{69753A53-0320-4AF9-ADE7-A70F0C38358F}"

‎builds/vc/ApkNormalized.vcxproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,37 +43,38 @@
4343
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
4444
<Keyword>ManagedCProj</Keyword>
4545
<RootNamespace>ApkNormalized</RootNamespace>
46+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
4647
</PropertyGroup>
4748
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4849
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4950
<ConfigurationType>Application</ConfigurationType>
5051
<UseDebugLibraries>true</UseDebugLibraries>
5152
<CLRSupport>false</CLRSupport>
5253
<CharacterSet>Unicode</CharacterSet>
53-
<PlatformToolset>v110</PlatformToolset>
54+
<PlatformToolset>v142</PlatformToolset>
5455
</PropertyGroup>
5556
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5657
<ConfigurationType>Application</ConfigurationType>
5758
<UseDebugLibraries>true</UseDebugLibraries>
5859
<CLRSupport>false</CLRSupport>
5960
<CharacterSet>Unicode</CharacterSet>
60-
<PlatformToolset>v110</PlatformToolset>
61+
<PlatformToolset>v142</PlatformToolset>
6162
</PropertyGroup>
6263
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6364
<ConfigurationType>Application</ConfigurationType>
6465
<UseDebugLibraries>false</UseDebugLibraries>
6566
<CLRSupport>false</CLRSupport>
6667
<CharacterSet>Unicode</CharacterSet>
6768
<WholeProgramOptimization>true</WholeProgramOptimization>
68-
<PlatformToolset>v110</PlatformToolset>
69+
<PlatformToolset>v142</PlatformToolset>
6970
</PropertyGroup>
7071
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7172
<ConfigurationType>Application</ConfigurationType>
7273
<UseDebugLibraries>false</UseDebugLibraries>
7374
<CLRSupport>false</CLRSupport>
7475
<CharacterSet>Unicode</CharacterSet>
7576
<WholeProgramOptimization>true</WholeProgramOptimization>
76-
<PlatformToolset>v110</PlatformToolset>
77+
<PlatformToolset>v142</PlatformToolset>
7778
</PropertyGroup>
7879
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7980
<ImportGroup Label="ExtensionSettings">

‎builds/vc/ApkNormalized.vcxproj.user‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎builds/vc/ZipDiff.vcxproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
7373
<Keyword>ManagedCProj</Keyword>
7474
<RootNamespace>ZipDiff</RootNamespace>
75+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
7576
</PropertyGroup>
7677
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
7778
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -80,31 +81,31 @@
8081
<CLRSupport>false</CLRSupport>
8182
<CharacterSet>Unicode</CharacterSet>
8283
<WholeProgramOptimization>false</WholeProgramOptimization>
83-
<PlatformToolset>v110</PlatformToolset>
84+
<PlatformToolset>v142</PlatformToolset>
8485
</PropertyGroup>
8586
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
8687
<ConfigurationType>Application</ConfigurationType>
8788
<UseDebugLibraries>true</UseDebugLibraries>
8889
<CLRSupport>false</CLRSupport>
8990
<CharacterSet>Unicode</CharacterSet>
9091
<WholeProgramOptimization>false</WholeProgramOptimization>
91-
<PlatformToolset>v110</PlatformToolset>
92+
<PlatformToolset>v142</PlatformToolset>
9293
</PropertyGroup>
9394
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
9495
<ConfigurationType>Application</ConfigurationType>
9596
<UseDebugLibraries>false</UseDebugLibraries>
9697
<CLRSupport>false</CLRSupport>
9798
<CharacterSet>Unicode</CharacterSet>
9899
<WholeProgramOptimization>true</WholeProgramOptimization>
99-
<PlatformToolset>v110</PlatformToolset>
100+
<PlatformToolset>v142</PlatformToolset>
100101
</PropertyGroup>
101102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
102103
<ConfigurationType>Application</ConfigurationType>
103104
<UseDebugLibraries>false</UseDebugLibraries>
104105
<CLRSupport>false</CLRSupport>
105106
<CharacterSet>Unicode</CharacterSet>
106107
<WholeProgramOptimization>true</WholeProgramOptimization>
107-
<PlatformToolset>v110</PlatformToolset>
108+
<PlatformToolset>v142</PlatformToolset>
108109
</PropertyGroup>
109110
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
110111
<ImportGroup Label="ExtensionSettings">

‎builds/vc/ZipDiff.vcxproj.user‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎builds/vc/ZipPatch.vcxproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,37 +48,38 @@
4848
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
4949
<Keyword>ManagedCProj</Keyword>
5050
<RootNamespace>ZipPatch</RootNamespace>
51+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
5152
</PropertyGroup>
5253
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
5354
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5455
<ConfigurationType>Application</ConfigurationType>
5556
<UseDebugLibraries>true</UseDebugLibraries>
5657
<CLRSupport>false</CLRSupport>
5758
<CharacterSet>Unicode</CharacterSet>
58-
<PlatformToolset>v110</PlatformToolset>
59+
<PlatformToolset>v142</PlatformToolset>
5960
</PropertyGroup>
6061
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6162
<ConfigurationType>Application</ConfigurationType>
6263
<UseDebugLibraries>true</UseDebugLibraries>
6364
<CLRSupport>false</CLRSupport>
6465
<CharacterSet>Unicode</CharacterSet>
65-
<PlatformToolset>v110</PlatformToolset>
66+
<PlatformToolset>v142</PlatformToolset>
6667
</PropertyGroup>
6768
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6869
<ConfigurationType>Application</ConfigurationType>
6970
<UseDebugLibraries>false</UseDebugLibraries>
7071
<CLRSupport>false</CLRSupport>
7172
<CharacterSet>Unicode</CharacterSet>
7273
<WholeProgramOptimization>true</WholeProgramOptimization>
73-
<PlatformToolset>v110</PlatformToolset>
74+
<PlatformToolset>v142</PlatformToolset>
7475
</PropertyGroup>
7576
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7677
<ConfigurationType>Application</ConfigurationType>
7778
<UseDebugLibraries>false</UseDebugLibraries>
7879
<CLRSupport>false</CLRSupport>
7980
<CharacterSet>Unicode</CharacterSet>
8081
<WholeProgramOptimization>true</WholeProgramOptimization>
81-
<PlatformToolset>v110</PlatformToolset>
82+
<PlatformToolset>v142</PlatformToolset>
8283
</PropertyGroup>
8384
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8485
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)