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

Remove HtmlFileInternal from xp build

Browse Source
This commit is contained in:
Oleg Korshul
2019-07-03 18:46:55 +03:00
parent 2b9feb83c5
commit 547dbd93a8
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
build.pro
View File

@ -17,6 +17,13 @@ build_xp {
CONFIG += ordered
core_mac {
CONFIG += no_use_htmlfileinternal
}
build_xp {
CONFIG += no_use_htmlfileinternal
}
SUBDIRS = \
cryptopp \
\
@ -47,7 +54,7 @@ SUBDIRS = \
xlsformat \
x2t
!core_mac {
!no_use_htmlfileinternal {
SUBDIRS += htmlfileinternal
}
@ -109,8 +116,10 @@ htmlfile.makefile = $$CORE_ROOT_DIR/HtmlFile/Makefile.HtmlFile$$PRO_SUF
doctrenderer.file = $$CORE_ROOT_DIR/DesktopEditor/doctrenderer/doctrenderer.pro
doctrenderer.makefile = $$CORE_ROOT_DIR/DesktopEditor/doctrenderer/Makefile.doctrenderer$$PRO_SUFFIX
htmlfileinternal.file = $$ROOT_DIR/desktop-sdk/HtmlFile/Internal/Internal.pro
htmlfileinternal.makefile = $$ROOT_DIR/desktop-sdk/HtmlFile/Internal/Makefile.Internal$$PRO_SUFFIX
!no_use_htmlfileinternal {
htmlfileinternal.file = $$ROOT_DIR/desktop-sdk/HtmlFile/Internal/Internal.pro
htmlfileinternal.makefile = $$ROOT_DIR/desktop-sdk/HtmlFile/Internal/Makefile.Internal$$PRO_SUFFIX
}
allfontsgen.file = $$CORE_ROOT_DIR/DesktopEditor/AllFontsGen/AllFontsGen.pro
allfontsgen.makefile = $$CORE_ROOT_DIR/DesktopEditor/AllFontsGen/Makefile.AllFontsGen$$PRO_SUFFIX
@ -191,7 +200,9 @@ pdfreader.depends = kernel unicodeconverter graphics pdfwriter htmlrende
htmlfile.depends = kernel unicodeconverter graphics
doctrenderer.depends = kernel unicodeconverter graphics
htmlfileinternal.depends = kernel unicodeconverter graphics
!no_use_htmlfileinternal {
htmlfileinternal.depends = kernel unicodeconverter graphics
}
allfontsgen.depends = kernel unicodeconverter graphics

12
scripts/deploy.pro
View File

@ -92,7 +92,9 @@ desktop {
copyDirectory($$ROOT_GIT_DIR/desktop-apps/common/converter/empty, $$CUR_ROOT/converter/empty)
!core_mac {
copyFile($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT/HtmlFileInternal$$EXE_EXT, $$CUR_ROOT/HtmlFileInternal$$EXE_EXT)
!build_xp {
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)
@ -275,9 +277,11 @@ builder {
!build_xp {
!core_mac {
createDirectory($$CUR_ROOT/HtmlFileInternal)
copyFile($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT/HtmlFileInternal$$EXE_EXT, $$CUR_ROOT/HtmlFileInternal/HtmlFileInternal$$EXE_EXT)
copyDirectory($$ROOT_GIT_DIR/core/Common/3dParty/cef/$$OS_CURRENT/build, $$CUR_ROOT/HtmlFileInternal/.)
!build_xp {
createDirectory($$CUR_ROOT/HtmlFileInternal)
copyFile($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT/HtmlFileInternal$$EXE_EXT, $$CUR_ROOT/HtmlFileInternal/HtmlFileInternal$$EXE_EXT)
copyDirectory($$ROOT_GIT_DIR/core/Common/3dParty/cef/$$OS_CURRENT/build, $$CUR_ROOT/HtmlFileInternal/.)
}
}
core_windows {