diff --git a/Common/3dParty/boost/build.bat b/Common/3dParty/boost/build.bat index 9ab2e58d11..e834366caf 100644 --- a/Common/3dParty/boost/build.bat +++ b/Common/3dParty/boost/build.bat @@ -26,15 +26,15 @@ if not exist "%folder%" ( md %folder%\shared .\b2.exe --clean - .\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex --toolset=%TOOLSET% + .\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex --toolset=%TOOLSET% || goto :error XCOPY /Y stage\lib\* "%folder%\static\" .\b2.exe --clean - .\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex --toolset=%TOOLSET% + .\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex --toolset=%TOOLSET% || goto :error XCOPY /Y stage\lib\* "%folder%\static_fpic\" .\b2.exe --clean - .\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex --toolset=%TOOLSET% + .\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex --toolset=%TOOLSET% || goto :error XCOPY /Y stage\lib\* "%folder%\shared\" ) @@ -54,14 +54,20 @@ if not exist "%folder%" ( md %folder%\shared .\b2.exe --clean - .\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex address-model=64 --toolset=%TOOLSET% + .\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex address-model=64 --toolset=%TOOLSET% || goto :error XCOPY /Y stage\lib\* "%folder%\static\" .\b2.exe --clean - .\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex address-model=64 --toolset=%TOOLSET% + .\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex address-model=64 --toolset=%TOOLSET% || goto :error XCOPY /Y stage\lib\* "%folder%\static_fpic\" .\b2.exe --clean - .\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex address-model=64 --toolset=%TOOLSET% + .\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex address-model=64 --toolset=%TOOLSET% || goto :error XCOPY /Y stage\lib\* "%folder%\shared\" ) + +exit + +:error +echo "Failed with error #%errorlevel%." +exit /b %errorlevel% diff --git a/Common/3dParty/curl/build.bat b/Common/3dParty/curl/build.bat deleted file mode 100644 index 829c0a8402..0000000000 --- a/Common/3dParty/curl/build.bat +++ /dev/null @@ -1,43 +0,0 @@ -SET SCRIPTPATH=%~dp0 -CD /D %~dp0 -SET MACHINE=x86 -if defined ProgramFiles(x86) ( - SET MACHINE=x64 -) - -if "%TARGET%" == "win-32" ( - SET MACHINE=x86 -) - -if "%TARGET%" == "win-64" ( - SET MACHINE=x64 -) - -if "%MACHINE%" == "x86" ( - SET OUTPUT=win_32 -) - -if "%MACHINE%" == "x64" ( - SET OUTPUT=win_64 -) - -SET VC=%ProgramFiles%\Microsoft Visual Studio 12.0\VC -SET VC64=%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC -if exist %VC64% ( - SET VC=%VC64% -) - -call "%VC%\vcvarsall.bat" %MACHINE% - -cd curl -call buildconf.bat -cd winbuild -nmake /f Makefile.vc mode=static ENABLE_WINSSL=yes MACHINE=%MACHINE% VC=12 - -if not exist "%SCRIPTPATH%%OUTPUT%" ( - md %SCRIPTPATH%%OUTPUT%\build - xcopy /Y /S ..\builds\libcurl-vc12-%MACHINE%-release-static-ipv6-sspi-winssl\lib\libcurl_a.lib %SCRIPTPATH%%OUTPUT%\build\ - move %SCRIPTPATH%%OUTPUT%\build\libcurl_a.lib %SCRIPTPATH%%OUTPUT%\build\curl.lib -) - -cd ..\.. diff --git a/Common/3dParty/curl/build.sh b/Common/3dParty/curl/build.sh deleted file mode 100755 index 693a39b896..0000000000 --- a/Common/3dParty/curl/build.sh +++ /dev/null @@ -1,73 +0,0 @@ -SCRIPT=$(readlink -f "$0" || grealpath "$0") -SCRIPTPATH=$(dirname "$SCRIPT") - -os=$(uname -s) -platform="" - -case "$os" in - Linux*) - platform="linux" - BUILD_PLATFORM=Linux - ;; - Darwin*) - platform="mac" - BUILD_PLATFORM=MacOSX - ;; - *) exit ;; -esac - - -architecture=$(uname -m) -arch="" - -case "$architecture" in - x86_64*) arch="_64" ;; - *) arch="_32" ;; -esac - -if [[ -d "$SCRIPTPATH/$platform$arch" ]] -then - echo -else - mkdir "$SCRIPTPATH/$platform$arch" -fi - -CURL_FOLDER=curl -cd ${CURL_FOLDER} - -if [[ ! -f configure ]] -then - ./buildconf -fi - -if [[ ! -f Makefile ]] -then - ./configure \ - --disable-shared \ - --enable-static \ - --disable-ldap \ - --disable-sspi \ - --without-librtmp \ - --disable-ftp \ - --disable-file \ - --disable-dict \ - --disable-telnet \ - --disable-tftp \ - --disable-rtsp \ - --disable-pop3 \ - --disable-imap \ - --disable-smtp \ - --disable-gopher \ - --disable-smb \ - --without-libidn -fi - -make - -if [ ! -d "$SCRIPTPATH/$platform$arch/build" ] -then - DESTDIR="$SCRIPTPATH/$platform$arch" make install - mkdir -p "$SCRIPTPATH/$platform$arch/build" - cp "$SCRIPTPATH/$platform$arch/usr/local/lib/libcurl.a" "$SCRIPTPATH/$platform$arch/build/" -fi - diff --git a/Common/3dParty/curl/curl.pri b/Common/3dParty/curl/curl.pri deleted file mode 100644 index 7a85630ab3..0000000000 --- a/Common/3dParty/curl/curl.pri +++ /dev/null @@ -1,5 +0,0 @@ -core_linux { - INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include - - LIBS += -lcurl -} diff --git a/Common/3dParty/curl/fetch.bat b/Common/3dParty/curl/fetch.bat deleted file mode 100644 index c28dd9de92..0000000000 --- a/Common/3dParty/curl/fetch.bat +++ /dev/null @@ -1,7 +0,0 @@ -CD /D %~dp0 -SET CURL_FOLDER=curl -IF NOT EXIST %CURL_FOLDER% CALL git clone https://github.com/curl/curl.git %CURL_FOLDER% -CD %CURL_FOLDER% -CALL git fetch -CALL git checkout curl-7_54_1 -CD .. \ No newline at end of file diff --git a/Common/3dParty/curl/fetch.sh b/Common/3dParty/curl/fetch.sh deleted file mode 100755 index 6837d7285e..0000000000 --- a/Common/3dParty/curl/fetch.sh +++ /dev/null @@ -1,8 +0,0 @@ -CURL_FOLDER=curl -if [ ! -d ${CURL_FOLDER} ]; then - git clone https://github.com/curl/curl.git ${CURL_FOLDER} -fi -cd ${CURL_FOLDER} -git fetch -git checkout curl-7_54_1 -cd .. diff --git a/Common/3dParty/make.bat b/Common/3dParty/make.bat index 6ba6bcc18e..9e0a94b5a5 100644 --- a/Common/3dParty/make.bat +++ b/Common/3dParty/make.bat @@ -14,7 +14,13 @@ FOR /f "tokens=*" %%i in ('DIR /a:d /b *') DO ( ECHO %%i if exist %%i/build.bat ( - call %%i/build.bat + call %%i/build.bat || goto :error ) ) + +exit + +:error +echo "Failed with error #%errorlevel%." +exit /b %errorlevel% \ No newline at end of file diff --git a/Common/3dParty/v8/build.bat b/Common/3dParty/v8/build.bat index f785195e8e..18a79f01ef 100644 --- a/Common/3dParty/v8/build.bat +++ b/Common/3dParty/v8/build.bat @@ -9,19 +9,25 @@ call powershell -File .\fix-static_crt.ps1 cd v8 call gn gen out.gn/win_64/release --args="is_debug=false target_cpu=\"x64\" v8_target_cpu=\"x64\" v8_static_library=true is_component_build=false v8_use_snapshot=false is_clang=false" -call ninja -C out.gn/win_64/release +call ninja -C out.gn/win_64/release || goto :error call gn gen out.gn/win_64/debug --args="is_debug=true target_cpu=\"x64\" v8_target_cpu=\"x64\" v8_static_library=true is_component_build=false v8_use_snapshot=false is_clang=false" -call ninja -C out.gn/win_64/debug +call ninja -C out.gn/win_64/debug || goto :error call gn gen out.gn/win_32/release --args="is_debug=false target_cpu=\"x86\" v8_target_cpu=\"x86\" v8_static_library=true is_component_build=false v8_use_snapshot=false is_clang=false" -call ninja -C out.gn/win_32/release +call ninja -C out.gn/win_32/release || goto :error call gn gen out.gn/win_32/debug --args="is_debug=true target_cpu=\"x86\" v8_target_cpu=\"x86\" v8_static_library=true is_component_build=false v8_use_snapshot=false is_clang=false" -call ninja -C out.gn/win_32/debug +call ninja -C out.gn/win_32/debug || goto :error rem v8_use_snapshot=true v8_use_external_startup_data=true if not "%BUILD_PLATFORM%"=="%BUILD_PLATFORM:xp=%" ( - call %~dp0v8_xp\build.bat + call %~dp0v8_xp\build.bat || goto :error cd %~dp0 -) \ No newline at end of file +) + +exit + +:error +echo "Failed with error #%errorlevel%." +exit /b %errorlevel% \ No newline at end of file diff --git a/Common/3dParty/v8/v8_xp/build.bat b/Common/3dParty/v8/v8_xp/build.bat index 0b2bef87c5..dba45b4403 100644 --- a/Common/3dParty/v8/v8_xp/build.bat +++ b/Common/3dParty/v8/v8_xp/build.bat @@ -27,8 +27,8 @@ if not exist "win_32" ( cd "%SCRIPTPATH%v8\tools\gyp" - call devenv v8.sln /Rebuild "Release" - call devenv v8.sln /Rebuild "Debug" + call devenv v8.sln /Rebuild "Release" || goto :error + call devenv v8.sln /Rebuild "Debug" || goto :error cd "%SCRIPTPATH%" @@ -51,8 +51,8 @@ if not exist "win_64" ( cd "%SCRIPTPATH%v8\tools\gyp" - call devenv v8.sln /Rebuild "Release" - call devenv v8.sln /Rebuild "Debug" + call devenv v8.sln /Rebuild "Release" || goto :error + call devenv v8.sln /Rebuild "Debug" || goto :error cd "%SCRIPTPATH%" @@ -62,3 +62,9 @@ if not exist "win_64" ( XCOPY /Y "v8\build\Debug\lib\*" "win_64\debug\" XCOPY /Y "v8\build\Debug\icudt.dll" "win_64\debug\" ) + +exit + +:error +echo "Failed with error #%errorlevel%." +exit /b %errorlevel% \ No newline at end of file