Skip to content

Commit 0436a97

Browse files
AsteriskZuoAsteriskZuo
committed
temp
1 parent b272be4 commit 0436a97

File tree

9 files changed

+200
-36
lines changed

9 files changed

+200
-36
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11

22
input/*
33
output/*
4+
5+
*.DS_Store

‎script/android-common.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ export ANDROID_TRIPLES=("arm-linux-androideabi" "aarch64-linux-android" "i686-li
5151
export ANDROID_API=23
5252

5353
# for test
54-
# ANDROID_ARCHS=("x86-64")
55-
# ANDROID_TRIPLES=("x86_64-linux-android")
56-
# ANDROID_API=23
54+
ANDROID_ARCHS=("arm64-v8a")
55+
ANDROID_TRIPLES=("aarch64-linux-android")
56+
ANDROID_API=23
5757

5858
echo "###############################################################################" >/dev/null
5959
echo "#### Function Partition #####" >/dev/null

‎script/android-curl.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ function android_curl_build_config_make() {
101101
local library_id=$1
102102
local library_arch=$2
103103

104-
export ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}
105-
106104
local library_arch_path="${curl_output_dir}/${library_arch}"
107105
util_remove_dir "$library_arch_path"
108106
util_create_dir "${library_arch_path}/log"
@@ -147,10 +145,17 @@ function android_curl_build_config_make() {
147145
common_die "not support $library_arch"
148146
fi
149147

150-
make clean >>"${library_arch_path}/log/output.log"
151-
if make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1; then
152-
make install >>"${library_arch_path}/log/output.log" 2>&1
153-
fi
148+
echo "[${COMMON_LIBRARY_NAME}_make_clean]" >>"${library_arch_path}/log/output.log"
149+
make clean >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make clean error!"
150+
151+
echo "[${COMMON_LIBRARY_NAME}_make]" >>"${library_arch_path}/log/output.log"
152+
make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make error!"
153+
154+
# echo "[${COMMON_LIBRARY_NAME}_make_check]" >>"${library_arch_path}/log/output.log"
155+
# make check >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make check error!"
156+
157+
echo "[${COMMON_LIBRARY_NAME}_make_install]" >>"${library_arch_path}/log/output.log"
158+
make install >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
154159

155160
popd
156161
}

‎script/android-nghttp2.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ function android_nghttp2_build_config_make() {
8888
local library_id=$1
8989
local library_arch=$2
9090

91-
export ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}
92-
9391
local library_arch_path="${nghttp2_output_dir}/${library_arch}"
9492
util_remove_dir "$library_arch_path"
9593
util_create_dir "${library_arch_path}/log"
@@ -123,10 +121,17 @@ function android_nghttp2_build_config_make() {
123121
common_die "not support $library_arch"
124122
fi
125123

126-
make clean >>"${library_arch_path}/log/output.log"
127-
if make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1; then
128-
make install >>"${library_arch_path}/log/output.log" 2>&1
129-
fi
124+
echo "[${COMMON_LIBRARY_NAME}_make_clean]" >>"${library_arch_path}/log/output.log"
125+
make clean >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make clean error!"
126+
127+
echo "[${COMMON_LIBRARY_NAME}_make]" >>"${library_arch_path}/log/output.log"
128+
make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make error!"
129+
130+
# echo "[${COMMON_LIBRARY_NAME}_make_check]" >>"${library_arch_path}/log/output.log"
131+
# make check >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make check error!"
132+
133+
echo "[${COMMON_LIBRARY_NAME}_make_install]" >>"${library_arch_path}/log/output.log"
134+
make install >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
130135

131136
popd
132137
}

‎script/android-openssl.sh

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ function android_openssl_printf_variable() {
5959

6060
function android_openssl_pre_tool_check() {
6161

62+
export ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}
63+
6264
openssl_input_dir="${COMMON_INPUT_DIR}/${COMMON_LIBRARY_NAME}"
6365
openssl_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_PLATFORM_TYPE}/${COMMON_LIBRARY_NAME}"
6466

@@ -88,8 +90,6 @@ function android_openssl_build_config_make() {
8890
local library_id=$1
8991
local library_arch=$2
9092

91-
export ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}
92-
9393
local library_arch_path="${openssl_output_dir}/${library_arch}"
9494
util_remove_dir "$library_arch_path"
9595
util_create_dir "${library_arch_path}/log"
@@ -122,11 +122,18 @@ function android_openssl_build_config_make() {
122122
common_die "not support $library_arch"
123123
fi
124124

125-
make clean >>"${library_arch_path}/log/output.log"
126-
if make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1; then
127-
make install_sw >>"${library_arch_path}/log/output.log" 2>&1
128-
make install_ssldirs >>"${library_arch_path}/log/output.log" 2>&1
129-
fi
125+
echo "[${COMMON_LIBRARY_NAME}_make_clean]" >>"${library_arch_path}/log/output.log"
126+
make clean >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make clean error!"
127+
128+
echo "[${COMMON_LIBRARY_NAME}_make]" >>"${library_arch_path}/log/output.log"
129+
make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make error!"
130+
131+
# echo "[${COMMON_LIBRARY_NAME}_make_check]" >>"${library_arch_path}/log/output.log"
132+
# make check >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make check error!"
133+
134+
echo "[${COMMON_LIBRARY_NAME}_make_install]" >>"${library_arch_path}/log/output.log"
135+
make install_sw >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
136+
make install_ssldirs >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
130137

131138
popd
132139
}

‎script/android-protobuf.sh

Lines changed: 125 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,128 @@
1818
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
# SOFTWARE.
21+
# SOFTWARE.
22+
23+
#!/bin/sh
24+
25+
echo "###############################################################################" >/dev/null
26+
echo "# Script Summary: #" >/dev/null
27+
echo "# Author: yu.zuo #" >/dev/null
28+
echo "# Update Date: 2020.05.28 #" >/dev/null
29+
echo "# Script version: 1.0.0 #" >/dev/null
30+
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null
31+
echo "# #" >/dev/null
32+
echo "# Brief introduction: #" >/dev/null
33+
echo "# Build android protobuf shell script. #" >/dev/null
34+
echo "# #" >/dev/null
35+
echo "# Prerequisites: #" >/dev/null
36+
echo "# GNU bash (version 3.2.57 test success on macOS) #" >/dev/null
37+
echo "# #" >/dev/null
38+
echo "# Reference: #" >/dev/null
39+
echo "# Url: https://github.com/AsteriskZuo/openssl_for_ios_and_android #" >/dev/null
40+
echo "###############################################################################" >/dev/null
41+
42+
# set -x
43+
44+
protobuf_zip_file=""
45+
protobuf_zip_file_no_suffix=""
46+
protobuf_zip_file_path=""
47+
protobuf_zip_file_no_suffix_path=""
48+
protobuf_input_dir=""
49+
protobuf_output_dir=""
50+
51+
function android_protobuf_printf_variable() {
52+
log_var_print "protobuf_input_dir = $protobuf_input_dir"
53+
log_var_print "protobuf_output_dir = $protobuf_output_dir"
54+
log_var_print "protobuf_zip_file = $protobuf_zip_file"
55+
log_var_print "protobuf_zip_file_no_suffix = $protobuf_zip_file_no_suffix"
56+
log_var_print "protobuf_zip_file_path = $protobuf_zip_file_path"
57+
log_var_print "protobuf_zip_file_no_suffix_path = $protobuf_zip_file_no_suffix_path"
58+
}
59+
60+
function android_protobuf_pre_tool_check() {
61+
62+
local protobuf_version=$(protoc --version)
63+
util_is_in "$COMMON_LIBRARY_VERSION" "$protobuf_version" || common_die "Protobuf is not installed on the system, see the protobuf installation instructions. (ref: https://github.com/protocolbuffers/protobuf/blob/master/src/README.md)"
64+
65+
protobuf_input_dir="${COMMON_INPUT_DIR}/${COMMON_LIBRARY_NAME}"
66+
protobuf_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_PLATFORM_TYPE}/${COMMON_LIBRARY_NAME}"
67+
68+
protobuf_zip_file="${COMMON_DOWNLOAD_ADRESS##*/}"
69+
protobuf_zip_file_no_suffix=$(util_remove_substr "cpp-" ${protobuf_zip_file%.tar.gz})
70+
protobuf_zip_file_path="${protobuf_input_dir}/${protobuf_zip_file}"
71+
protobuf_zip_file_no_suffix_path="${protobuf_input_dir}/${protobuf_zip_file_no_suffix}"
72+
73+
util_create_dir "${protobuf_input_dir}"
74+
util_create_dir "${protobuf_output_dir}"
75+
76+
android_protobuf_printf_variable
77+
78+
}
79+
80+
function android_protobuf_pre_download_zip() {
81+
local library_id=$1
82+
util_download_file "$COMMON_DOWNLOAD_ADRESS" "$protobuf_zip_file_path"
83+
}
84+
85+
function android_protobuf_build_unzip() {
86+
local library_id=$1
87+
util_unzip "$protobuf_zip_file_path" "${protobuf_input_dir}" "$protobuf_zip_file_no_suffix"
88+
}
89+
90+
function android_protobuf_build_config_make() {
91+
local library_id=$1
92+
local library_arch=$2
93+
94+
local library_arch_path="${protobuf_output_dir}/${library_arch}"
95+
util_remove_dir "$library_arch_path"
96+
util_create_dir "${library_arch_path}/log"
97+
98+
android_set_toolchain "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
99+
android_set_cpu_feature "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
100+
101+
export LDFLAGS="$LDFLAGS -Wunused-command-line-argument -llog"
102+
103+
android_printf_arch_variable
104+
105+
pushd .
106+
cd "$protobuf_zip_file_no_suffix_path"
107+
108+
if [[ "${library_arch}" == "x86-64" ]]; then
109+
110+
./configure --host=$(android_get_build_host "${library_arch}") --prefix="${library_arch_path}" --with-protoc=protobuf_command >"${library_arch_path}/log/output.log" 2>&1 || common_die "configure error!"
111+
112+
elif [[ "${library_arch}" == "x86" ]]; then
113+
114+
./configure --host=$(android_get_build_host "${library_arch}") --prefix="${library_arch_path}" --with-protoc=protobuf_command >"${library_arch_path}/log/output.log" 2>&1 || common_die "configure error!"
115+
116+
elif [[ "${library_arch}" == "armeabi-v7a" ]]; then
117+
118+
./configure --host=$(android_get_build_host "${library_arch}") --prefix="${library_arch_path}" --with-protoc=protobuf_command >"${library_arch_path}/log/output.log" 2>&1 || common_die "configure error!"
119+
120+
elif [[ "${library_arch}" == "arm64-v8a" ]]; then
121+
122+
./configure --host=$(android_get_build_host "${library_arch}") --prefix="${library_arch_path}" --with-protoc=protobuf_command >"${library_arch_path}/log/output.log" 2>&1 || common_die "configure error!"
123+
124+
else
125+
common_die "not support $library_arch"
126+
fi
127+
128+
echo "[${COMMON_LIBRARY_NAME}_make_clean]" >>"${library_arch_path}/log/output.log"
129+
make clean >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make clean error!"
130+
131+
echo "[${COMMON_LIBRARY_NAME}_make]" >>"${library_arch_path}/log/output.log"
132+
make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make error!"
133+
134+
# echo "[${COMMON_LIBRARY_NAME}_make_check]" >>"${library_arch_path}/log/output.log"
135+
# make check >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make check error!"
136+
137+
echo "[${COMMON_LIBRARY_NAME}_make_install]" >>"${library_arch_path}/log/output.log"
138+
make install >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
139+
140+
popd
141+
}
142+
143+
function android_protobuf_archive() {
144+
local library_name=$1
145+
}

