diff --git a/.gitignore b/.gitignore index f810a9dc..b181a8b7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,13 @@ Common/config/local.json license.lic App_Data/ */node_modules -FileConverter/Bin +FileConverter/bin/*.dll +FileConverter/bin/*.dylib +FileConverter/bin/*.exe +FileConverter/bin/x2t +FileConverter/bin/*.S +FileConverter/bin/font_selection.bin +FileConverter/bin/HtmlFileInternal DocService/npm-debug.log build node_modules \ No newline at end of file diff --git a/FileConverter/bin/DoctRenderer.config b/FileConverter/bin/DoctRenderer.config new file mode 100644 index 00000000..fc465ac5 --- /dev/null +++ b/FileConverter/bin/DoctRenderer.config @@ -0,0 +1,19 @@ + + ../../../sdkjs/common/Native/native.js + ../../../sdkjs/common/Native/jquery_native.js + ../../../web-apps/vendor/xregexp/xregexp-all-min.js + ../../../sdkjs/common/AllFonts.js + ../../../web-apps/vendor/jquery/jquery.min.js + + ../../../sdkjs/word/sdk-all-min.js + ../../../sdkjs/word/sdk-all.js + + + ../../../sdkjs/slide/sdk-all-min.js + ../../../sdkjs/slide/sdk-all.js + + + ../../../sdkjs/cell/sdk-all-min.js + ../../../sdkjs/cell/sdk-all.js + + \ No newline at end of file diff --git a/Makefile b/Makefile index 57ad4a91..c24d2461 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ GRUNT_FILES = Gruntfile.js.out FILE_CONVERTER = $(OUTPUT)/FileConverter/bin FILE_CONVERTER_FILES += ../core/build/lib/linux_64/*.so -FILE_CONVERTER_FILES += ../core/build/lib/DoctRenderer.config FILE_CONVERTER_FILES += ../core/build/bin/icu/linux_64/*.so* FILE_CONVERTER_FILES += ../core/build/bin/linux/x2t FILE_CONVERTER_FILES += ../core/build/bin/linux/icudtl_dat.S diff --git a/package.json b/package.json index 7ab8640e..e7a3ff65 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "./DocService/package.json", "./DocService/public/healthcheck.docx", "./FileConverter/package.json", + "./FileConverter/bin/DoctRenderer.config", "./Metrics/package.json", "./SpellChecker/package.json", "./Common/config/*.json", diff --git a/run-mac.command b/run-mac.command index 09a5c885..e9b352be 100755 --- a/run-mac.command +++ b/run-mac.command @@ -25,10 +25,10 @@ RunCommand() { } CreateDir "$BASEDIR/App_Data" -CreateDir "$BASEDIR/FileConverter/Bin" -CreateDir "$BASEDIR/FileConverter/Bin/HtmlFileInternal" +CreateDir "$BASEDIR/FileConverter/bin" +CreateDir "$BASEDIR/FileConverter/bin/HtmlFileInternal" -cd "$BASEDIR/FileConverter/Bin" +cd "$BASEDIR/FileConverter/bin" cp -v "../../../core/build/bin/mac/icudtl_dat.S" "." cp -v "../../../core/build/bin/mac/x2t" "." @@ -54,7 +54,7 @@ sed "s/$SEARCH/$REPLACE/g" "../../../core/build/lib/DoctRenderer.config" > "Doct echo $BASEDIR chmod -v +x $BASEDIR/../core/build/bin/AllFontsGen/mac_64 -bash -cv "$BASEDIR/../core/build/bin/AllFontsGen/mac_64 '' '$BASEDIR/../sdkjs/Common/AllFonts.js' '$BASEDIR/../sdkjs/Common/Images' '$BASEDIR/FileConverter/Bin/font_selection.bin'" +bash -cv "$BASEDIR/../core/build/bin/AllFontsGen/mac_64 '' '$BASEDIR/../sdkjs/Common/AllFonts.js' '$BASEDIR/../sdkjs/Common/Images' '$BASEDIR/FileConverter/bin/font_selection.bin'" echo "----------------------------------------" @@ -78,6 +78,6 @@ RunCommand "redis-server /usr/local/etc/redis.conf" RunCommand "export NODE_CONFIG_DIR=$BASEDIR/Common/config && export NODE_ENV=development-mac && cd $BASEDIR/DocService/sources && node server.js" RunCommand "export NODE_CONFIG_DIR=$BASEDIR/Common/config && export NODE_ENV=development-mac && cd $BASEDIR/DocService/sources && node gc.js" -RunCommand "export NODE_CONFIG_DIR=$BASEDIR/Common/config && export NODE_ENV=development-mac && export DYLD_LIBRARY_PATH=../../FileConverter/Bin/ && cd $BASEDIR/FileConverter/sources && node convertermaster.js" +RunCommand "export NODE_CONFIG_DIR=$BASEDIR/Common/config && export NODE_ENV=development-mac && export DYLD_LIBRARY_PATH=../../FileConverter/bin/ && cd $BASEDIR/FileConverter/sources && node convertermaster.js" diff --git a/run.bat b/run.bat index dc112586..e489657d 100644 --- a/run.bat +++ b/run.bat @@ -6,14 +6,13 @@ ECHO copy file to converter ECHO ---------------------------------------- mkdir "%~dp0\App_Data" -mkdir "%~dp0\FileConverter\Bin" -mkdir "%~dp0\FileConverter\Bin\HtmlFileInternal" +mkdir "%~dp0\FileConverter\bin" +mkdir "%~dp0\FileConverter\bin\HtmlFileInternal" -cd /D "%~dp0\FileConverter\Bin" || goto ERROR +cd /D "%~dp0\FileConverter\bin" || goto ERROR copy "..\..\..\core\build\bin\windows\icudt.dll" "." copy "..\..\..\core\build\bin\icu\win_32\icudt55.dll" "." copy "..\..\..\core\build\bin\icu\win_32\icuuc55.dll" "." -copy "..\..\..\core\build\lib\DoctRenderer.config" "." copy "..\..\..\core\build\lib\win_32\doctrenderer.dll" "." copy "..\..\..\core\build\lib\win_32\HtmlRenderer.dll" "." copy "..\..\..\core\build\lib\win_32\DjVuFile.dll" "." @@ -26,7 +25,7 @@ copy "..\..\..\core\build\lib\win_32\HtmlFileInternal.exe" ".\HtmlFileInternal" xcopy /s/h/e/k/c/y/q "..\..\..\core\build\cef\win_32" ".\HtmlFileInternal" copy "..\..\..\core\build\bin\windows\x2t32.exe" "." -"..\..\..\core\build\bin\AllFontsGen\windows_32.exe" "%windir%\Fonts" "%~dp0\..\sdkjs\common\AllFonts.js" "%~dp0\..\sdkjs\common\Images" "%~dp0\FileConverter\Bin\font_selection.bin" +"..\..\..\core\build\bin\AllFontsGen\windows_32.exe" "%windir%\Fonts" "%~dp0\..\sdkjs\common\AllFonts.js" "%~dp0\..\sdkjs\common\Images" "%~dp0\FileConverter\bin\font_selection.bin" ECHO. ECHO ----------------------------------------