Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

use openssl sources from third_party/openssl

Browse Source
pull/3937/head
Jan Tattermusch 9 years ago
parent bbfa1d5698
commit a7fab60e1e
5 changed files with 666 additions and 724 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      vsprojects/coapp/openssl/buildall-nmake.bat
  2. 4
      vsprojects/coapp/openssl/buildall.bat
  3. 4
      vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
  4. 1205
      vsprojects/coapp/openssl/libeay32.vcxproj
  5. 113
      vsprojects/coapp/openssl/ssleay32.vcxproj

64
vsprojects/coapp/openssl/buildall-nmake.bat
Unescape View File

@ -1,64 +0,0 @@
rem setlocal
rem call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
rem call :build x64 Release v120 || goto :eof
rem call :build x64 Debug v120 || goto :eof
rem endlocal
setlocal
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
call :build v120 Win32 Release || goto :eof
call :build v120 Win32 Debug || goto :eof
endlocal
rem setlocal
rem call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64
rem call :build x64 Release v110 || goto :eof
rem call :build x64 Debug v110 || goto :eof
rem endlocal
rem setlocal
rem call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
rem call :build Win32 Release v110 || goto :eof
rem call :build Win32 Debug v110 || goto :eof
rem endlocal
rem setlocal
rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
rem call :build x64 Release v100 || goto :eof
rem call :build x64 Debug v100 || goto :eof
rem endlocal
setlocal
call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
call :build v100 Win32 Release || goto :eof
call :build v100 Win32 Debug || goto :eof
endlocal
goto :eof
:build
rem %1=[v100,v120] %2=[Win32] %3=[Release,Debug]
setlocal
@rem TODO(jtattermusch): Debug configuration produces the same results as release config currently.
set CONF_PATH=%1\%2\%3
set ZLIB_INCLUDE="--with-zlib-include=.\COPKG\packages\zlib.1.2.8.7\build\native\include"
set ZLIB_LIB="--with-zlib-lib=.\COPKG\packages\zlib.1.2.8.7\build\native\lib\%CONF_PATH%\dynamic\cdecl\zlib.lib"
set TEMP_DIR=.\COPKG\dest\tmp\%CONF_PATH%
set OUT_DIR=.\COPKG\dest\out\%CONF_PATH%
set INSTALL_DIR=.\COPKG\dest\install\%CONF_PATH%
perl Configure no-asm zlib-dynamic %ZLIB_INCLUDE% %ZLIB_LIB% VC-WIN32 || goto :error
call ".\ms\do_ms.bat" || goto :error
rem Building the static library
nmake -f ms\nt.mak "INSTALLTOP=%INSTALL_DIR%\static" "OPENSSLDIR=%INSTALL_DIR%\static" "TMP_D=%TEMP_DIR%\static" "OUT_D=%OUT_DIR%\static" install || goto :error
rem Building the dynamic library
nmake -f ms\ntdll.mak "INSTALLTOP=%INSTALL_DIR%\dynamic" "OPENSSLDIR=%INSTALL_DIR%\dynamic" "TMP_D=%TEMP_DIR%\dynamic" "OUT_D=%OUT_DIR%\dynamic" install || goto :error
endlocal
goto :eof
:error
echo Failed with error #%errorlevel%.
exit /b %errorlevel%

4
vsprojects/coapp/openssl/buildall.bat
Unescape View File

@ -4,8 +4,8 @@ nuget restore || goto eof:
setlocal
rem First do a bit of hacking to make sure we have headers ready in ..\inc32
cd ..
rem First do a bit of hacking to make sure we have headers ready in openssl's inc32 directory
cd ..\..\..\third_party\openssl
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
perl Configure no-asm VC-WIN32 || goto :eof
perl util\mkfiles.pl >MINFO || goto :eof

4
vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
Unescape View File