‎script/ios-curl.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,17 @@ function ios_curl_build_config_make() {
144144
common_die "not support $library_arch"
145145
fi
146146

147-
make clean >>"${library_arch_path}/log/output.log"
148-
if make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1; then
149-
make install >>"${library_arch_path}/log/output.log" 2>&1
150-
fi
147+
echo "[${COMMON_LIBRARY_NAME}_make_clean]" >>"${library_arch_path}/log/output.log"
148+
make clean >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make clean error!"
149+
150+
echo "[${COMMON_LIBRARY_NAME}_make]" >>"${library_arch_path}/log/output.log"
151+
make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make error!"
152+
153+
# echo "[${COMMON_LIBRARY_NAME}_make_check]" >>"${library_arch_path}/log/output.log"
154+
# make check >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make check error!"
155+
156+
echo "[${COMMON_LIBRARY_NAME}_make_install]" >>"${library_arch_path}/log/output.log"
157+
make install >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
151158

152159
popd
153160
}

‎script/ios-nghttp2.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,17 @@ function ios_nghttp2_build_config_make() {
120120
common_die "not support $library_arch"
121121
fi
122122

123-
make clean >>"${library_arch_path}/log/output.log"
124-
if make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1; then
125-
make install >>"${library_arch_path}/log/output.log" 2>&1
126-
fi
123+
echo "[${COMMON_LIBRARY_NAME}_make_clean]" >>"${library_arch_path}/log/output.log"
124+
make clean >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make clean error!"
125+
126+
echo "[${COMMON_LIBRARY_NAME}_make]" >>"${library_arch_path}/log/output.log"
127+
make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make error!"
128+
129+
# echo "[${COMMON_LIBRARY_NAME}_make_check]" >>"${library_arch_path}/log/output.log"
130+
# make check >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make check error!"
131+
132+
echo "[${COMMON_LIBRARY_NAME}_make_install]" >>"${library_arch_path}/log/output.log"
133+
make install >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
127134

128135
popd
129136
}

‎script/ios-openssl.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,18 @@ function ios_openssl_build_config_make() {
122122
common_die "not support $library_arch"
123123
fi
124124

125-
make clean >>"${library_arch_path}/log/output.log"
126-
if make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1; then
127-
make install_sw >>"${library_arch_path}/log/output.log" 2>&1
128-
make install_ssldirs >>"${library_arch_path}/log/output.log" 2>&1
129-
fi
125+
echo "[${COMMON_LIBRARY_NAME}_make_clean]" >>"${library_arch_path}/log/output.log"
126+
make clean >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make clean error!"
127+
128+
echo "[${COMMON_LIBRARY_NAME}_make]" >>"${library_arch_path}/log/output.log"
129+
make -j$(util_get_cpu_count) >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make error!"
130+
131+
# echo "[${COMMON_LIBRARY_NAME}_make_check]" >>"${library_arch_path}/log/output.log"
132+
# make check >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make check error!"
133+
134+
echo "[${COMMON_LIBRARY_NAME}_make_install]" >>"${library_arch_path}/log/output.log"
135+
make install_sw >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
136+
make install_ssldirs >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make install error!"
130137

131138
popd
132139
}

0 commit comments

Comments
 (0)