Commit 470eddf2 authored by Alexey Golubev's avatar Alexey Golubev

Merge

parents 438ba3ad 3813be21
...@@ -5,6 +5,9 @@ if exist "depot_tools" ( ...@@ -5,6 +5,9 @@ if exist "depot_tools" (
echo "depot_tools already fetched" echo "depot_tools already fetched"
) else ( ) else (
call git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git call git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
CD depot_tools
git reset --hard e29cf7cb78009c80b04ddeab04763e8d218937c2
CD ../
call powershell -File .\fix-depot_tools.ps1 call powershell -File .\fix-depot_tools.ps1
) )
......
...@@ -546,6 +546,7 @@ namespace NSDoctRenderer ...@@ -546,6 +546,7 @@ namespace NSDoctRenderer
std::wstring m_strFilePath; std::wstring m_strFilePath;
std::wstring m_strAllFonts; std::wstring m_strAllFonts;
bool m_bIsNotUseConfigAllFontsDir;
std::wstring m_sTmpFolder; std::wstring m_sTmpFolder;
std::wstring m_sFileDir; std::wstring m_sFileDir;
...@@ -585,6 +586,8 @@ namespace NSDoctRenderer ...@@ -585,6 +586,8 @@ namespace NSDoctRenderer
m_sGlobalVariable = ""; m_sGlobalVariable = "";
m_bIsGlobalVariableUse = false; m_bIsGlobalVariableUse = false;
m_bIsNotUseConfigAllFontsDir = false;
} }
void Init() void Init()
...@@ -634,7 +637,7 @@ namespace NSDoctRenderer ...@@ -634,7 +637,7 @@ namespace NSDoctRenderer
oNodes.GetAt(i, _node); oNodes.GetAt(i, _node);
std::wstring strFilePath = _node.GetText(); std::wstring strFilePath = _node.GetText();
if (std::wstring::npos != strFilePath.find(L"AllFonts.js")) if (std::wstring::npos != strFilePath.find(L"AllFonts.js") && !m_bIsNotUseConfigAllFontsDir)
{ {
m_strAllFonts = strFilePath; m_strAllFonts = strFilePath;
...@@ -1717,6 +1720,11 @@ namespace NSDoctRenderer ...@@ -1717,6 +1720,11 @@ namespace NSDoctRenderer
m_pInternal->m_bIsCacheScript = (std::wstring(value) == L"true"); m_pInternal->m_bIsCacheScript = (std::wstring(value) == L"true");
else if (sParam == "--save-use-only-names") else if (sParam == "--save-use-only-names")
m_pInternal->m_sFolderForSaveOnlyUseNames = std::wstring(value); m_pInternal->m_sFolderForSaveOnlyUseNames = std::wstring(value);
else if (sParam == "--all-fonts-path")
{
m_pInternal->m_strAllFonts = std::wstring(value);
m_pInternal->m_bIsNotUseConfigAllFontsDir = true;
}
else if (sParam == "--argument") else if (sParam == "--argument")
{ {
std::wstring sArg(value); std::wstring sArg(value);
......
...@@ -43,9 +43,11 @@ endif ...@@ -43,9 +43,11 @@ endif
TARGET := $(PLATFORM)_$(ARCHITECTURE) TARGET := $(PLATFORM)_$(ARCHITECTURE)
LIBDIR := build/lib/$(TARGET) LIBDIR := build/lib/$(TARGET)
BINDIR := build/bin/$(TARGET)
ALLFONTSGEN := build/bin/AllFontsGen/$(TARGET)$(EXEC_EXT) ALLFONTSGEN := build/bin/AllFontsGen/$(TARGET)$(EXEC_EXT)
X2T := build/bin/$(TARGET)/x2t$(EXEC_EXT) X2T := $(BINDIR)/x2t$(EXEC_EXT)
DOCBUILDER := $(BINDIR)/docbuilder$(EXEC_EXT)
HTMLFILEINTERNAL := $(LIBDIR)/HtmlFileInternal$(EXEC_EXT) HTMLFILEINTERNAL := $(LIBDIR)/HtmlFileInternal$(EXEC_EXT)
XLSFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)XlsFormatLib$(LIB_EXT) XLSFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)XlsFormatLib$(LIB_EXT)
ODFFILEWRITERLIB := $(LIBDIR)/$(LIB_PREFIX)OdfFileWriterLib$(LIB_EXT) ODFFILEWRITERLIB := $(LIBDIR)/$(LIB_PREFIX)OdfFileWriterLib$(LIB_EXT)
...@@ -75,6 +77,7 @@ HUNSPELL := $(LIBDIR)/$(LIB_PREFIX)hunspell$(SHARED_EXT) ...@@ -75,6 +77,7 @@ HUNSPELL := $(LIBDIR)/$(LIB_PREFIX)hunspell$(SHARED_EXT)
TARGETS += $(ALLFONTSGEN) TARGETS += $(ALLFONTSGEN)
TARGETS += $(X2T) TARGETS += $(X2T)
TARGETS += $(DOCBUILDER)
TARGETS += $(HTMLFILEINTERNAL) TARGETS += $(HTMLFILEINTERNAL)
TARGETS += $(XLSFORMATLIB) TARGETS += $(XLSFORMATLIB)
TARGETS += $(ODFFILEWRITERLIB) TARGETS += $(ODFFILEWRITERLIB)
...@@ -105,6 +108,7 @@ TARGETS += $(HUNSPELL) ...@@ -105,6 +108,7 @@ TARGETS += $(HUNSPELL)
X2T_PRO := $(abspath X2tConverter/build/Qt/X2tSLN.pro) X2T_PRO := $(abspath X2tConverter/build/Qt/X2tSLN.pro)
HTMLFILEINTERNAL_PRO := $(abspath ../desktop-sdk/HtmlFile/Internal/Internal.pro) HTMLFILEINTERNAL_PRO := $(abspath ../desktop-sdk/HtmlFile/Internal/Internal.pro)
ALLFONTSGEN_PRO := $(abspath DesktopEditor/AllFontsGen/AllFontsGen.pro) ALLFONTSGEN_PRO := $(abspath DesktopEditor/AllFontsGen/AllFontsGen.pro)
DOCBUILDER_PRO := $(abspath ../core-ext/docbuilder/test_builder/docbuilder.pro)
XLSFORMATLIB_PRO := $(abspath ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro) XLSFORMATLIB_PRO := $(abspath ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro)
ODFFILEWRITERLIB_PRO := $(abspath ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro) ODFFILEWRITERLIB_PRO := $(abspath ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro)
ODFFILEREADERLIB_PRO := $(abspath ASCOfficeOdfFile/linux/OdfFileReaderLib.pro) ODFFILEREADERLIB_PRO := $(abspath ASCOfficeOdfFile/linux/OdfFileReaderLib.pro)
...@@ -157,6 +161,7 @@ HUNSPELL_PRO := $(abspath DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pro) ...@@ -157,6 +161,7 @@ HUNSPELL_PRO := $(abspath DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pro)
QT_PROJ += X2T QT_PROJ += X2T
QT_PROJ += HTMLFILEINTERNAL QT_PROJ += HTMLFILEINTERNAL
QT_PROJ += ALLFONTSGEN QT_PROJ += ALLFONTSGEN
QT_PROJ += DOCBUILDER
QT_PROJ += XLSFORMATLIB QT_PROJ += XLSFORMATLIB
QT_PROJ += ODFFILEWRITERLIB QT_PROJ += ODFFILEWRITERLIB
QT_PROJ += ODFFILEREADERLIB QT_PROJ += ODFFILEREADERLIB
...@@ -214,6 +219,8 @@ ALLFONTSGEN_DEP += $(GRAPHICS) ...@@ -214,6 +219,8 @@ ALLFONTSGEN_DEP += $(GRAPHICS)
ALLFONTSGEN_DEP += $(OFFICEUTILS) ALLFONTSGEN_DEP += $(OFFICEUTILS)
ALLFONTSGEN_DEP += $(UNICODECONVERTER) ALLFONTSGEN_DEP += $(UNICODECONVERTER)
DOCBUILDER_DEP += $(DOCTRENDERER)
HTMLFILE_DEP += $(UNICODECONVERTER) HTMLFILE_DEP += $(UNICODECONVERTER)
RTFFORMATLIB_DEP += $(UNICODECONVERTER) RTFFORMATLIB_DEP += $(UNICODECONVERTER)
...@@ -271,7 +278,7 @@ bin: $(X2T) $(ALLFONTSGEN) ...@@ -271,7 +278,7 @@ bin: $(X2T) $(ALLFONTSGEN)
lib: $(PDFWRITER) $(DOCTRENDERER) $(HTMLRENDERER) $(PDFREADER) $(DJVUFILE) $(XPSFILE) $(HTMLFILE) $(UNICODECONVERTER) lib: $(PDFWRITER) $(DOCTRENDERER) $(HTMLRENDERER) $(PDFREADER) $(DJVUFILE) $(XPSFILE) $(HTMLFILE) $(UNICODECONVERTER)
ext: $(ASCDOCUMENTSCORE) $(HTMLFILEINTERNAL) ext: $(ASCDOCUMENTSCORE) $(HTMLFILEINTERNAL) $(DOCBUILDER)
$(foreach proj, $(QT_PROJ), $(eval $(call build_proj_tmpl, $(proj)))) $(foreach proj, $(QT_PROJ), $(eval $(call build_proj_tmpl, $(proj))))
...@@ -283,6 +290,8 @@ $(XPSFILE): $(XPSFILE_DEP) ...@@ -283,6 +290,8 @@ $(XPSFILE): $(XPSFILE_DEP)
$(ALLFONTSGEN): $(ALLFONTSGEN_DEP) $(ALLFONTSGEN): $(ALLFONTSGEN_DEP)
$(DOCBUILDER): $(DOCBUILDER_DEP)
$(HTMLFILE): $(HTMLFILE_DEP) $(HTMLFILE): $(HTMLFILE_DEP)
$(RTFFORMATLIB): $(RTFFORMATLIB_DEP) $(RTFFORMATLIB): $(RTFFORMATLIB_DEP)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment