Merge pull request leenjewel#15 from lizhangqu/master

Some fix and upgrade

Author: leenjewel

README.md

@@ -4,10 +4,10 @@
 <thead>
 <tr><td>library</td><td>version</td><td>platform support</td><td>arch support</td><td>pull commit</td></tr>
 </thead>
-<tr><td>openssl</td><td>1.1.0c</td><td>ios</td><td>armv7s armv7 i386 x86_64 arm64</td><td>20651fbb</td></tr>
-<tr><td></td><td></td><td>android</td><td>armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64</td><td>20651fbb</td></tr>
-<tr><td>curl</td><td>7.51.0</td><td>ios</td><td>armv7s armv7 i386 x86_64 arm64</td><td>20651fbb</td></tr>
-<tr><td></td><td></td><td>android</td><td>armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64</td><td>20651fbb</td></tr>
+<tr><td>openssl</td><td>1.1.0f</td><td>ios</td><td>armv7s armv7 i386 x86_64 arm64</td><td>aae1672</td></tr>
+<tr><td></td><td></td><td>android</td><td>armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64</td><td>aae1672</td></tr>
+<tr><td>curl</td><td>7.53.1</td><td>ios</td><td>armv7s armv7 i386 x86_64 arm64</td><td>aae1672</td></tr>
+<tr><td></td><td></td><td>android</td><td>armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64</td><td>aae1672</td></tr>
 </table>
 
 ## English
@@ -20,32 +20,33 @@ If you do not want to build it by yourself, you could download our prebuilt libr
 
 This a static library compile from openssl and cURL for iOS and Android.
 
