From 1afb17b527113da762faee6333329ebaf825e13d Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 27 Dec 2014 11:07:07 +0000 Subject: [PATCH] trunk: webready integration. fixing broken and missing MSVC/vcproj files. --- msvc2003/httptest/httptest.vcproj | 1 + msvc2003/remotetest/remotetest.vcproj | 1 + msvc2005/conntest/conntest.vcproj | 1 + msvc2005/exiv2json/exiv2json.vcproj | 1 + msvc2005/httptest/httptest.vcproj | 1 + msvc2005/libcurl/libcurl.vcproj | 1 + msvc2005/libeay32/build_libeay32.bat | 55 ++++++++++++++++++ msvc2005/libeay32/libeay32.vcproj | 1 + msvc2005/libexiv2/build_libeay32.bat | 55 ++++++++++++++++++ msvc2005/libexiv2/libeay32.vcproj | 1 + msvc2005/libexiv2/libexiv2.vcproj | 1 + msvc2005/libexpat/libexpat.vcproj | 1 + msvc2005/libssh/libssh.vcproj | 1 + msvc2005/openssl/build_openssl.bat | 80 +++++++++++++++++++++++++++ msvc2005/openssl/openssl.vcproj | 1 + msvc2005/remotetest/remotetest.vcproj | 1 + msvc2005/ssleay32/build_ssleay32.bat | 55 ++++++++++++++++++ msvc2005/ssleay32/ssleay32.vcproj | 1 + samples/httptest.cpp | 5 ++ 19 files changed, 264 insertions(+) create mode 100644 msvc2003/httptest/httptest.vcproj create mode 100644 msvc2003/remotetest/remotetest.vcproj create mode 100644 msvc2005/conntest/conntest.vcproj create mode 100644 msvc2005/exiv2json/exiv2json.vcproj create mode 100644 msvc2005/httptest/httptest.vcproj create mode 100644 msvc2005/libcurl/libcurl.vcproj create mode 100644 msvc2005/libeay32/build_libeay32.bat create mode 100644 msvc2005/libeay32/libeay32.vcproj create mode 100644 msvc2005/libexiv2/build_libeay32.bat create mode 100644 msvc2005/libexiv2/libeay32.vcproj create mode 100644 msvc2005/libexiv2/libexiv2.vcproj create mode 100644 msvc2005/libexpat/libexpat.vcproj create mode 100644 msvc2005/libssh/libssh.vcproj create mode 100644 msvc2005/openssl/build_openssl.bat create mode 100644 msvc2005/openssl/openssl.vcproj create mode 100644 msvc2005/remotetest/remotetest.vcproj create mode 100644 msvc2005/ssleay32/build_ssleay32.bat create mode 100644 msvc2005/ssleay32/ssleay32.vcproj diff --git a/msvc2003/httptest/httptest.vcproj b/msvc2003/httptest/httptest.vcproj new file mode 100644 index 00000000..28b51c58 --- /dev/null +++ b/msvc2003/httptest/httptest.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2003/remotetest/remotetest.vcproj b/msvc2003/remotetest/remotetest.vcproj new file mode 100644 index 00000000..85e899a5 --- /dev/null +++ b/msvc2003/remotetest/remotetest.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/conntest/conntest.vcproj b/msvc2005/conntest/conntest.vcproj new file mode 100644 index 00000000..4c3a470f --- /dev/null +++ b/msvc2005/conntest/conntest.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/exiv2json/exiv2json.vcproj b/msvc2005/exiv2json/exiv2json.vcproj new file mode 100644 index 00000000..105097d0 --- /dev/null +++ b/msvc2005/exiv2json/exiv2json.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/httptest/httptest.vcproj b/msvc2005/httptest/httptest.vcproj new file mode 100644 index 00000000..84512647 --- /dev/null +++ b/msvc2005/httptest/httptest.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/libcurl/libcurl.vcproj b/msvc2005/libcurl/libcurl.vcproj new file mode 100644 index 00000000..abf01bb0 --- /dev/null +++ b/msvc2005/libcurl/libcurl.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/libeay32/build_libeay32.bat b/msvc2005/libeay32/build_libeay32.bat new file mode 100644 index 00000000..fb33956e --- /dev/null +++ b/msvc2005/libeay32/build_libeay32.bat @@ -0,0 +1,55 @@ +@echo off +echo +++ +echo +++ building %*+++ +echo +++ + +setlocal ENABLEEXTENSIONS + +set PLATFORM=%1 +set CONFIG=%2 +set OutDir=%3 +set VCInstallDir=%4 +set ProjectDir=%5 +set SolutionDir=%6 +set Action=%7 + +echo +++ PLATFORM = %PLATFORM% +echo +++ CONFIG = %CONFIG% +echo +++ OutDir = %OutDir% +echo +++ VCInstallDir = %VCInstallDir% +echo +++ ProjectDir = %ProjectDir% +echo +++ SolutionDir = %SolutionDir% +echo +++ Action = %Action% +echo +++ +echo. + +@echo on +cd %PROJECTDIR%..\..\..\openssl +set BUILD=0 +if %ACTION% == rebuild set BUILD=build +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\ssleay32.lib set BUILD=build +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\libeay32.lib set BUILD=build +if %BUILD% == 0 GOTO POSTPROCESS + + +set SHARED=shared +if %CONFIG% == Debug set SHARED=no-shared +if %CONFIG% == Release set SHARED=no-shared + +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\ mkdir %SolutionDir%bin\%PLATFORM%\%CONFIG%\ + + copy/y %ProjectDir%..\openssl\%PLATFORM%\%CONFIG%\lib\*.lib %SolutionDir%bin\%PLATFORM%\%CONFIG%\ +if %SHARED% == shared copy/y %ProjectDir%..\openssl\%PLATFORM%\%CONFIG%\bin\*.dll %SolutionDir%bin\%PLATFORM%\%CONFIG%\ + +:POSTPROCESS + +set ERRORLEVEL=0 +echo OK +goto EOF + +:ERROR +set ERRORLEVEL=911 + +:EOF +rem That's all Folks +rem ---------------- diff --git a/msvc2005/libeay32/libeay32.vcproj b/msvc2005/libeay32/libeay32.vcproj new file mode 100644 index 00000000..b990f567 --- /dev/null +++ b/msvc2005/libeay32/libeay32.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/libexiv2/build_libeay32.bat b/msvc2005/libexiv2/build_libeay32.bat new file mode 100644 index 00000000..fb33956e --- /dev/null +++ b/msvc2005/libexiv2/build_libeay32.bat @@ -0,0 +1,55 @@ +@echo off +echo +++ +echo +++ building %*+++ +echo +++ + +setlocal ENABLEEXTENSIONS + +set PLATFORM=%1 +set CONFIG=%2 +set OutDir=%3 +set VCInstallDir=%4 +set ProjectDir=%5 +set SolutionDir=%6 +set Action=%7 + +echo +++ PLATFORM = %PLATFORM% +echo +++ CONFIG = %CONFIG% +echo +++ OutDir = %OutDir% +echo +++ VCInstallDir = %VCInstallDir% +echo +++ ProjectDir = %ProjectDir% +echo +++ SolutionDir = %SolutionDir% +echo +++ Action = %Action% +echo +++ +echo. + +@echo on +cd %PROJECTDIR%..\..\..\openssl +set BUILD=0 +if %ACTION% == rebuild set BUILD=build +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\ssleay32.lib set BUILD=build +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\libeay32.lib set BUILD=build +if %BUILD% == 0 GOTO POSTPROCESS + + +set SHARED=shared +if %CONFIG% == Debug set SHARED=no-shared +if %CONFIG% == Release set SHARED=no-shared + +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\ mkdir %SolutionDir%bin\%PLATFORM%\%CONFIG%\ + + copy/y %ProjectDir%..\openssl\%PLATFORM%\%CONFIG%\lib\*.lib %SolutionDir%bin\%PLATFORM%\%CONFIG%\ +if %SHARED% == shared copy/y %ProjectDir%..\openssl\%PLATFORM%\%CONFIG%\bin\*.dll %SolutionDir%bin\%PLATFORM%\%CONFIG%\ + +:POSTPROCESS + +set ERRORLEVEL=0 +echo OK +goto EOF + +:ERROR +set ERRORLEVEL=911 + +:EOF +rem That's all Folks +rem ---------------- diff --git a/msvc2005/libexiv2/libeay32.vcproj b/msvc2005/libexiv2/libeay32.vcproj new file mode 100644 index 00000000..b990f567 --- /dev/null +++ b/msvc2005/libexiv2/libeay32.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/libexiv2/libexiv2.vcproj b/msvc2005/libexiv2/libexiv2.vcproj new file mode 100644 index 00000000..d890706f --- /dev/null +++ b/msvc2005/libexiv2/libexiv2.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/libexpat/libexpat.vcproj b/msvc2005/libexpat/libexpat.vcproj new file mode 100644 index 00000000..b129b537 --- /dev/null +++ b/msvc2005/libexpat/libexpat.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/libssh/libssh.vcproj b/msvc2005/libssh/libssh.vcproj new file mode 100644 index 00000000..b65cb805 --- /dev/null +++ b/msvc2005/libssh/libssh.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/openssl/build_openssl.bat b/msvc2005/openssl/build_openssl.bat new file mode 100644 index 00000000..525b6bd4 --- /dev/null +++ b/msvc2005/openssl/build_openssl.bat @@ -0,0 +1,80 @@ +@echo off +echo +++ +echo +++ building %* +++ +echo +++ + +setlocal ENABLEEXTENSIONS + +set PLATFORM=%1 +set CONFIG=%2 +set OutDir=%3 +set VCInstallDir=%4 +set ProjectDir=%5 +set SolutionDir=%6 +set Action=%7 + +echo +++ PLATFORM = %PLATFORM% +echo +++ CONFIG = %CONFIG% +echo +++ OutDir = %OutDir% +echo +++ VCInstallDir = %VCInstallDir% +echo +++ ProjectDir = %ProjectDir% +echo +++ SolutionDir = %SolutionDir% +echo +++ Action = %Action% +echo +++ +echo. + +perl --version > nul 2> nul +if ERRORLEVEL 1 ( + echo perl is not available + goto ERROR +) + +if NOT EXIST %PROJECTDIR%\..\..\..\openssl ( + echo %PROJECTDIR%\..\..\..\openssl does not exist + goto ERROR +) + +@echo on +cd %PROJECTDIR%..\..\..\openssl +set BUILD=0 +if %ACTION% == rebuild set BUILD=build +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\ssleay32.lib set BUILD=build +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\libeay32.lib set BUILD=build +if %BUILD% == 0 GOTO POSTPROCESS + +set VCVARS=vcvars32.bat +set VCCONFIG=VC-WIN32 +set DO=ms\do_ms.bat +if %PLATFORM% == x64 ( + set VCCONFIG=VC-WIN64A + set VCVARS=x86_amd64\vcvarsx86_amd64.bat + SET DO=ms\do_win64a.bat +) +call %VCInstallDir%\bin\%VCVARS% + +set SHARED=shared +if %CONFIG% == Debug set SHARED=no-shared +if %CONFIG% == Release set SHARED=no-shared + +set MAKEFILE=ms\ntdll.mak +if %SHARED% == no-shared set MAKEFILE=ms\nt.mak +perl Configure %VCCONFIG% no-asm %SHARED% --prefix=%ProjectDir%%PLATFORM%\%CONFIG% +call %DO% +nmake -f %MAKEFILE% +nmake -f %MAKEFILE% install +nmake -f %MAKEFILE% clean + +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\ mkdir %SolutionDir%bin\%PLATFORM%\%CONFIG%\ + copy/y %ProjectDir%%PLATFORM%\%CONFIG%\lib\*.lib %SolutionDir%bin\%PLATFORM%\%CONFIG%\ +if %SHARED% == shared copy/y %ProjectDir%%PLATFORM%\%CONFIG%\bin\*.dll %SolutionDir%bin\%PLATFORM%\%CONFIG%\ + +:POSTPROCESS +set ERRORLEVEL=0 +goto EOF + +:ERROR +set ERRORLEVEL=911 + +:EOF +rem That's all Folks +rem ---------------- diff --git a/msvc2005/openssl/openssl.vcproj b/msvc2005/openssl/openssl.vcproj new file mode 100644 index 00000000..fbc96597 --- /dev/null +++ b/msvc2005/openssl/openssl.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/remotetest/remotetest.vcproj b/msvc2005/remotetest/remotetest.vcproj new file mode 100644 index 00000000..68dc8440 --- /dev/null +++ b/msvc2005/remotetest/remotetest.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2005/ssleay32/build_ssleay32.bat b/msvc2005/ssleay32/build_ssleay32.bat new file mode 100644 index 00000000..fb33956e --- /dev/null +++ b/msvc2005/ssleay32/build_ssleay32.bat @@ -0,0 +1,55 @@ +@echo off +echo +++ +echo +++ building %*+++ +echo +++ + +setlocal ENABLEEXTENSIONS + +set PLATFORM=%1 +set CONFIG=%2 +set OutDir=%3 +set VCInstallDir=%4 +set ProjectDir=%5 +set SolutionDir=%6 +set Action=%7 + +echo +++ PLATFORM = %PLATFORM% +echo +++ CONFIG = %CONFIG% +echo +++ OutDir = %OutDir% +echo +++ VCInstallDir = %VCInstallDir% +echo +++ ProjectDir = %ProjectDir% +echo +++ SolutionDir = %SolutionDir% +echo +++ Action = %Action% +echo +++ +echo. + +@echo on +cd %PROJECTDIR%..\..\..\openssl +set BUILD=0 +if %ACTION% == rebuild set BUILD=build +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\ssleay32.lib set BUILD=build +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\libeay32.lib set BUILD=build +if %BUILD% == 0 GOTO POSTPROCESS + + +set SHARED=shared +if %CONFIG% == Debug set SHARED=no-shared +if %CONFIG% == Release set SHARED=no-shared + +if NOT EXIST %SolutionDir%bin\%PLATFORM%\%CONFIG%\ mkdir %SolutionDir%bin\%PLATFORM%\%CONFIG%\ + + copy/y %ProjectDir%..\openssl\%PLATFORM%\%CONFIG%\lib\*.lib %SolutionDir%bin\%PLATFORM%\%CONFIG%\ +if %SHARED% == shared copy/y %ProjectDir%..\openssl\%PLATFORM%\%CONFIG%\bin\*.dll %SolutionDir%bin\%PLATFORM%\%CONFIG%\ + +:POSTPROCESS + +set ERRORLEVEL=0 +echo OK +goto EOF + +:ERROR +set ERRORLEVEL=911 + +:EOF +rem That's all Folks +rem ---------------- diff --git a/msvc2005/ssleay32/ssleay32.vcproj b/msvc2005/ssleay32/ssleay32.vcproj new file mode 100644 index 00000000..2727eca9 --- /dev/null +++ b/msvc2005/ssleay32/ssleay32.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/samples/httptest.cpp b/samples/httptest.cpp index deae7d51..d2764a19 100644 --- a/samples/httptest.cpp +++ b/samples/httptest.cpp @@ -9,6 +9,11 @@ #include using namespace std; +#if defined(_MSC_VER) +#pragma comment(lib, "ws2_32.lib") +#pragma comment(lib, "wldap32.lib") +#endif + static int testSyntax(const char* arg) { if ( !arg ) {