CI: fix make & ndk & vc;

sisong · Dec 26, 2024 · 47cbf45 · 47cbf45
1 parent 7ca43da
commit 47cbf45
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,56 +1,52 @@
 name: ci
 on: [push, pull_request]
 jobs:
-  make-build:
+  gcc-build:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
-      - name: makeInit
+      - name: make_slef
         run: |
-          make LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
+          make CC=gcc CXX=g++ BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
           make clean
-      - name: makeNoAll
+      - name: make_0
+        run: |
+          make CC=gcc CXX=g++ DIR_DIFF=0 MT=0 VCD=0 ZLIB=0 BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
+          make clean
+      - name: make_all
         run: |
           git clone --depth=1 https://github.com/sisong/libmd5.git ../libmd5
           git clone --depth=1 https://github.com/sisong/lzma.git ../lzma
           git clone --depth=1 https://github.com/sisong/zstd.git ../zstd
-          make DIR_DIFF=0 MT=0 BSD=0 VCD=0 ZLIB=0 LDEF=0 BZIP2=0 -j
-          make clean
-      - name: makeNoldef
-        run: |
-          make LDEF=0 -j
-          make clean
-      - name: makeAll
-        run: |
+          git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
           git clone --depth=1 https://github.com/sisong/zlib.git ../zlib
           git clone --depth=1 https://github.com/sisong/libdeflate.git ../libdeflate
-          make -j
-          make clean
-      - name: makeByBz2Code
-        run: |
-          git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
-          make BZIP2=1 -j
+          make CC=gcc CXX=g++ BZIP2=1 -j
+          make BZIP2=1 clean
 
   clang-build:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
-      - name: installClang
+      - name: make_slefByClang
         run: |
-          sudo apt-get install -y llvm clang
-      - name: initAndClone
+          make CL=1 BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
+          make clean
+      - name: make_allByClang
         run: |
           git clone --depth=1 https://github.com/sisong/libmd5.git ../libmd5
           git clone --depth=1 https://github.com/sisong/lzma.git ../lzma
           git clone --depth=1 https://github.com/sisong/zstd.git ../zstd
+          git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
           git clone --depth=1 https://github.com/sisong/zlib.git ../zlib
           git clone --depth=1 https://github.com/sisong/libdeflate.git ../libdeflate
-      - name: makeByClang
-        run: |
-          make CL=1 -j
+          make CL=1 BZIP2=1 -j
 
   xcode-build:
     runs-on: macos-latest
@@ -107,7 +103,10 @@ jobs:
           ndk-version: r16b
       - name: buildByAndroidNDK
         run: |
-          sudo apt install libncurses5
+          curl -O http://launchpadlibrarian.net/648013231/libtinfo5_6.4-2_amd64.deb
+          sudo dpkg -i libtinfo5_6.4-2_amd64.deb
+          curl -O http://launchpadlibrarian.net/648013227/libncurses5_6.4-2_amd64.deb
+          sudo dpkg -i libncurses5_6.4-2_amd64.deb
           git clone --depth=1 https://github.com/sisong/lzma.git ../lzma
           git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
           git clone --depth=1 https://github.com/sisong/zstd.git ../zstd
@@ -118,7 +117,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: microsoft/setup-msbuild@v1.1
+      - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
       - name: initAndClone

diff --git a/builds/vc/HDiffZ.vcxproj b/builds/vc/HDiffZ.vcxproj
@@ -39,7 +39,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>hdiffz</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/builds/vc/HPatchZ.vcxproj b/builds/vc/HPatchZ.vcxproj
@@ -39,7 +39,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>hpatchz</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/builds/vc/bzip2.vcxproj b/builds/vc/bzip2.vcxproj
@@ -39,7 +39,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>bzip2</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/builds/vc/libdeflate.vcxproj b/builds/vc/libdeflate.vcxproj
@@ -57,7 +57,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{4ffa1879-e1a6-4b99-b9d1-3265f48dae0d}</ProjectGuid>
     <RootNamespace>libdeflate</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/builds/vc/lzma.vcxproj b/builds/vc/lzma.vcxproj
@@ -39,7 +39,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>lzma</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/builds/vc/testHashClash.vcxproj b/builds/vc/testHashClash.vcxproj
@@ -39,7 +39,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{22873560-bda7-4915-8c7d-df7c380b4e55}</ProjectGuid>
     <RootNamespace>testHashClash</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/builds/vc/unitTest.vcxproj b/builds/vc/unitTest.vcxproj
@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{EF32F56D-E3CF-4D51-BCCC-9184E13ED0AD}</ProjectGuid>
     <RootNamespace>unitTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/builds/vc/zlib.vcxproj b/builds/vc/zlib.vcxproj
@@ -39,7 +39,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>zlib</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/builds/vc/zstd.vcxproj b/builds/vc/zstd.vcxproj
@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{16415855-B9F4-4A5D-A096-C3380CFC6008}</ProjectGuid>
     <RootNamespace>zstd</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h b/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h
@@ -30,6 +30,7 @@
 #define bloom_filter_h
 #include <string.h> //memset
 #include <assert.h>
+#include <stdint.h> //uint32_t
 #include <stdexcept>//std::runtime_error
 #include "../../../../libParallel/parallel_channel.h"
 #if (_IS_USED_MULTITHREAD)