-~~[openssl-1.0.2c.tar.gz](https://www.openssl.org/source/openssl-1.0.2c.tar.gz)~~
+ - ~~[openssl-1.0.2c.tar.gz](https://www.openssl.org/source/openssl-1.0.2c.tar.gz)~~
+ - [openssl-1.1.0f.tar.gz](https://www.openssl.org/source/openssl-1.1.0f.tar.gz)
+ - [https://github.com/openssl/openssl](https://github.com/openssl/openssl)
 
-[openssl-1.1.0c.tar.gz](https://www.openssl.org/source/openssl-1.1.0c.tar.gz)
+## cURL Version
 
-##cURL Version
+ - ~~[curl-7.47.1.tar.gz](https://curl.haxx.se/download/curl-7.47.1.tar.gz)~~
+ - [curl-7.53.1.tar.gz](https://curl.haxx.se/download/curl-7.53.1.tar.gz)
+ - [https://github.com/curl/curl](https://github.com/curl/curl)
 
-~~[curl-7.47.1.tar.gz](https://curl.haxx.se/download/curl-7.47.1.tar.gz)~~
+## Android NDK Version
 
-[curl-7.51.0.tar.gz](https://curl.haxx.se/download/curl-7.51.0.tar.gz)
-
-##Android NDK Version
-
-[android-ndk-r13b](https://dl.google.com/android/repository/android-ndk-r13b-darwin-x86_64.zip)
+ - ~~[android-ndk-r13b](https://dl.google.com/android/repository/android-ndk-r13b-darwin-x86_64.zip)~~
+ - [android-ndk-r14b](https://dl.google.com/android/repository/android-ndk-r14b-darwin-x86_64.zip)
 
 ## How to build
 
 ### For iOS
 
-Copy `openssl-1.1.0c.tar.gz` to `tools` file folder and run
+Copy `openssl-1.1.0f.tar.gz` to `tools` file folder and run
 
 ```
 cd tools
 sh ./build-openssl4ios.sh
 ```
 
-Copy `curl-7.51.0.tar.gz` to `tools` file folder and run
+Copy `curl-7.53.1.tar.gz` to `tools` file folder and run
 
 ```
 cd tools
@@ -193,9 +194,9 @@ target_link_libraries( # Specifies the target library.
 
 ## 中文
 
-这是一个适用于 iOS 平台和 Android 平台的 Openssl 静态链接库。基于 openssl-1.0.2c 版本编译生成。
+这是一个适用于 iOS 平台和 Android 平台的 Openssl 静态链接库。基于 openssl-1.1.0f 版本编译生成。
 
-后来又加入了适用于 iOS 平台和 Android 平台且支持 SSL 的 cURL 静态链接库。基于 curl-7.47.1 版本编译生成。
+后来又加入了适用于 iOS 平台和 Android 平台且支持 SSL 的 cURL 静态链接库。基于 curl-7.53.1 版本编译生成。
 
 ## 下载
 

tools/_shared.sh

@@ -4,6 +4,7 @@ TOOLS_ROOT=`pwd`
 ARCHS=("android" "android-armeabi" "android64-aarch64" "android-x86" "android64" "android-mips" "android-mips64")
 ABIS=("armeabi" "armeabi-v7a" "arm64-v8a" "x86" "x86_64" "mips" "mips64")
 # Default to API 21 for it is the minimum requirement for 64 bit archs.
+# IF you need to build for min api level 14, you need to modify it to 14 and will not build for 64 bit archs.
 ANDROID_API=${ANDROID_API:-21}
 NDK=${ANDROID_NDK}
 
@@ -64,8 +65,8 @@ configure() {
     export CC=${NDK_TOOLCHAIN_BASENAME}-gcc
     export CXX=${NDK_TOOLCHAIN_BASENAME}-g++
   else
-    export CC=${TOOLCHAIN_PATH}/clang
-    export CXX=${TOOLCHAIN_PATH}/clang++
+    export CC=${NDK_TOOLCHAIN_BASENAME}-clang
+    export CXX=${NDK_TOOLCHAIN_BASENAME}-clang++
   fi;
   export LINK=${CXX}
   export LD=${NDK_TOOLCHAIN_BASENAME}-ld

tools/build-curl4android.sh

@@ -20,7 +20,7 @@ source ./_shared.sh
 
 # Setup architectures, library name and other vars + cleanup from previous runs
 TOOLS_ROOT=`pwd`
-LIB_NAME="curl-7.51.0"
+LIB_NAME="curl-7.53.1"
 LIB_DEST_DIR=${TOOLS_ROOT}/libs
 [ -f ${LIB_NAME}.tar.gz ] || wget https://curl.haxx.se/download/${LIB_NAME}.tar.gz
 # Unarchive library, then configure and make for specified architectures
@@ -55,6 +55,7 @@ configure_make() {
               --disable-telnet \
               --disable-verbose
   PATH=$TOOLCHAIN_PATH:$PATH
+  make clean
   if make -j4
   then
     make install

tools/build-curl4ios.sh

@@ -29,10 +29,11 @@ pwd_path="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 ARCHS=("arm64" "armv7s" "armv7" "i386" "x86_64")
 SDKS=("iphoneos" "iphoneos" "iphoneos" "iphonesimulator" "iphonesimulator")
 PLATFORMS=("iPhoneOS" "iPhoneOS" "iPhoneOS" "iPhoneSimulator" "iPhoneSimulator")
-LIB_NAME="curl-7.51.0"
+LIB_NAME="curl-7.53.1"
 DEVELOPER=`xcode-select -print-path`
 TOOLCHAIN=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
-SDK_VERSION=""10.2""
+# If you can't compile with this version, please modify the version to it which on your mac.
+SDK_VERSION=""10.3""
 IPHONEOS_DEPLOYMENT_TARGET="6.0"
 LIB_DEST_DIR="${pwd_path}/../output/ios/curl-universal"
 HEADER_DEST_DIR="include"
@@ -77,6 +78,7 @@ configure_make()
        --disable-verbose \
        --enable-threaded-resolver \
        --enable-ipv6
+   make clean
    if make -j8
    then
        if [[ -d "curl-${ARCH}" ]]; then

tools/build-openssl4android.sh

@@ -19,7 +19,7 @@ set -u
 source ./_shared.sh
 
 # Setup architectures, library name and other vars + cleanup from previous runs
-LIB_NAME="openssl-1.0.2k"
+LIB_NAME="openssl-1.1.0f"
 LIB_DEST_DIR=${TOOLS_ROOT}/libs
 [ -d ${LIB_DEST_DIR} ] && rm -rf ${LIB_DEST_DIR}
 [ -f "${LIB_NAME}.tar.gz" ] || wget https://www.openssl.org/source/${LIB_NAME}.tar.gz;
@@ -33,7 +33,7 @@ configure_make() {
   configure $*
 
   #support openssl-1.0.x
-  if [[ $LIB_NAME != "openssl-1.1.*" ]]; then
+  if [[ $LIB_NAME != openssl-1.1.* ]]; then
     if [[ $ARCH == "android-armeabi" ]]; then
         ARCH="android-armv7"
     elif [[ $ARCH == "android64" ]]; then 
@@ -53,8 +53,12 @@ configure_make() {
               no-unit-test
   PATH=$TOOLCHAIN_PATH:$PATH
 
+  make clean
+  
   if make -j4; then
-    make install
+    # make install
+    make install_sw
+    make install_ssldirs
 
     OUTPUT_ROOT=${TOOLS_ROOT}/../output/android/openssl-${ABI}
     [ -d ${OUTPUT_ROOT}/include ] || mkdir -p ${OUTPUT_ROOT}/include

tools/build-openssl4ios.sh

@@ -29,8 +29,9 @@ ARCHS=("arm64" "armv7s" "armv7" "i386" "x86_64")
 SDKS=("iphoneos" "iphoneos" "iphoneos" "iphonesimulator" "iphonesimulator")
 PLATFORMS=("iPhoneOS" "iPhoneOS" "iPhoneOS" "iPhoneSimulator" "iPhoneSimulator")
 DEVELOPER=`xcode-select -print-path`
-SDK_VERSION=""10.2""
-LIB_NAME="openssl-1.1.0c"
+# If you can't compile with this version, please modify the version to it which on your mac.
+SDK_VERSION=""10.3""
+LIB_NAME="openssl-1.1.0f"
 LIB_DEST_DIR="${pwd_path}/../output/ios/openssl-universal"
 HEADER_DEST_DIR="include"
 rm -rf "${HEADER_DEST_DIR}" "${LIB_DEST_DIR}" "${LIB_NAME}"
@@ -70,10 +71,14 @@ configure_make()
        ./Configure iphoneos-cross --prefix="${PREFIX_DIR}"
    fi
    export CFLAGS="-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK}"
-   
+
+   make clean
    if make -j8
    then
-       make install; popd;
+       # make install;
+       make install_sw;
+       make install_ssldirs;
+       popd;
        rm -fr "${LIB_NAME}"
    fi
 }

tools/build-protobuf4android.sh

@@ -20,7 +20,7 @@ source ./_shared.sh
 
 # Setup architectures, library name and other vars + cleanup from previous runs
 LIB_NAME="protobuf"
-LIB_VERSION="3.1.0"
+LIB_VERSION="3.3.0"
 LIB_FILENAME=${LIB_NAME}-${LIB_VERSION}
 LIB_DEST_DIR=${TOOLS_ROOT}/libs
 # rm -rf ${LIB_DEST_DIR}
@@ -48,6 +48,7 @@ configure_make() {
               --disable-shared \
               --enable-cross-compile
   PATH=$TOOLCHAIN_PATH:$PATH
+  make clean
   if make -j4
   then
     make install