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

Bin -> bin

Browse Source
This commit is contained in:
Alexey.Golubev
2016-06-24 12:09:08 +03:00
parent 383ed7779f
commit 93659e608a
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@ -3,9 +3,13 @@ Common/config/local.json
license.lic license.lic
App_Data/ App_Data/
*/node_modules */node_modules
FileConverter/Bin/*.dll FileConverter/bin/*.dll
FileConverter/Bin/*.exe FileConverter/bin/*.dylib
FileConverter/Bin/HtmlFileInternal FileConverter/bin/*.exe
FileConverter/bin/x2t
FileConverter/bin/*.S
FileConverter/bin/font_selection.bin
FileConverter/bin/HtmlFileInternal
DocService/npm-debug.log DocService/npm-debug.log
build build
node_modules node_modules

10
run-mac.command
View File

@ -25,10 +25,10 @@ RunCommand() {
} }
CreateDir "$BASEDIR/App_Data" CreateDir "$BASEDIR/App_Data"
CreateDir "$BASEDIR/FileConverter/Bin" CreateDir "$BASEDIR/FileConverter/bin"
CreateDir "$BASEDIR/FileConverter/Bin/HtmlFileInternal" 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/icudtl_dat.S" "."
cp -v "../../../core/build/bin/mac/x2t" "." cp -v "../../../core/build/bin/mac/x2t" "."
@ -54,7 +54,7 @@ sed "s/$SEARCH/$REPLACE/g" "../../../core/build/lib/DoctRenderer.config" > "Doct
echo $BASEDIR echo $BASEDIR
chmod -v +x $BASEDIR/../core/build/bin/AllFontsGen/mac_64 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 "----------------------------------------" 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 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 && 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"

2
run.bat
View File

@ -25,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" xcopy /s/h/e/k/c/y/q "..\..\..\core\build\cef\win_32" ".\HtmlFileInternal"
copy "..\..\..\core\build\bin\windows\x2t32.exe" "." 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.
ECHO ---------------------------------------- ECHO ----------------------------------------