Mirrors/OnlyOffice-build-tools
1
0
Fork 0
mirror of https://github.com/ONLYOFFICE/build_tools.git synced 2025-12-22 09:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

developing...

Browse Source
This commit is contained in:
Oleg Korshul
2019-05-24 11:38:11 +03:00
parent a25ccd2e05
commit d0bdc937ed
6 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored Normal file
View File

@@ -0,0 +1,4 @@
out/
makefiles/
.qmake.stash
config.json

15
make.bat
View File

@@ -8,10 +8,6 @@ call %~dp0scripts\json_value.bat config OO_CONFIG no_vlc
call %~dp0scripts\json_value.bat deploy OO_DEPLOY 1
call %~dp0scripts\json_value.bat install OO_INSTALL 1
set "ADDITIONAL_COMMAND="
if %OO_DEPLOY%=="1" ( set "ADDITIONAL_COMMAND=%ADDITIONAL_COMMAND% deploy" )
if %OO_INSTALL%=="1" ( set "ADDITIONAL_COMMAND=%ADDITIONAL_COMMAND% install" )
if "%OO_UPDATE%"=="1" (
call scripts\git-fetch.bat core
call scripts\git-fetch.bat desktop-sdk
@@ -21,8 +17,6 @@ if "%OO_UPDATE%"=="1" (
if not "%OO_MODULE%"=="%OO_MODULE:desktop=%" (
call scripts\git-fetch.bat desktop-apps
call scripts\git-fetch.bat desktop-apps-ext
call scripts\git-fetch.bat core-ext
set "OO_CONFIG=%OO_CONFIG% desktop"
)
@@ -38,6 +32,13 @@ call "%OO_QT_DIR%\qmake" -nocache build.pro "CONFIG+=%OO_CONFIG%"
if "%OO_CLEAN%"=="1" (
call nmake clean -f "makefiles/build.makefile"
)
call nmake -f "makefiles/build.makefile" %ADDITIONAL_COMMAND%
call nmake -f "makefiles/build.makefile"
if %OO_DEPLOY%=="1" (
call scripts\deploy.bat
)
if %OO_INSTALL%=="1" (
call scripts\install.bat
)
endlocal

2
scripts/common.pri
View File

@@ -31,7 +31,7 @@ defineTest(createDirectory) {
win32:dir ~= s,/,\\,g
system($$QMAKE_CHK_DIR_EXISTS $$shell_quote($$dir) QMAKE_MKDIR $$shell_quote($$dir) $$escape_expand(\\n\\t))
system($$QMAKE_CHK_DIR_EXISTS $$shell_quote($$dir) $$QMAKE_MKDIR $$shell_quote($$dir) $$escape_expand(\\n\\t))
}
defineTest(removeDirectory) {

8
scripts/deploy.bat
View File

@@ -1,13 +1,13 @@
echo TODO: DEPLOY SCRIPT
call %~dp0json_value.bat module OO_MODULE "desktop builder"
cd %~dp0..
if exist "%PROGRAMFILES(X86)%" (
set OS_CURRENT=win_64
set OS_DEPLOY=win_64
) else (
set OS_CURRENT=win_32
set OS_DEPLOY=win_32
)
set "QT_DEPLOY=%OO_QT_DIR%"
call "%OO_QT_DIR%\qmake" -nocache %~dp0deploy.pro "CONFIG+=%OO_CONFIG% %OO_MODULE%"

29
scripts/deploy.pro
View File

@@ -6,6 +6,9 @@ MAKEFILE=$$PWD/../makefiles/deploy.makefile
include($$PWD/../../core/Common/base.pri)
include($$PWD/common.pri)
OS_CURRENT=$$(OS_DEPLOY)
QT_CURRENT=$$(QT_DEPLOY)
ROOT_GIT_DIR=$$PWD/../..
DEPLOY_DIR=$$PWD/../out
createDirectory($$DEPLOY_DIR)
@@ -37,33 +40,33 @@ desktop {
copyFile($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT/HtmlFileInternal$$EXE_EXT, $$CUR_ROOT/HtmlFileInternal$$EXE_EXT)
copyDirectory($$ROOT_GIT_DIR/dictionaries, $$CUR_ROOT/dictionaries)
removeDicrionary($$CUR_ROOT/dictionaries/.git)
removeDirectory($$CUR_ROOT/dictionaries/.git)
copyDirectory($$ROOT_GIT_DIR/desktop-apps/common/package/fonts, $$CUR_ROOT/fonts)
copyFile($$ROOT_GIT_DIR/desktop-apps/common/package/license/3dparty/3DPARTYLICENSE, $$CUR_ROOT/3DPARTYLICENSE)
copyFile($$ROOT_GIT_DIR/core/Common/3dParty/cef/$$OS_CURRENT/build/*, $$CUR_ROOT/.)
copyFile($$OO_QT_DIR/Qt5Core$$LIB_EXT, Qt5Core$$LIB_EXT)
copyFile($$OO_QT_DIR/Qt5Gui$$LIB_EXT, Qt5Gui$$LIB_EXT)
copyFile($$OO_QT_DIR/Qt5PrintSupport$$LIB_EXT, Qt5PrintSupport$$LIB_EXT)
copyFile($$OO_QT_DIR/Qt5Svg$$LIB_EXT, Qt5Svg$$LIB_EXT)
copyFile($$OO_QT_DIR/Qt5Widgets$$LIB_EXT, Qt5Widgets$$LIB_EXT)
copyFile($$QT_CURRENT/Qt5Core$$LIB_EXT, $$CUR_ROOT/Qt5Core$$LIB_EXT)
copyFile($$QT_CURRENT/Qt5Gui$$LIB_EXT, $$CUR_ROOT/Qt5Gui$$LIB_EXT)
copyFile($$QT_CURRENT/Qt5PrintSupport$$LIB_EXT, $$CUR_ROOT/Qt5PrintSupport$$LIB_EXT)
copyFile($$QT_CURRENT/Qt5Svg$$LIB_EXT, $$CUR_ROOT/Qt5Svg$$LIB_EXT)
copyFile($$QT_CURRENT/Qt5Widgets$$LIB_EXT, $$CUR_ROOT/Qt5Widgets$$LIB_EXT)
copyFile($$ROOT_GIT_DIR/core/build/bin/$$OS_CURRENT/hunspell$$EXE_EXT, $$CUR_ROOT/hunspell$$EXE_EXT)
copyFile($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT/hunspell$$LIB_EXT, $$CUR_ROOT/hunspell$$LIB_EXT)
copyFile($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT/videoplayer$$LIB_EXT, $$CUR_ROOT/videoplayer$$LIB_EXT)
copyFile($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT/ooxmlsignature$$LIB_EXT, $$CUR_ROOT/ooxmlsignature$$LIB_EXT)
copyFile($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT/ascdocumentscore$$LIB_EXT, $$CUR_ROOT/ascdocumentscore$$LIB_EXT)
copyQtPlugin($$OO_QT_DIR/../plugins/iconengines, $$CUR_ROOT/iconengines)
copyQtPlugin($$OO_QT_DIR/../plugins/imageformats, $$CUR_ROOT/imageformats)
copyQtPlugin($$OO_QT_DIR/../plugins/platforms, $$CUR_ROOT/platforms)
copyQtPlugin($$OO_QT_DIR/../plugins/printsupport, $$CUR_ROOT/printsupport)
copyQtPlugin($$OO_QT_DIR/../plugins/styles, $$CUR_ROOT/styles)
copyQtPlugin($$QT_CURRENT/../plugins/iconengines, $$CUR_ROOT/iconengines)
copyQtPlugin($$QT_CURRENT/../plugins/imageformats, $$CUR_ROOT/imageformats)
copyQtPlugin($$QT_CURRENT/../plugins/platforms, $$CUR_ROOT/platforms)
copyQtPlugin($$QT_CURRENT/../plugins/printsupport, $$CUR_ROOT/printsupport)
copyQtPlugin($$QT_CURRENT/../plugins/styles, $$CUR_ROOT/styles)
copyFile($$ROOT_GIT_DIR/desktop-apps/win-linux/extras/projicons/projicons.exe, $$CUR_ROOT/DesktopEditors.exe)
copyFile($$ROOT_GIT_DIR/desktop-apps/win-linux/DesktopEditors.exe, $$CUR_ROOT/editors.exe)
)
}
builder {

6
tests/deploy.bat Normal file
View File

@@ -0,0 +1,6 @@
set OO_QT_DIR=C:\Qt510\5.10.1\msvc2015_64\bin
set OO_QT_XP_DIR=C:\QtXP\5.10.1\msvc2015_64\bin
call "%~dp0..\scripts\deploy.bat"