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

Merge remote-tracking branch 'remotes/origin/hotfix/v5.3.3' into develop

Browse Source 
# Conflicts:
#	Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h
This commit is contained in:
Sergey Konovalov
2019-06-24 15:05:16 +03:00
parent bdce91fccf c9330ee0f1
commit 9b9d7df4e2
23 changed files with 949 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/3dParty/boost/build.sh
View File

@ -1,7 +1,5 @@
#!/bin/bash
SCRIPT=$(readlink -f "$0" || grealpath "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
os=$(uname -s)
platform=""

2
Common/3dParty/boost/fetch.bat
View File

@ -4,7 +4,7 @@ CD /D %~dp0
if exist "%SCRIPTPATH%boost_1_58_0.7z" (
echo "boost already downloaded"
) else (
Powershell.exe Invoke-WebRequest -OutFile boost_1_58_0.7z http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z
Powershell.exe Invoke-WebRequest -OutFile boost_1_58_0.7z https://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z
)
SET UNSIP_PROGRAMM="C:\Program Files\7-Zip\7z.exe"

21
Common/3dParty/boost/fetch.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash
SCRIPT=$(readlink -f "$0" || grealpath "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
BOOST_URL=https://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z
os=$(uname -s)
platform=""
@ -12,21 +11,11 @@ case "$os" in
*) exit ;;
esac
if [[ "$platform" == *"mac"* ]]
then
if [[ -f "$SCRIPTPATH/7zX_1.7.1.dmg" ]]
then
echo "7z already downloaded"
else
wget http://static.updatestar.net/dl/7zX/7zX_1.7.1.dmg
fi
fi
if [[ -f "$SCRIPTPATH/boost_1_58_0.7z" ]]
then
echo "boost already downloaded"
else
wget http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z
wget $BOOST_URL || curl -O $BOOST_URL
fi
if [ -d "$SCRIPTPATH/boost_1_58_0" ]; then
@ -36,8 +25,6 @@ if [[ "$platform" == *"linux"* ]]
then
7z x -y "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
else
hdiutil mount "$SCRIPTPATH/7zX_1.7.1.dmg"
/Volumes/7zX/7zX.app/Contents/Resources/7za x "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
hdiutil unmount /Volumes/7zX
7za x "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
fi
fi