ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4320 from sebres/patch-1

Browse Source 
build_package.bat: fix path to zstd_errors.h, avoid silently ignore of the errors if build failed
This commit is contained in:
Yann Collet
2025-02-26 15:15:03 -08:00
committed by GitHub
parent 0ac659fb00 4d81b0000d
commit d6fbaaac99
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/windows-artifacts.yml
+1 -1
View File
@@ -46,7 +46,7 @@ jobs:
- name: Create artifacts - name: Create artifacts
run: | run: |
./lib/dll/example/build_package.bat ./lib/dll/example/build_package.bat || exit 1
mv bin/ zstd-${{ github.ref_name }}-${{matrix.ziparch}}/ mv bin/ zstd-${{ github.ref_name }}-${{matrix.ziparch}}/
7z a -tzip -mx9 zstd-${{ github.ref_name }}-${{matrix.ziparch}}.zip zstd-${{ github.ref_name }}-${{matrix.ziparch}}/ 7z a -tzip -mx9 zstd-${{ github.ref_name }}-${{matrix.ziparch}}.zip zstd-${{ github.ref_name }}-${{matrix.ziparch}}/
cd .. cd ..
lib/dll/example/build_package.bat
+28 -18
View File
@@ -1,20 +1,30 @@
@ECHO OFF @ECHO OFF
MKDIR bin\dll bin\static bin\example bin\include MKDIR bin\dll bin\static bin\example bin\include
COPY tests\fullbench.c bin\example\ SET CpyError=
COPY programs\datagen.c bin\example\ COPY tests\fullbench.c bin\example\ || (SET CpyError=%CpyError% tests\fullbench.c)
COPY programs\datagen.h bin\example\ COPY programs\datagen.c bin\example\ || (SET CpyError=%CpyError% programs\datagen.c)
COPY programs\util.h bin\example\ COPY programs\datagen.h bin\example\ || (SET CpyError=%CpyError% programs\datagen.h)
COPY programs\platform.h bin\example\ COPY programs\util.h bin\example\ || (SET CpyError=%CpyError% programs\util.h)
COPY lib\common\mem.h bin\example\ COPY programs\platform.h bin\example\ || (SET CpyError=%CpyError% programs\platform.h)
COPY lib\common\zstd_internal.h bin\example\ COPY lib\common\mem.h bin\example\ || (SET CpyError=%CpyError% lib\common\mem.h)
COPY lib\common\error_private.h bin\example\ COPY lib\common\zstd_internal.h bin\example\ || (SET CpyError=%CpyError% lib\common\zstd_internal.h)
COPY lib\common\xxhash.h bin\example\ COPY lib\common\error_private.h bin\example\ || (SET CpyError=%CpyError% lib\common\error_private.h)
COPY lib\libzstd.a bin\static\libzstd_static.lib COPY lib\common\xxhash.h bin\example\ || (SET CpyError=%CpyError% lib\common\xxhash.h)
COPY lib\dll\libzstd.* bin\dll\ COPY lib\libzstd.a bin\static\libzstd_static.lib || (SET CpyError=%CpyError% lib\libzstd.a)
COPY lib\dll\example\Makefile bin\example\ COPY lib\dll\libzstd.* bin\dll\ || (SET CpyError=%CpyError% lib\dll\libzstd.*)
COPY lib\dll\example\fullbench-dll.* bin\example\ COPY lib\dll\example\Makefile bin\example\ || (SET CpyError=%CpyError% lib\dll\example\Makefile)
COPY lib\dll\example\README.md bin\ COPY lib\dll\example\fullbench-dll.* bin\example\ || (SET CpyError=%CpyError% lib\dll\example\fullbench)
COPY lib\zstd.h bin\include\ COPY lib\dll\example\README.md bin\ || (SET CpyError=%CpyError% lib\dll\example\README.md)
COPY lib\common\zstd_errors.h bin\include\ COPY lib\zstd.h bin\include\ || (SET CpyError=%CpyError% lib\zstd.h)
COPY lib\dictBuilder\zdict.h bin\include\ COPY lib\zstd_errors.h bin\include\ || (SET CpyError=%CpyError% lib\zstd_errors.h)
COPY programs\zstd.exe bin\zstd.exe COPY lib\dictBuilder\zdict.h bin\include\ || (SET CpyError=%CpyError% lib\dictBuilder\zdict.h)
COPY programs\zstd.exe bin\zstd.exe || (SET CpyError=%CpyError% programs\zstd.exe)
IF "[%CpyError%]" == "[]" goto :EOF
:error
echo Failed with error #%errorlevel%: unable to copy following files:
echo %CpyError%
exit /b %errorlevel%
:EOF