pengjunjie/build_tools
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/build_tools.git synced 2026-04-07 14:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

developing

Browse Source
This commit is contained in:
Oleg Korshul
2019-06-26 15:41:51 +03:00
parent 8be9a296a0
commit 9be7ed1fab
2 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
make.bat
View File

@ -227,13 +227,37 @@ if "%OO_NO_BUILD_JS%"=="" (
call "%QMAKE_FOR_SCRIPTS%" -nocache %~dp0scripts\build_js.pro "CONFIG+=%OO_MODULE%"
)
if "%OO_DEPLOY%"=="1" (
call scripts\deploy.bat
if not "%OO_DEPLOY%"=="1" (
GOTO :end
)
endlocal
if "%IS_NEED_64%"=="1" (
call "%OO_VS_DIR%\vcvarsall.bat" x64
set "QT_DEPLOY=%OO_QT_DIR%\msvc2015_64\bin"
set "OS_DEPLOY=win_64"
call "!QT_DEPLOY!\qmake" -nocache %~dp0deploy.pro "CONFIG+=%OO_CONFIG% %OO_MODULE%"
)
if "%IS_NEED_32%"=="1" (
call "%OO_VS_DIR%\vcvarsall.bat" x86
set "QT_DEPLOY=%OO_QT_DIR%\msvc2015\bin"
set "OS_DEPLOY=win_32"
call "!QT_DEPLOY!\qmake" -nocache %~dp0deploy.pro "CONFIG+=%OO_CONFIG% %OO_MODULE%"
)
if "%IS_NEED_XP_64%"=="1" (
call "%OO_VS_DIR%\vcvarsall.bat" x64
set "QT_DEPLOY=%OO_QT_XP_DIR%\msvc2015_64\bin"
set "OS_DEPLOY=win_64"
call "!QT_DEPLOY!\qmake" -nocache %~dp0deploy.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% build_xp"
)
if "%IS_NEED_XP_32%"=="1" (
call "%OO_VS_DIR%\vcvarsall.bat" x86
set "QT_DEPLOY=%OO_QT_XP_DIR%\msvc2015\bin"
set "OS_DEPLOY=win_32"
call "!QT_DEPLOY!\qmake" -nocache %~dp0deploy.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% build_xp"
)
:end
endlocal
exit /b 0
:error

36
scripts/deploy.bat
View File

@ -14,11 +14,39 @@ cd %~dp0..
set "IS_NEED_64=0"
set "IS_NEED_32=0"
set "IS_NEED_XP_64=0"
set "IS_NEED_XP_32=0"
if not "%OO_PLATFORM%"=="%OO_PLATFORM:win_64_xp=%" (
set "IS_NEED_XP_64=1"
set "OO_PLATFORM=%OO_PLATFORM:win_64_xp=%"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:win_32_xp=%" (
set "IS_NEED_XP_32=1"
set "OO_PLATFORM=%OO_PLATFORM:win_32_xp=%"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:xp=%" (
set "IS_NEED_XP_64=1"
set "IS_NEED_XP_32=1"
set "OO_PLATFORM=%OO_PLATFORM:xp=%"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:all=%" (
set "IS_NEED_64=1"
set "IS_NEED_32=1"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:x64=%" (
set "IS_NEED_64=1"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:win_64=%" (
set "IS_NEED_64=1"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:x86=%" (
set "IS_NEED_32=1"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:win_32=%" (
set "IS_NEED_32=1"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:native=%" (
if exist "%PROGRAMFILES(X86)%" (
@ -40,19 +68,17 @@ if "%IS_NEED_32%"=="1" (
set "OS_DEPLOY=win_32"
call "!QT_DEPLOY!\qmake" -nocache %~dp0deploy.pro "CONFIG+=%OO_CONFIG% %OO_MODULE%"
)
if not "%OO_PLATFORM%"=="%OO_PLATFORM:xp=%" (
if "%IS_NEED_XP_64%"=="1" (
call "%OO_VS_DIR%\vcvarsall.bat" x64
set "QT_DEPLOY=%OO_QT_XP_DIR%\msvc2015_64\bin"
set "OS_DEPLOY=win_64"
call "!QT_DEPLOY!\qmake" -nocache %~dp0deploy.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% build_xp"
)
if "%IS_NEED_XP_32%"=="1" (
call "%OO_VS_DIR%\vcvarsall.bat" x86
set "QT_DEPLOY=%OO_QT_XP_DIR%\msvc2015\bin"
set "OS_DEPLOY=win_32"
call "!QT_DEPLOY!\qmake" -nocache %~dp0deploy.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% build_xp"
)
endlocal