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

Merge pull request #5 from ONLYOFFICE/release/v4.0

Browse Source 
Release/v4.0
This commit is contained in:
Alexander Trofimov
2016-06-24 14:58:56 +03:00
committed by GitHub
parent c4f9ae9326 0ffb3a4a3c
commit 6e969df549
6 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -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

19
FileConverter/bin/DoctRenderer.config Normal file
View File

@ -0,0 +1,19 @@
<Settings>
<file>../../../sdkjs/common/Native/native.js</file>
<file>../../../sdkjs/common/Native/jquery_native.js</file>
<file>../../../web-apps/vendor/xregexp/xregexp-all-min.js</file>
<file>../../../sdkjs/common/AllFonts.js</file>
<htmlfile>../../../web-apps/vendor/jquery/jquery.min.js</htmlfile>
<DoctSdk>
<file>../../../sdkjs/word/sdk-all-min.js</file>
<file>../../../sdkjs/word/sdk-all.js</file>
</DoctSdk>
<PpttSdk>
<file>../../../sdkjs/slide/sdk-all-min.js</file>
<file>../../../sdkjs/slide/sdk-all.js</file>
</PpttSdk>
<XlstSdk>
<file>../../../sdkjs/cell/sdk-all-min.js</file>
<file>../../../sdkjs/cell/sdk-all.js</file>
</XlstSdk>
</Settings>

1
Makefile
View File

@ -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

1
package.json
View File

@ -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",

10
run-mac.command
View File

@ -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"

9
run.bat
View File

@ -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 ----------------------------------------