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

Merge release/v5.4.0 into develop

Browse Source
This commit is contained in:
Alexey Golubev
2019-08-26 19:22:31 +03:00
parent 364e82985c 70648ecf20
commit 9f327b9edc
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
out/
makefiles/
.qmake.stash
config.json
config

7
make
View File

@ -74,12 +74,15 @@ IS_NEED_64=true
IS_NEED_32=true
fi
if [[ "$OO_PLATFORM" == *"x64"* ]] || [[ "$OO_PLATFORM" == *"linux_64"* ]] || [[ "$OO_PLATFORM" == *"mac_64"* ]]
if [[ "$OO_PLATFORM" == *"x64"* ]] || \
[[ "$OO_PLATFORM" == *"linux_64"* ]] || \
[[ "$OO_PLATFORM" == *"mac_64"* ]]
then
IS_NEED_64=true
fi
if [[ "$OO_PLATFORM" == *"x86"* ]] || [[ "$OO_PLATFORM" == *"linux_32"* ]]
if [[ "$OO_PLATFORM" == *"x86"* ]] || \
[[ "$OO_PLATFORM" == *"linux_32"* ]]
then
IS_NEED_32=true
fi

7
scripts/deploy
View File

@ -17,12 +17,15 @@ then
IS_NEED_32=true
fi
if [[ "$OO_PLATFORM" == *"x64"* ]]
if [[ "$OO_PLATFORM" == *"x64"* ]] || \
[[ "$OO_PLATFORM" == *"linux_64"* ]] || \
[[ "$OO_PLATFORM" == *"mac_64"* ]]
then
IS_NEED_64=true
fi
if [[ "$OO_PLATFORM" == *"x86"* ]]
if [[ "$OO_PLATFORM" == *"x86"* ]] || \
[[ "$OO_PLATFORM" == *"linux_32"* ]]
then
IS_NEED_32=true
fi