diff --git a/packaging/nuget/nugetpackage.py b/packaging/nuget/nugetpackage.py index 0e7d46517a..01716b4568 100644 --- a/packaging/nuget/nugetpackage.py +++ b/packaging/nuget/nugetpackage.py @@ -109,127 +109,128 @@ class NugetPackage (Package): './usr/local/lib/librdkafka.so.1', 'runtimes/linux-x64/native/alpine-librdkafka.so'), - # Common Win runtime - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'msvcr140.zip', - 'vcruntime140.dll', - 'runtimes/win-x64/native/vcruntime140.dll'), - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'msvcr140.zip', - 'msvcp140.dll', 'runtimes/win-x64/native/msvcp140.dll'), - # matches librdkafka.redist.{VER}.nupkg - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/x64/Release/librdkafka.dll', - 'runtimes/win-x64/native/librdkafka.dll'), - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/x64/Release/librdkafkacpp.dll', - 'runtimes/win-x64/native/librdkafkacpp.dll'), - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/x64/Release/libcrypto-3-x64.dll', - 'runtimes/win-x64/native/libcrypto-3-x64.dll'), - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/x64/Release/libssl-3-x64.dll', - 'runtimes/win-x64/native/libssl-3-x64.dll'), - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/x64/Release/zlib1.dll', - 'runtimes/win-x64/native/zlib1.dll'), - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/x64/Release/zstd.dll', - 'runtimes/win-x64/native/zstd.dll'), - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/x64/Release/libcurl.dll', - 'runtimes/win-x64/native/libcurl.dll'), - # matches librdkafka.{VER}.nupkg - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka*.nupkg', - 'build/native/lib/v142/x64/Release/librdkafka.lib', - 'build/native/lib/win/x64/win-x64-Release/v142/librdkafka.lib', # noqa: E501 - artifact_fname_excludes=['redist', 'symbols']), - Mapping({'arch': 'x64', - 'plat': 'win'}, - 'librdkafka*.nupkg', - 'build/native/lib/v142/x64/Release/librdkafkacpp.lib', - 'build/native/lib/win/x64/win-x64-Release/v142/librdkafkacpp.lib', # noqa: E501 - artifact_fname_excludes=['redist', 'symbols']), + # Disabled before Coapp replacement + # # Common Win runtime + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'msvcr140.zip', + # 'vcruntime140.dll', + # 'runtimes/win-x64/native/vcruntime140.dll'), + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'msvcr140.zip', + # 'msvcp140.dll', 'runtimes/win-x64/native/msvcp140.dll'), + # # matches librdkafka.redist.{VER}.nupkg + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/x64/Release/librdkafka.dll', + # 'runtimes/win-x64/native/librdkafka.dll'), + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/x64/Release/librdkafkacpp.dll', + # 'runtimes/win-x64/native/librdkafkacpp.dll'), + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/x64/Release/libcrypto-3-x64.dll', + # 'runtimes/win-x64/native/libcrypto-3-x64.dll'), + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/x64/Release/libssl-3-x64.dll', + # 'runtimes/win-x64/native/libssl-3-x64.dll'), + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/x64/Release/zlib1.dll', + # 'runtimes/win-x64/native/zlib1.dll'), + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/x64/Release/zstd.dll', + # 'runtimes/win-x64/native/zstd.dll'), + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/x64/Release/libcurl.dll', + # 'runtimes/win-x64/native/libcurl.dll'), + # # matches librdkafka.{VER}.nupkg + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka*.nupkg', + # 'build/native/lib/v142/x64/Release/librdkafka.lib', + # 'build/native/lib/win/x64/win-x64-Release/v142/librdkafka.lib', # noqa: E501 + # artifact_fname_excludes=['redist', 'symbols']), + # Mapping({'arch': 'x64', + # 'plat': 'win'}, + # 'librdkafka*.nupkg', + # 'build/native/lib/v142/x64/Release/librdkafkacpp.lib', + # 'build/native/lib/win/x64/win-x64-Release/v142/librdkafkacpp.lib', # noqa: E501 + # artifact_fname_excludes=['redist', 'symbols']), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'msvcr140.zip', - 'vcruntime140.dll', - 'runtimes/win-x86/native/vcruntime140.dll'), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'msvcr140.zip', - 'msvcp140.dll', 'runtimes/win-x86/native/msvcp140.dll'), - # matches librdkafka.redist.{VER}.nupkg - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/Win32/Release/librdkafka.dll', - 'runtimes/win-x86/native/librdkafka.dll'), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/Win32/Release/librdkafkacpp.dll', - 'runtimes/win-x86/native/librdkafkacpp.dll'), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/Win32/Release/libcrypto-3.dll', - 'runtimes/win-x86/native/libcrypto-3.dll'), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/Win32/Release/libssl-3.dll', - 'runtimes/win-x86/native/libssl-3.dll'), + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'msvcr140.zip', + # 'vcruntime140.dll', + # 'runtimes/win-x86/native/vcruntime140.dll'), + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'msvcr140.zip', + # 'msvcp140.dll', 'runtimes/win-x86/native/msvcp140.dll'), + # # matches librdkafka.redist.{VER}.nupkg + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/Win32/Release/librdkafka.dll', + # 'runtimes/win-x86/native/librdkafka.dll'), + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/Win32/Release/librdkafkacpp.dll', + # 'runtimes/win-x86/native/librdkafkacpp.dll'), + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/Win32/Release/libcrypto-3.dll', + # 'runtimes/win-x86/native/libcrypto-3.dll'), + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/Win32/Release/libssl-3.dll', + # 'runtimes/win-x86/native/libssl-3.dll'), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/Win32/Release/zlib1.dll', - 'runtimes/win-x86/native/zlib1.dll'), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/Win32/Release/zstd.dll', - 'runtimes/win-x86/native/zstd.dll'), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka.redist*', - 'build/native/bin/v142/Win32/Release/libcurl.dll', - 'runtimes/win-x86/native/libcurl.dll'), + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/Win32/Release/zlib1.dll', + # 'runtimes/win-x86/native/zlib1.dll'), + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/Win32/Release/zstd.dll', + # 'runtimes/win-x86/native/zstd.dll'), + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka.redist*', + # 'build/native/bin/v142/Win32/Release/libcurl.dll', + # 'runtimes/win-x86/native/libcurl.dll'), - # matches librdkafka.{VER}.nupkg - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka*.nupkg', - 'build/native/lib/v142/Win32/Release/librdkafka.lib', - 'build/native/lib/win/x86/win-x86-Release/v142/librdkafka.lib', # noqa: E501 - artifact_fname_excludes=['redist', 'symbols']), + # # matches librdkafka.{VER}.nupkg + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka*.nupkg', + # 'build/native/lib/v142/Win32/Release/librdkafka.lib', + # 'build/native/lib/win/x86/win-x86-Release/v142/librdkafka.lib', # noqa: E501 + # artifact_fname_excludes=['redist', 'symbols']), - Mapping({'arch': 'x86', - 'plat': 'win'}, - 'librdkafka*.nupkg', - 'build/native/lib/v142/Win32/Release/librdkafkacpp.lib', - 'build/native/lib/win/x86/win-x86-Release/v142/librdkafkacpp.lib', # noqa: E501 - artifact_fname_excludes=['redist', 'symbols']) + # Mapping({'arch': 'x86', + # 'plat': 'win'}, + # 'librdkafka*.nupkg', + # 'build/native/lib/v142/Win32/Release/librdkafkacpp.lib', + # 'build/native/lib/win/x86/win-x86-Release/v142/librdkafkacpp.lib', # noqa: E501 + # artifact_fname_excludes=['redist', 'symbols']) ] def __init__(self, version, arts):