From 6f9a9720388c439438dad043763841b881397943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Kn=C3=A1pek?= Date: Wed, 10 Jan 2024 03:44:29 +0100 Subject: [PATCH] ci --- .github/workflows/build_win.bat | 24 +++++++ .github/workflows/workflow1.yml | 22 +++++++ 32-release/build-32-release.bat | 112 ++++++++++++++++---------------- 64-release/build-64-release.bat | 108 +++++++++++++++--------------- 4 files changed, 156 insertions(+), 110 deletions(-) create mode 100644 .github/workflows/build_win.bat create mode 100644 .github/workflows/workflow1.yml diff --git a/.github/workflows/build_win.bat b/.github/workflows/build_win.bat new file mode 100644 index 0000000..a8e5555 --- /dev/null +++ b/.github/workflows/build_win.bat @@ -0,0 +1,24 @@ +@echo on +if "%~1"=="x86" goto x86 +if "%~1"=="x64" goto x64 +goto :eof +:x86 +cd "%~dp0..\.." +git clone https://github.com/madler/zlib.git +cd "%~dp0..\..\32-release" +call "%~dp0..\..\32-release\build-32-release.bat" +copy "%~dp0..\..\32-release\zlib1.dll" "%~dp0..\..\zlib1-x86.dll" +copy "%~dp0..\..\32-release\zlib1.exp" "%~dp0..\..\zlib1-x86.exp" +copy "%~dp0..\..\32-release\zlib1.lib" "%~dp0..\..\zlib1-x86.lib" +copy "%~dp0..\..\32-release\zlib1.pdb" "%~dp0..\..\zlib1-x86.pdb" +goto :eof +:x64 +cd "%~dp0..\.." +git clone https://github.com/madler/zlib.git +cd "%~dp0..\..\64-release" +call "%~dp0..\..\64-release\build-64-release.bat" +copy "%~dp0..\..\64-release\zlib1.dll" "%~dp0..\..\zlib1-x86.dll" +copy "%~dp0..\..\64-release\zlib1.exp" "%~dp0..\..\zlib1-x86.exp" +copy "%~dp0..\..\64-release\zlib1.lib" "%~dp0..\..\zlib1-x86.lib" +copy "%~dp0..\..\64-release\zlib1.pdb" "%~dp0..\..\zlib1-x86.pdb" +goto :eof diff --git a/.github/workflows/workflow1.yml b/.github/workflows/workflow1.yml new file mode 100644 index 0000000..0f212a7 --- /dev/null +++ b/.github/workflows/workflow1.yml @@ -0,0 +1,22 @@ +"on": "push" +"jobs": + "build_win": + "strategy": + "matrix": + "plat": ["x86", "x64"] + "runs-on": "windows-latest" + "steps": + - "uses": "actions/checkout@main" + - "run": "cmd.exe /c .github\\workflows\\build_win.bat ${{matrix.proj}}" + - "uses": "actions/upload-artifact@main" + "with": + "name": "${{matrix.proj}}-${{matrix.conf}}-${{matrix.plat}}.exe" + "path": "${{matrix.proj}}-${{matrix.conf}}-${{matrix.plat}}.exe" + - "uses": "actions/upload-artifact@main" + "with": + "name": "${{matrix.proj}}-${{matrix.conf}}-${{matrix.plat}}.pdb" + "path": "${{matrix.proj}}-${{matrix.conf}}-${{matrix.plat}}.pdb" + - "uses": "actions/upload-artifact@main" + "with": + "name": "${{matrix.proj}}-${{matrix.conf}}-${{matrix.plat}}.txt" + "path": "${{matrix.proj}}-${{matrix.conf}}-${{matrix.plat}}.txt" diff --git a/32-release/build-32-release.bat b/32-release/build-32-release.bat index a14ed48..ab63527 100644 --- a/32-release/build-32-release.bat +++ b/32-release/build-32-release.bat @@ -1,58 +1,58 @@ @echo off -call "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" -rc.exe /nologo /DWIN32 /D_WINDLL "..\..\zlib\win32\zlib1.rc" +call "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" +rc.exe /nologo /DWIN32 /D_WINDLL "..\zlib\win32\zlib1.rc" cl.exe ^ - /nologo ^ - /I"..\..\zlib" ^ - /Zi ^ - /O2 ^ - /Ob2 ^ - /Oy- ^ - /GL ^ - /DWIN32 ^ - /D_WINDLL ^ - /GF ^ - /Gm- ^ - /MT ^ - /GS- ^ - /Gy ^ - /fp:precise ^ - /Zc:wchar_t ^ - /Zc:inline ^ - /Gd ^ - /arch:IA32 ^ - /Fd"zlib1.pdb" ^ - /TC ^ - "..\..\zlib\adler32.c" ^ - "..\..\zlib\compress.c" ^ - "..\..\zlib\crc32.c" ^ - "..\..\zlib\deflate.c" ^ - "..\..\zlib\gzclose.c" ^ - "..\..\zlib\gzlib.c" ^ - "..\..\zlib\gzread.c" ^ - "..\..\zlib\gzwrite.c" ^ - "..\..\zlib\infback.c" ^ - "..\..\zlib\inffast.c" ^ - "..\..\zlib\inflate.c" ^ - "..\..\zlib\inftrees.c" ^ - "..\..\zlib\trees.c" ^ - "..\..\zlib\uncompr.c" ^ - "..\..\zlib\zutil.c" ^ - "..\..\zlib\contrib\minizip\ioapi.c" ^ - "..\..\zlib\contrib\minizip\iowin32.c" ^ - "..\..\zlib\contrib\minizip\unzip.c" ^ - "..\..\zlib\contrib\minizip\zip.c" ^ - /link ^ - /DLL ^ - /OUT:"zlib1.dll" ^ - /IMPLIB:"zlib1.lib" ^ - /DEBUG ^ - /INCREMENTAL:NO ^ - /SUBSYSTEM:WINDOWS ^ - /LTCG ^ - /DYNAMICBASE ^ - /MACHINE:X86 ^ - /SAFESEH ^ - /DEF:"..\..\zlib\win32\zlib.def" ^ - /PDB:"zlib1.pdb" ^ -"..\..\zlib\win32\zlib1.res" +/nologo ^ +/I"..\zlib" ^ +/Zi ^ +/O2 ^ +/Ob2 ^ +/Oy- ^ +/GL ^ +/DWIN32 ^ +/D_WINDLL ^ +/GF ^ +/Gm- ^ +/MT ^ +/GS- ^ +/Gy ^ +/fp:precise ^ +/Zc:wchar_t ^ +/Zc:inline ^ +/Gd ^ +/arch:IA32 ^ +/Fd"zlib1.pdb" ^ +/TC ^ +"..\zlib\adler32.c" ^ +"..\zlib\compress.c" ^ +"..\zlib\crc32.c" ^ +"..\zlib\deflate.c" ^ +"..\zlib\gzclose.c" ^ +"..\zlib\gzlib.c" ^ +"..\zlib\gzread.c" ^ +"..\zlib\gzwrite.c" ^ +"..\zlib\infback.c" ^ +"..\zlib\inffast.c" ^ +"..\zlib\inflate.c" ^ +"..\zlib\inftrees.c" ^ +"..\zlib\trees.c" ^ +"..\zlib\uncompr.c" ^ +"..\zlib\zutil.c" ^ +"..\zlib\contrib\minizip\ioapi.c" ^ +"..\zlib\contrib\minizip\iowin32.c" ^ +"..\zlib\contrib\minizip\unzip.c" ^ +"..\zlib\contrib\minizip\zip.c" ^ +/link ^ +/DLL ^ +/OUT:"zlib1.dll" ^ +/IMPLIB:"zlib1.lib" ^ +/DEBUG ^ +/INCREMENTAL:NO ^ +/SUBSYSTEM:WINDOWS ^ +/LTCG ^ +/DYNAMICBASE ^ +/MACHINE:X86 ^ +/SAFESEH ^ +/DEF:"..\zlib\win32\zlib.def" ^ +/PDB:"zlib1.pdb" ^ +"..\zlib\win32\zlib1.res" diff --git a/64-release/build-64-release.bat b/64-release/build-64-release.bat index 3b68b89..c5ec42d 100644 --- a/64-release/build-64-release.bat +++ b/64-release/build-64-release.bat @@ -1,56 +1,56 @@ @echo off -call "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" -rc.exe /nologo /DWIN32 /D_WINDLL "..\..\zlib\win32\zlib1.rc" +call "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" +rc.exe /nologo /DWIN32 /D_WINDLL "..\zlib\win32\zlib1.rc" cl.exe ^ - /nologo ^ - /I"..\..\zlib" ^ - /Zi ^ - /O2 ^ - /Ob2 ^ - /Oy- ^ - /GL ^ - /DWIN32 ^ - /D_WINDLL ^ - /GF ^ - /Gm- ^ - /MT ^ - /GS- ^ - /Gy ^ - /fp:precise ^ - /Zc:wchar_t ^ - /Zc:inline ^ - /Gd ^ - /Fd"zlib1.pdb" ^ - /TC ^ - "..\..\zlib\adler32.c" ^ - "..\..\zlib\compress.c" ^ - "..\..\zlib\crc32.c" ^ - "..\..\zlib\deflate.c" ^ - "..\..\zlib\gzclose.c" ^ - "..\..\zlib\gzlib.c" ^ - "..\..\zlib\gzread.c" ^ - "..\..\zlib\gzwrite.c" ^ - "..\..\zlib\infback.c" ^ - "..\..\zlib\inffast.c" ^ - "..\..\zlib\inflate.c" ^ - "..\..\zlib\inftrees.c" ^ - "..\..\zlib\trees.c" ^ - "..\..\zlib\uncompr.c" ^ - "..\..\zlib\zutil.c" ^ - "..\..\zlib\contrib\minizip\ioapi.c" ^ - "..\..\zlib\contrib\minizip\iowin32.c" ^ - "..\..\zlib\contrib\minizip\unzip.c" ^ - "..\..\zlib\contrib\minizip\zip.c" ^ - /link ^ - /DLL ^ - /OUT:"zlib1.dll" ^ - /IMPLIB:"zlib1.lib" ^ - /DEBUG ^ - /INCREMENTAL:NO ^ - /SUBSYSTEM:WINDOWS ^ - /LTCG ^ - /DYNAMICBASE ^ - /MACHINE:X64 ^ - /DEF:"..\..\zlib\win32\zlib.def" ^ - /PDB:"zlib1.pdb" ^ -"..\..\zlib\win32\zlib1.res" +/nologo ^ +/I"..\zlib" ^ +/Zi ^ +/O2 ^ +/Ob2 ^ +/Oy- ^ +/GL ^ +/DWIN32 ^ +/D_WINDLL ^ +/GF ^ +/Gm- ^ +/MT ^ +/GS- ^ +/Gy ^ +/fp:precise ^ +/Zc:wchar_t ^ +/Zc:inline ^ +/Gd ^ +/Fd"zlib1.pdb" ^ +/TC ^ +"..\zlib\adler32.c" ^ +"..\zlib\compress.c" ^ +"..\zlib\crc32.c" ^ +"..\zlib\deflate.c" ^ +"..\zlib\gzclose.c" ^ +"..\zlib\gzlib.c" ^ +"..\zlib\gzread.c" ^ +"..\zlib\gzwrite.c" ^ +"..\zlib\infback.c" ^ +"..\zlib\inffast.c" ^ +"..\zlib\inflate.c" ^ +"..\zlib\inftrees.c" ^ +"..\zlib\trees.c" ^ +"..\zlib\uncompr.c" ^ +"..\zlib\zutil.c" ^ +"..\zlib\contrib\minizip\ioapi.c" ^ +"..\zlib\contrib\minizip\iowin32.c" ^ +"..\zlib\contrib\minizip\unzip.c" ^ +"..\zlib\contrib\minizip\zip.c" ^ +/link ^ +/DLL ^ +/OUT:"zlib1.dll" ^ +/IMPLIB:"zlib1.lib" ^ +/DEBUG ^ +/INCREMENTAL:NO ^ +/SUBSYSTEM:WINDOWS ^ +/LTCG ^ +/DYNAMICBASE ^ +/MACHINE:X64 ^ +/DEF:"..\zlib\win32\zlib.def" ^ +/PDB:"zlib1.pdb" ^ +"..\zlib\win32\zlib1.res"