Commit 27db0c02 authored by Tristan Cavelier's avatar Tristan Cavelier

xxx review boost/fetch.sh patch

parent 5a18739a
...@@ -12,7 +12,7 @@ url = https://github.com/ONLYOFFICE/core/archive/win-v4.3.0.56.tar.gz ...@@ -12,7 +12,7 @@ url = https://github.com/ONLYOFFICE/core/archive/win-v4.3.0.56.tar.gz
md5sum = 76c0e29ed783067799b72294edcb00db md5sum = 76c0e29ed783067799b72294edcb00db
patch-options = -p0 patch-options = -p0
patches = patches =
${:_profile_base_location_}/rewrite-scripts.patch#332e95ceda960f50bd3f7db5da1f3de5 ${:_profile_base_location_}/rewrite-scripts.patch#d10bd4a75b8aa51b714bd9de092db276
${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de ${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
# ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7 # ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7
# error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/ # error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/
......
--- Common/3dParty/boost/fetch.sh.orig 2017-01-30 14:38:07.950123959 +0100 --- Common/3dParty/boost/fetch.sh.orig 2017-02-03 15:34:43.000000000 +0000
+++ Common/3dParty/boost/fetch.sh 2017-01-30 15:02:14.799153089 +0100 +++ Common/3dParty/boost/fetch.sh 2017-02-06 10:34:23.113177706 +0000
@@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
#!/bin/bash #!/bin/bash
+# XXX actualy, this file should be named fetch.bash +# XXX actualy, this file should be named fetch.bash
...@@ -7,12 +7,7 @@ ...@@ -7,12 +7,7 @@
SCRIPT=$(readlink -f "$0") SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT") SCRIPTPATH=$(dirname "$SCRIPT")
@@ -8,36 +10,18 @@ @@ -12,32 +14,14 @@
case "$os" in
Linux*) platform="linux" ;;
- Darwin*) platform="mac" ;;
+ Darwin*) platform="mac" ;;
*) exit ;; *) exit ;;
esac esac
...@@ -21,7 +16,7 @@ ...@@ -21,7 +16,7 @@
-if [[ -f "$SCRIPTPATH/7zX_1.7.1.dmg" ]] -if [[ -f "$SCRIPTPATH/7zX_1.7.1.dmg" ]]
-then -then
-echo "7z already downloaded" -echo "7z already downloaded"
+if [ -f "$SCRIPTPATH/boost_1_58_0.tar.gz" ] ; then +if [ -f "$SCRIPTPATH/boost_1_58_0.tar.gz" ]; then
+ echo "boost already downloaded" + echo "boost already downloaded"
else else
-wget http://static.updatestar.net/dl/7zX/7zX_1.7.1.dmg -wget http://static.updatestar.net/dl/7zX/7zX_1.7.1.dmg
...@@ -36,12 +31,12 @@ ...@@ -36,12 +31,12 @@
+ wget http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.gz + wget http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.gz
fi fi
if [ -d "$SCRIPTPATH/boost" ]; then if [ -d "$SCRIPTPATH/boost_1_58_0" ]; then
-echo "boost already extracted" -echo "boost already extracted"
-else -else
-if [[ "$platform" == *"linux"* ]] -if [[ "$platform" == *"linux"* ]]
-then -then
-7z x "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/" -7z x -y "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
+ echo "boost already extracted" + echo "boost already extracted"
else else
-hdiutil mount "$SCRIPTPATH/7zX_1.7.1.dmg" -hdiutil mount "$SCRIPTPATH/7zX_1.7.1.dmg"
...@@ -68,15 +63,6 @@ ...@@ -68,15 +63,6 @@
SCRIPT=$(readlink -f "$0") SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT") SCRIPTPATH=$(dirname "$SCRIPT")
@@ -8,7 +10,7 @@
case "$os" in
Linux*) platform="linux" ;;
- Darwin*) platform="mac" ;;
+ Darwin*) platform="mac" ;;
*) exit ;;
esac
@@ -20,57 +22,44 @@ @@ -20,57 +22,44 @@
*) arch="_32" ;; *) arch="_32" ;;
esac esac
...@@ -214,15 +200,6 @@ ...@@ -214,15 +200,6 @@
export PATH=`pwd`/depot_tools:"$PATH" export PATH=`pwd`/depot_tools:"$PATH"
@@ -10,7 +12,7 @@
case "$os" in
Linux*) platform="linux" ;;
- Darwin*) platform="mac" ;;
+ Darwin*) platform="mac" ;;
*) exit ;;
esac
@@ -22,49 +24,43 @@ @@ -22,49 +24,43 @@
*) arch="_32" ;; *) arch="_32" ;;
esac esac
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment