aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vsprojects/coapp/openssl/README.md1
-rw-r--r--vsprojects/coapp/openssl/buildall.bat16
-rw-r--r--vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg22
-rw-r--r--vsprojects/coapp/openssl/libeay32.vcxproj8
-rw-r--r--vsprojects/coapp/openssl/packages.config4
-rw-r--r--vsprojects/coapp/openssl/ssleay32.vcxproj8
-rw-r--r--vsprojects/coapp/openssl/version.inc2
7 files changed, 42 insertions, 19 deletions
diff --git a/vsprojects/coapp/openssl/README.md b/vsprojects/coapp/openssl/README.md
index e15831c67f..a0a4deaa86 100644
--- a/vsprojects/coapp/openssl/README.md
+++ b/vsprojects/coapp/openssl/README.md
@@ -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)
diff --git a/vsprojects/coapp/openssl/buildall.bat b/vsprojects/coapp/openssl/buildall.bat
index 70a7d1602d..2bf1c87077 100644
--- a/vsprojects/coapp/openssl/buildall.bat
+++ b/vsprojects/coapp/openssl/buildall.bat
@@ -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
@@ -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
diff --git a/vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg b/vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
index 00ee825f3c..fbf6d63f1c 100644
--- a/vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
+++ b/vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
@@ -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";
}
@@ -19,7 +29,7 @@ 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 };
@@ -27,7 +37,7 @@ nuget {
dependencies {
packages : {
- grpc.dependencies.zlib/1.2.8.9
+ grpc.dependencies.zlib/1.2.8.10
};
}
@@ -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";
};
@@ -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 };
@@ -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 };
@@ -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};
};
diff --git a/vsprojects/coapp/openssl/libeay32.vcxproj b/vsprojects/coapp/openssl/libeay32.vcxproj
index 0ee97262d5..ea63162110 100644
--- a/vsprojects/coapp/openssl/libeay32.vcxproj
+++ b/vsprojects/coapp/openssl/libeay32.vcxproj
@@ -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" />
@@ -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>
diff --git a/vsprojects/coapp/openssl/packages.config b/vsprojects/coapp/openssl/packages.config
index e1f8f360da..2d4749d069 100644
--- a/vsprojects/coapp/openssl/packages.config
+++ b/vsprojects/coapp/openssl/packages.config
@@ -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> \ No newline at end of file
diff --git a/vsprojects/coapp/openssl/ssleay32.vcxproj b/vsprojects/coapp/openssl/ssleay32.vcxproj
index 4cc2436b44..3ed1361d99 100644
--- a/vsprojects/coapp/openssl/ssleay32.vcxproj
+++ b/vsprojects/coapp/openssl/ssleay32.vcxproj
@@ -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" />
@@ -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>
diff --git a/vsprojects/coapp/openssl/version.inc b/vsprojects/coapp/openssl/version.inc
index f27552bba3..aa801bea5b 100644
--- a/vsprojects/coapp/openssl/version.inc
+++ b/vsprojects/coapp/openssl/version.inc
@@ -1 +1 @@
-#define { package-version: 1.0.2.2; }
+#define { package-version: 1.0.204.1; }
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 05:02:23 +0000