Skip to content

Commit

Permalink
update openssl nuget packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtattermusch
jtattermusch committed Dec 1, 2015
1 parent fd72a4c commit ef292c3
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 19 deletions.
1 change: 1 addition & 0 deletions vsprojects/coapp/openssl/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Uses [CoApp](http://coapp.org/) project to build the zlib package.
Prerequisites
-------------
Multiple versions of VS installed to be able to build all the targets:
* Visual Studio 2015
* Visual Studio 2013
* Visual Studio 2010 (you might need SP1 to prevent LNK1123 error)

Expand Down
16 changes: 14 additions & 2 deletions vsprojects/coapp/openssl/buildall.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ mkdir inc32\openssl
mkdir tmp32
nmake -f ms\nt.mak headers || goto :eof
endlocal

setlocal
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
call :build x64 Release v140 || goto :eof
call :build x64 Debug v140 || goto :eof
endlocal

setlocal
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
call :build Win32 Release v140 || goto :eof
call :build Win32 Debug v140 || goto :eof
endlocal

setlocal
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
Expand Down Expand Up @@ -52,8 +64,8 @@ call :build Win32 Debug v100 || goto :eof
endlocal

:build
msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=dynamic /P:ConfigurationType=DynamicLibrary .\openssl.sln || goto :eof
msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=static /P:ConfigurationType=StaticLibrary .\openssl.sln || goto :eof
msbuild /m:4 /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=dynamic /P:ConfigurationType=DynamicLibrary .\openssl.sln || goto :eof
msbuild /m:4 /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=static /P:ConfigurationType=StaticLibrary .\openssl.sln || goto :eof
goto :eof


22 changes: 16 additions & 6 deletions vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
@import @"version.inc";

configurations
{
// See https://github.com/coapp/coapp.powershell/issues/112
Toolset
{
key : "PlatformToolset"; // this is CoApp pre-defined key
choices: { v140, v120, v110, v100 };
};
}

#define {
package-id = "grpc.dependencies.openssl";
}
Expand All @@ -19,15 +29,15 @@ nuget {
summary: "An OpenSSL library";
description: @"Native OpenSSL library.
OpenSSL homepage: http://www.openssl.org";
releaseNotes: "Release of OpenSSL 1.0.2a libraries.";
releaseNotes: "Release of OpenSSL 1.0.2d libraries.";
copyright: Copyright 2015;
tags: { openssl, native, CoApp };

};

dependencies {
packages : {
grpc.dependencies.zlib/1.2.8.9
grpc.dependencies.zlib/1.2.8.10
};
}

Expand All @@ -40,7 +50,7 @@ nuget {
#output {
package = redist;
};
#destination = \build\portable-net45;
#destination = "\build\portable-net45+netcore45+wpa81+wp8";
"managed_targets\${package-id}.redist.targets";
"managed_targets\${package-id}.redist.props";
};
Expand All @@ -54,7 +64,7 @@ nuget {
// TODO(jtattermusch): Visual Studio 2010 and 2012 Express (v100 and v110 toolsets) don't support x64,
// so while generating the package, you will get a warning that corresponding files are missing
// (and the resulting package will be somewhat incomplete).
("v100,v120", "Win32,x64", "release,debug", "Dynamic,Static") => {
("v100,v120,v140", "Win32,x64", "release,debug", "Dynamic,Static") => {
[${0},${1},${2},${3}] {
lib: { .\output\${0}\${1}\${2}\${3}\libeay32.lib;
.\output\${0}\${1}\${2}\${3}\ssleay32.lib };
Expand All @@ -65,7 +75,7 @@ nuget {
};
};
};
("v100,v120", "Win32,x64", "release,debug", "Dynamic") => {
("v100,v120,v140", "Win32,x64", "release,debug", "Dynamic") => {
[${0},${1},${2},${3}] {
bin: { .\output\${0}\${1}\${2}\${3}\libeay32.dll;
.\output\${0}\${1}\${2}\${3}\ssleay32.dll };
Expand All @@ -90,7 +100,7 @@ nuget {
Includes += ${pkg_root}${d_include};
// Defines += HAS_ZLIB;

("v100,v110,v120", "Win32,x64", "release,debug", "Dynamic,Static") => {
("v100,v110,v120,v140", "Win32,x64", "release,debug", "Dynamic,Static") => {
[${0},${1},${2},${3}] {
Includes += ${pkg_root}${d_include};
};
Expand Down
8 changes: 4 additions & 4 deletions vsprojects/coapp/openssl/libeay32.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
</PropertyGroup>
<Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.props')" Project=".\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.props" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.props')" Project=".\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.props" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.props')" Project=".\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.props" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.props')" Project=".\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
Expand Down Expand Up @@ -780,8 +780,8 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets')" Project=".\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets')" Project=".\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" Project=".\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" Project=".\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets" />
<ImportGroup Label="ExtensionTargets" />
<PropertyGroup>
<Build-Perl-zlib Condition="'$(Linkage-zlib)'=='dynamic'">zlib-dynamic</Build-Perl-zlib>
Expand Down
4 changes: 2 additions & 2 deletions vsprojects/coapp/openssl/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="grpc.dependencies.zlib" version="1.2.8.9" targetFramework="Native" />
<package id="grpc.dependencies.zlib.redist" version="1.2.8.9" targetFramework="Native" />
<package id="grpc.dependencies.zlib" version="1.2.8.10" targetFramework="Native" />
<package id="grpc.dependencies.zlib.redist" version="1.2.8.10" targetFramework="Native" />
</packages>
8 changes: 4 additions & 4 deletions vsprojects/coapp/openssl/ssleay32.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
</PropertyGroup>
<Import Project="$(CoAppEtcDirectory)vcxproj.inc" Condition="Exists('$(CoAppEtcDirectory)vcxproj.inc')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.props')" Project=".\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.props" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.props')" Project=".\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.props" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.props')" Project=".\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.props" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.props')" Project=".\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
Expand Down Expand Up @@ -212,8 +212,8 @@
<ResourceCompile Include="$(OpenSslPath)\ms\version32.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets')" Project=".\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets')" Project=".\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" Project=".\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets" />
<Import Condition="exists('.\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" Project=".\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets" />
<ImportGroup Label="ExtensionTargets" />
<PropertyGroup>
<Build-Perl-zlib Condition="'$(Linkage-zlib)'=='dynamic'">zlib-dynamic</Build-Perl-zlib>
Expand Down
2 changes: 1 addition & 1 deletion vsprojects/coapp/openssl/version.inc
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define { package-version: 1.0.2.2; }
#define { package-version: 1.0.204.1; }

0 comments on commit ef292c3

Please sign in to comment.