Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Test zip file
  • Loading branch information
emasab committed Apr 3, 2023
commit 0e2173786b196ead82f7a34076e51aec77d353e4
8 changes: 4 additions & 4 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,17 +304,17 @@ blocks:
- name: ARTIFACT_KEY
value: p-librdkafka__plat-windows__dist-msvc__arch-x64__lnk-std
commands:
- "& .\\win32\\msbuild.ps1 -config Release -platform x64"
- "& .\\win32\\package-nuget.ps1"
- "& .\\win32\\msbuild.ps1 -platform x64"
- "& .\\win32\\package-zip.ps1 -platform x64"
- name: 'Build: MSVC x86'
env_vars:
- name: triplet
value: x86-windows
- name: ARTIFACT_KEY
value: p-librdkafka__plat-windows__dist-msvc__arch-x86__lnk-std
commands:
- "& .\\win32\\msbuild.ps1 -config Release -platform Win32"
- "& .\\win32\\package-nuget.ps1"
- "& .\\win32\\msbuild.ps1 -platform Win32"
- "& .\\win32\\package-zip.ps1 -platform Win32"

# - name: 'Packaging'
# dependencies:
Expand Down
5 changes: 2 additions & 3 deletions win32/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Build guide for Windows

* build.bat - Build for all combos of: Win32,x64,Release,Debug using the current msbuild toolset
* build-package.bat - Build NuGet packages (wrapper for package-nuget.ps1)
* package-nuget.ps1 - Build NuGet packages (using build.bat artifacts)
* push-package.bat - Push NuGet packages to NuGet (edit script for version)
* package-zip.ps1 - Build zip package (using build.bat artifacts)

30 changes: 0 additions & 30 deletions win32/package-nuget.ps1

This file was deleted.

46 changes: 46 additions & 0 deletions win32/package-zip.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<#
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need some understanding on this

.SYNOPSIS

Create zip package


.DESCRIPTION

A full build must be completed, to populate output directories, before

running this script.

Use build.bat to build

#>

param(
[string]$config='Release',
[string]$platform='x64',
[string]$toolset='v142',
[string]$version='0.0.0'
)

$msbuild = (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe)

echo "Packaging $config $platform $toolset"

$bindir = "build\native\bin\${toolset}\${platform}\$config"
$libdir = "build\native\lib\${toolset}\${platform}\$config"
$srcdir = "win32\outdir\${toolset}\${platform}\$config"

New-Item -Path $bindir -ItemType Directory
New-Item -Path $libdir -ItemType Directory

$platformpart = ""
if ("x64" -eq $platform) {
$platformpart = "-${platform}"
}

Copy-Item "${srcdir}\librdkafka.dll","${srcdir}\librdkafkacpp.dll",
"${srcdir}\libcrypto-3${platformpart}.dll","${srcdir}\libssl-3${platformpart}.dll",
"${srcdir}\zlib1.dll","${srcdir}\zstd.dll","${srcdir}\libcurl.dll" -Destination $bindir

Copy-Item "${srcdir}\librdkafka.lib","${srcdir}\librdkafkacpp.lib" -Destination $libdir

Compress-Archive -Path "build" -DestinationPath "artifacts\librdkafka.redist.zip"