Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

Common/3dParty/boost/build.bat

@@ -14,52 +14,52 @@ if exist "stage" (
 md build
 
 SET folder=build/win_32
-echo "x86..."
 
-if exist "%folder%" (
-	RMDIR "%folder%" /S /Q
+if not exist "%folder%" (
+  echo "x86..."
+  
+  md  %folder%
+  md  %folder%\static
+  md  %folder%\static_fpic
+  md  %folder%\shared
+
+  .\b2.exe --clean
+  .\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex
+  XCOPY /Y stage\lib\* "%folder%\static\"
+
+  .\b2.exe --clean
+  .\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex
+  XCOPY /Y stage\lib\* "%folder%\static_fpic\"
+
+  .\b2.exe --clean
+  .\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex
+  XCOPY /Y stage\lib\* "%folder%\shared\"
 )
-md  %folder%
-md  %folder%\static
-md  %folder%\static_fpic
-md  %folder%\shared
-
-.\b2.exe --clean
-.\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex
-XCOPY /Y stage\lib\* "%folder%\static\"
-
-.\b2.exe --clean
-.\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex
-XCOPY /Y stage\lib\* "%folder%\static_fpic\"
-
-.\b2.exe --clean
-.\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex
-XCOPY /Y stage\lib\* "%folder%\shared\"
 
 SET folder=build/win_64
-echo "x64..."
 
-if exist "%folder%" (
-	RMDIR "%folder%" /S /Q
-)
 
-if exist "stage" (
-	RMDIR "stage" /S /Q
-)
+if not exist "%folder%" (
+  echo "x64..."
+  
+  if exist "stage" (
+    RMDIR "stage" /S /Q
+  )
 
-md  %folder%
-md  %folder%\static
-md  %folder%\static_fpic
-md  %folder%\shared
+  md  %folder%
+  md  %folder%\static
+  md  %folder%\static_fpic
+  md  %folder%\shared
 
-.\b2.exe --clean
-.\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex address-model=64
-XCOPY /Y stage\lib\* "%folder%\static\"
+  .\b2.exe --clean
+  .\bjam.exe link=static --with-filesystem --with-system --with-date_time --with-regex address-model=64
+  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
-XCOPY /Y stage\lib\* "%folder%\static_fpic\"
+  .\b2.exe --clean
+  .\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time --with-regex address-model=64
+  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
-XCOPY /Y stage\lib\* "%folder%\shared\"
+  .\b2.exe --clean
+  .\bjam.exe link=shared --with-filesystem --with-system --with-date_time --with-regex address-model=64
+  XCOPY /Y stage\lib\* "%folder%\shared\"
+)
\ No newline at end of file

Common/3dParty/v8/build.bat

@@ -11,52 +11,50 @@ if defined ProgramFiles(x86) (
 	SET PATH=%ProgramFiles%\Microsoft Visual Studio 12.0\Common7\IDE;%PATH%
 )
 
-echo "building x86... -------------------------------------------"
+if not exist "win_32" (
+  echo "building x86... -------------------------------------------"
+  
+  md win_32
+  md win_32\debug
+  md win_32\release
 
-if exist "win_32" (
-	RMDIR "win_32" /S /Q
-)
-md win_32
-md win_32\debug
-md win_32\release
+  call python v8\build\gyp_v8
+  call .\change_projects.bat
 
-call python v8\build\gyp_v8
-call .\change_projects.bat
+  cd "%SCRIPTPATH%v8\tools\gyp"
 
-cd "%SCRIPTPATH%v8\tools\gyp"
+  call devenv v8.sln /Rebuild "Release"
+  call devenv v8.sln /Rebuild "Debug"
 
-call devenv v8.sln /Rebuild "Release"
-call devenv v8.sln /Rebuild "Debug"
+  cd "%SCRIPTPATH%"
 
-cd "%SCRIPTPATH%"
+  XCOPY /Y "v8\build\Release\lib\*" "win_32\release\"
+  XCOPY /Y "v8\build\Release\icudt.dll" "win_32\release\"
 
-XCOPY /Y "v8\build\Release\lib\*" "win_32\release\"
-XCOPY /Y "v8\build\Release\icudt.dll" "win_32\release\"
+  XCOPY /Y "v8\build\Debug\lib\*" "win_32\debug\"
+  XCOPY /Y "v8\build\Debug\icudt.dll" "win_32\debug\"
+)
 
-XCOPY /Y "v8\build\Debug\lib\*" "win_32\debug\"
-XCOPY /Y "v8\build\Debug\icudt.dll" "win_32\debug\"
+if not exist "win_64" (
+  echo "building x64... -------------------------------------------"
 
-echo "building x64... -------------------------------------------"
+  md win_64
+  md win_64\debug
+  md win_64\release
 
-if exist "win_64" (
-	RMDIR "win_64" /S /Q
-)
-md win_64
-md win_64\debug
-md win_64\release
+  call python v8\build\gyp_v8 -Dtarget_arch=x64
+  call .\change_projects.bat
 
-call python v8\build\gyp_v8 -Dtarget_arch=x64
-call .\change_projects.bat
+  cd "%SCRIPTPATH%v8\tools\gyp"
 
-cd "%SCRIPTPATH%v8\tools\gyp"
+  call devenv v8.sln /Rebuild "Release"
+  call devenv v8.sln /Rebuild "Debug"
 
-call devenv v8.sln /Rebuild "Release"
-call devenv v8.sln /Rebuild "Debug"
+  cd "%SCRIPTPATH%"
 
-cd "%SCRIPTPATH%"
+  XCOPY /Y "v8\build\Release\lib\*" "win_64\release\"
+  XCOPY /Y "v8\build\Release\icudt.dll" "win_64\release\"
 
-XCOPY /Y "v8\build\Release\lib\*" "win_64\release\"
-XCOPY /Y "v8\build\Release\icudt.dll" "win_64\release\"
-
-XCOPY /Y "v8\build\Debug\lib\*" "win_64\debug\"
-XCOPY /Y "v8\build\Debug\icudt.dll" "win_64\debug\"
+  XCOPY /Y "v8\build\Debug\lib\*" "win_64\debug\"
+  XCOPY /Y "v8\build\Debug\icudt.dll" "win_64\debug\"
+)

Common/3dParty/v8/fetch.bat

@@ -5,7 +5,7 @@ if exist "depot_tools" (
 	echo "depot_tools already fetched"
 ) else (
 	call git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-	call powershell -File .\fix-gclient.ps1
+	call powershell -File .\fix-depot_tools.ps1
 )
 
 SET PATH=%SCRIPTPATH%depot_tools;%SCRIPTPATH%depot_tools\python276_bin;%PATH%