@ -47,8 +47,8 @@ nuget {
nestedInclude: {
#destination = "${d_include}\openssl";
#excludes : { ..\inc32\openssl\opensslconf.h };
"..\inc32\openssl\*";
#excludes : { ..\..\..\third_party\openssl\inc32\openssl\opensslconf.h };
"..\..\..\third_party\openssl\inc32\openssl\*";
};
// TODO(jtattermusch): Visual Studio 2010 and 2012 Express (v100 and v110 toolsets) don't support x64,

1205
vsprojects/coapp/openssl/libeay32.vcxproj
View File

File diff suppressed because it is too large Load Diff

113
vsprojects/coapp/openssl/ssleay32.vcxproj
Unescape View File

@ -18,6 +18,9 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
<OpenSslPath>..\..\..\third_party\openssl</OpenSslPath>
</PropertyGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7E05608D-A775-418F-946A-E9A0B84C6DFF}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
@ -48,7 +51,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..;..\inc32;..\crypto;..\include;$(OutDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(OpenSslPath);$(OpenSslPath)\inc32;$(OpenSslPath)\crypto;$(OpenSslPath)\include;$(OutDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<BufferSecurityCheck>true</BufferSecurityCheck>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<!-- <PreprocessorDefinitions>OPENSSL_USE_APPLINK;%(PreprocessorDefinitions)</PreprocessorDefinitions> -->
@ -85,7 +88,7 @@
<ModuleDefinitionFile>.\ssleay32.def</ModuleDefinitionFile>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..;..\inc32;..\crypto;..\include;$(OutDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(OpenSslPath);$(OpenSslPath)\inc32;$(OpenSslPath)\crypto;$(OpenSslPath)\include;$(OutDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;L_ENDIAN;MK1MF_BUILD;WIN32_LEAN_AND_MEAN;OPENSSL_THREADS;ZLIB;OPENSSL_SYSNAME_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_IDEA;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>DSO_WIN32;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -154,59 +157,59 @@
<None Include="openssl.gyp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\ssl\s2_pkt.c" />
<ClCompile Include="..\ssl\s3_enc.c" />
<ClCompile Include="..\ssl\s23_pkt.c" />
<ClCompile Include="..\ssl\t1_meth.c" />
<ClCompile Include="..\ssl\ssl_lib.c" />
<ClCompile Include="..\ssl\ssl_asn1.c" />
<ClCompile Include="..\ssl\s23_lib.c" />
<ClCompile Include="..\ssl\tls_srp.c" />
<ClCompile Include="..\ssl\ssl_txt.c" />
<ClCompile Include="..\ssl\ssl_algs.c" />
<ClCompile Include="..\ssl\s23_srvr.c" />
<ClCompile Include="..\ssl\d1_both.c" />
<ClCompile Include="..\ssl\s3_meth.c" />
<ClCompile Include="..\ssl\ssl_err2.c" />
<ClCompile Include="..\ssl\bio_ssl.c" />
<ClCompile Include="..\ssl\s2_meth.c" />
<ClCompile Include="..\ssl\s3_clnt.c" />
<ClCompile Include="..\ssl\s3_lib.c" />
<ClCompile Include="..\ssl\kssl.c" />
<ClCompile Include="..\ssl\t1_enc.c" />
<ClCompile Include="..\ssl\d1_clnt.c" />
<ClCompile Include="..\ssl\t1_lib.c" />
<ClCompile Include="..\ssl\t1_srvr.c" />
<ClCompile Include="..\ssl\ssl_cert.c" />
<ClCompile Include="..\ssl\t1_clnt.c" />
<ClCompile Include="..\ssl\ssl_stat.c" />
<ClCompile Include="..\ssl\ssl_sess.c" />
<ClCompile Include="..\ssl\s3_both.c" />
<ClCompile Include="..\ssl\d1_srtp.c" />
<ClCompile Include="..\ssl\d1_pkt.c" />
<ClCompile Include="..\ssl\s23_clnt.c" />
<ClCompile Include="..\ssl\s2_lib.c" />
<ClCompile Include="..\ssl\t1_reneg.c" />
<ClCompile Include="..\ssl\s2_enc.c" />
<ClCompile Include="..\ssl\ssl_rsa.c" />
<ClCompile Include="..\ssl\s23_meth.c" />
<ClCompile Include="..\ssl\d1_lib.c" />
<ClCompile Include="..\ssl\ssl_ciph.c" />
<ClCompile Include="..\ssl\s2_srvr.c" />
<ClCompile Include="..\ssl\ssl_err.c" />
<ClCompile Include="..\ssl\ssl_utst.c" />
<ClCompile Include="..\ssl\s2_clnt.c" />
<ClCompile Include="..\ssl\s3_pkt.c" />
<ClCompile Include="..\ssl\d1_srvr.c" />
<ClCompile Include="..\ssl\s3_srvr.c" />
<ClCompile Include="..\ssl\s3_cbc.c" />
<ClCompile Include="..\ssl\d1_meth.c" />
<ClCompile Include="..\ssl\ssl_conf.c" />
<ClCompile Include="..\ssl\t1_ext.c" />
<ClCompile Include="..\ssl\t1_trce.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s2_pkt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s3_enc.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s23_pkt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\t1_meth.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_lib.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_asn1.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s23_lib.c" />
<ClCompile Include="$(OpenSslPath)\ssl\tls_srp.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_txt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_algs.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s23_srvr.c" />
<ClCompile Include="$(OpenSslPath)\ssl\d1_both.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s3_meth.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_err2.c" />
<ClCompile Include="$(OpenSslPath)\ssl\bio_ssl.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s2_meth.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s3_clnt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s3_lib.c" />
<ClCompile Include="$(OpenSslPath)\ssl\kssl.c" />
<ClCompile Include="$(OpenSslPath)\ssl\t1_enc.c" />
<ClCompile Include="$(OpenSslPath)\ssl\d1_clnt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\t1_lib.c" />
<ClCompile Include="$(OpenSslPath)\ssl\t1_srvr.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_cert.c" />
<ClCompile Include="$(OpenSslPath)\ssl\t1_clnt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_stat.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_sess.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s3_both.c" />
<ClCompile Include="$(OpenSslPath)\ssl\d1_srtp.c" />
<ClCompile Include="$(OpenSslPath)\ssl\d1_pkt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s23_clnt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s2_lib.c" />
<ClCompile Include="$(OpenSslPath)\ssl\t1_reneg.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s2_enc.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_rsa.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s23_meth.c" />
<ClCompile Include="$(OpenSslPath)\ssl\d1_lib.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_ciph.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s2_srvr.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_err.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_utst.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s2_clnt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s3_pkt.c" />
<ClCompile Include="$(OpenSslPath)\ssl\d1_srvr.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s3_srvr.c" />
<ClCompile Include="$(OpenSslPath)\ssl\s3_cbc.c" />
<ClCompile Include="$(OpenSslPath)\ssl\d1_meth.c" />
<ClCompile Include="$(OpenSslPath)\ssl\ssl_conf.c" />
<ClCompile Include="$(OpenSslPath)\ssl\t1_ext.c" />
<ClCompile Include="$(OpenSslPath)\ssl\t1_trce.c" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\ms\version32.rc" />
<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" />
@ -227,9 +230,9 @@
Command="
perl Configure no-rc5 no-idea enable-mdc2 threads $(Build-Perl-zlib) $(Build-Perl-dll) $(Build-Perl-asm) $(Build-Perl-platform)
perl util\mkfiles.pl >MINFO
perl .\util\mkdef.pl 32 ssleay >.\COPKG\ssleay32.def
perl .\util\mkdef.pl 32 ssleay >..\..\vsprojects\coapp\openssl\ssleay32.def
"
WorkingDirectory="$(MSBuildThisFileDirectory)..\" />
WorkingDirectory="$(MSBuildThisFileDirectory)$(OpenSslPath)\" />
</Target>
<PropertyGroup>
<BuildDependsOn>PerlDefs;$(BuildDependsOn)</BuildDependsOn>

Write Preview
Loading…
Cancel
Save