Skip to content

Commit 88d154a

Browse files
author
az
committed
finish optimization
1 parent 0436a97 commit 88d154a

17 files changed

+77
-141
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
> - `${COMMON_PLATFORM_TYPE}_${COMMON_LIBRARY_NAME}_build_config_make`: (must)
5151
> - `${COMMON_PLATFORM_TYPE}_${COMMON_LIBRARY_NAME}_archive`: (must)
5252
> * Contribution notes:
53-
> + asteriskzuo: Create the project and complete the main frame design.
53+
> + AsteriskZuo: Create the project and complete the main frame design.
5454
## 2. Architecture design
5555
### Programming language
5656
> #### bash shell script

‎script/__color_log.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ source $(cd -P "$(dirname "$0")" && pwd)/__util.sh
2626

2727
echo "###############################################################################" >/dev/null
2828
echo "# Script Summary: #" >/dev/null
29-
echo "# Author: yu.zuo #" >/dev/null
29+
echo "# Author: AsteriskZuo #" >/dev/null
3030
echo "# Update Date: 2020.05.28 #" >/dev/null
3131
echo "# Script version: 1.0.0 #" >/dev/null
3232
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null

‎script/__util.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
echo "###############################################################################" >/dev/null
2626
echo "# Script Summary: #" >/dev/null
27-
echo "# Author: yu.zuo #" >/dev/null
27+
echo "# Author: AsteriskZuo #" >/dev/null
2828
echo "# Update Date: 2020.05.28 #" >/dev/null
2929
echo "# Script version: 1.0.0 #" >/dev/null
3030
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null

‎script/_common.sh‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ source $(cd -P "$(dirname "$0")" && pwd)/__color_log.sh
2626

2727
echo "###############################################################################" >/dev/null
2828
echo "# Script Summary: #" >/dev/null
29-
echo "# Author: yu.zuo #" >/dev/null
29+
echo "# Author: AsteriskZuo #" >/dev/null
3030
echo "# Update Date: 2020.05.28 #" >/dev/null
3131
echo "# Script version: 1.0.0 #" >/dev/null
3232
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null
@@ -95,7 +95,7 @@ function common_printf_variable() {
9595
log_var_print "COMMON_PLATFORM_TYPE = $COMMON_PLATFORM_TYPE"
9696
log_var_print "COMMON_LIBRARY_ID = $COMMON_LIBRARY_ID"
9797
log_var_print "COMMON_LIBRARY_NAME = $COMMON_LIBRARY_NAME"
98-
log_var_print "COMMON_LIBRARY_VERSION = $COMMON_LIBRARY_VERSION"
98+
log_var_print "COMMON_LIBRARY_VERSION = $COMMON_LIBRARY_VERSION"
9999
log_var_print "COMMON_DOWNLOAD_ADRESS = $COMMON_DOWNLOAD_ADRESS"
100100
log_var_print "COMMON_LIBRARY_ID_LIST = ${COMMON_LIBRARY_ID_LIST}"
101101
log_var_print "COMMON_LIBRARY_NAME_LIST = ${COMMON_LIBRARY_NAME_LIST}"
@@ -104,7 +104,7 @@ function common_printf_variable() {
104104
}
105105

106106
function common_help() {
107-
log_info_print "
107+
log_info_print "
108108
109109
Usage: $0 [options]
110110
Options: [defaults in brackets after descriptions]
@@ -120,15 +120,20 @@ Help options:
120120
function common_get_library_id_from_name() {
121121
local name=$1
122122
case $name in
123-
openssl) echo "1"
123+
openssl)
124+
echo "1"
124125
;;
125-
nghttp2) echo "2"
126+
nghttp2)
127+
echo "2"
126128
;;
127-
curl) echo "3"
129+
curl)
130+
echo "3"
128131
;;
129-
protobuf) echo "4"
132+
protobuf)
133+
echo "4"
130134
;;
131-
*) echo "not support"
135+
*)
136+
echo "not support"
132137
;;
133138
esac
134139
}
@@ -172,4 +177,13 @@ function common_build_config_make() {
172177

173178
function common_archive() {
174179
local library_name=$1
175-
}
180+
}
181+
182+
function common_build_make() {
183+
local library_arch_path=$1
184+
shift
185+
for make_param in $*; do
186+
echo "[info][make_${make_param}_start]" >>"${library_arch_path}/log/output.log"
187+
make $make_param >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make $make_commond error!"
188+
done
189+
}

‎script/android-common.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ source $(cd -P "$(dirname "$0")" && pwd)/_common.sh
2626

2727
echo "###############################################################################" >/dev/null
2828
echo "# Script Summary: #" >/dev/null
29-
echo "# Author: yu.zuo #" >/dev/null
29+
echo "# Author: AsteriskZuo #" >/dev/null
3030
echo "# Update Date: 2020.05.28 #" >/dev/null
3131
echo "# Script version: 1.0.0 #" >/dev/null
3232
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null
@@ -248,6 +248,8 @@ function android_build_config_make() {
248248
local library_arch=$2
249249
local build_config_make="android_${COMMON_LIBRARY_NAME}_build_config_make"
250250
common_build_config_make "$library_id" "$library_arch"
251+
android_set_toolchain "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
252+
android_set_cpu_feature "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
251253
eval ${build_config_make} "$library_id" "$library_arch"
252254
log_info_print "android_build_config_make $1 $2 end..."
253255
}

‎script/android-curl.sh‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
echo "###############################################################################" >/dev/null
2626
echo "# Script Summary: #" >/dev/null
27-
echo "# Author: yu.zuo #" >/dev/null
27+
echo "# Author: AsteriskZuo #" >/dev/null
2828
echo "# Update Date: 2020.05.28 #" >/dev/null
2929
echo "# Script version: 1.0.0 #" >/dev/null
3030
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null
@@ -105,9 +105,6 @@ function android_curl_build_config_make() {
105105
util_remove_dir "$library_arch_path"
106106
util_create_dir "${library_arch_path}/log"
107107

108-
android_set_toolchain "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
109-
android_set_cpu_feature "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
110-
111108
openssl_output_arch_lib_dir="${openssl_output_dir}/${library_arch}/lib"
112109
if [ ! -d "${openssl_output_arch_lib_dir}" ]; then
113110
common_die "Please build the openssl ${library_arch} library first!"
@@ -145,17 +142,7 @@ function android_curl_build_config_make() {
145142
common_die "not support $library_arch"
146143
fi
147144

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!"
145+
common_build_make "${library_arch_path}" "clean" "-j$(util_get_cpu_count)" "install"
159146

160147
popd
161148
}

‎script/android-nghttp2.sh‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
echo "###############################################################################" >/dev/null
2626
echo "# Script Summary: #" >/dev/null
27-
echo "# Author: yu.zuo #" >/dev/null
27+
echo "# Author: AsteriskZuo #" >/dev/null
2828
echo "# Update Date: 2020.05.28 #" >/dev/null
2929
echo "# Script version: 1.0.0 #" >/dev/null
3030
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null
@@ -92,9 +92,6 @@ function android_nghttp2_build_config_make() {
9292
util_remove_dir "$library_arch_path"
9393
util_create_dir "${library_arch_path}/log"
9494

95-
android_set_toolchain "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
96-
android_set_cpu_feature "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
97-
9895
android_printf_arch_variable
9996

10097
pushd .
@@ -121,17 +118,7 @@ function android_nghttp2_build_config_make() {
121118
common_die "not support $library_arch"
122119
fi
123120

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!"
121+
common_build_make "${library_arch_path}" "clean" "-j$(util_get_cpu_count)" "install"
135122

136123
popd
137124
}

‎script/android-openssl.sh‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
echo "###############################################################################" >/dev/null
2626
echo "# Script Summary: #" >/dev/null
27-
echo "# Author: yu.zuo #" >/dev/null
27+
echo "# Author: AsteriskZuo #" >/dev/null
2828
echo "# Update Date: 2020.05.28 #" >/dev/null
2929
echo "# Script version: 1.0.0 #" >/dev/null
3030
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null
@@ -94,9 +94,6 @@ function android_openssl_build_config_make() {
9494
util_remove_dir "$library_arch_path"
9595
util_create_dir "${library_arch_path}/log"
9696

97-
android_set_toolchain "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
98-
android_set_cpu_feature "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
99-
10097
android_printf_arch_variable
10198

10299
pushd .
@@ -122,18 +119,7 @@ function android_openssl_build_config_make() {
122119
common_die "not support $library_arch"
123120
fi
124121

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!"
122+
common_build_make "${library_arch_path}" "clean" "-j$(util_get_cpu_count)" "install_sw" "install_ssldirs"
137123

138124
popd
139125
}

‎script/android-protobuf.sh‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
echo "###############################################################################" >/dev/null
2626
echo "# Script Summary: #" >/dev/null
27-
echo "# Author: yu.zuo #" >/dev/null
27+
echo "# Author: AsteriskZuo #" >/dev/null
2828
echo "# Update Date: 2020.05.28 #" >/dev/null
2929
echo "# Script version: 1.0.0 #" >/dev/null
3030
echo "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #" >/dev/null
@@ -95,9 +95,6 @@ function android_protobuf_build_config_make() {
9595
util_remove_dir "$library_arch_path"
9696
util_create_dir "${library_arch_path}/log"
9797

98-
android_set_toolchain "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
99-
android_set_cpu_feature "${COMMON_LIBRARY_NAME}" "${library_arch}" "${ANDROID_API}"
100-
10198
export LDFLAGS="$LDFLAGS -Wunused-command-line-argument -llog"
10299

103100
android_printf_arch_variable
@@ -125,17 +122,7 @@ function android_protobuf_build_config_make() {
125122
common_die "not support $library_arch"
126123
fi
127124

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!"
125+
common_build_make "${library_arch_path}" "clean" "-j$(util_get_cpu_count)" "install"
139126

140127
popd
141128
}

‎script/android.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ source $(cd -P "$(dirname "$0")" && pwd)/android-common.sh
2626

2727
log_head_print "###############################################################################"
2828
log_head_print "# Script Summary: #"
29-
log_head_print "# Author: yu.zuo #"
29+
log_head_print "# Author: AsteriskZuo #"
3030
log_head_print "# Update Date: 2020.05.28 #"
3131
log_head_print "# Script version: 1.0.0 #"
3232
log_head_print "# Url: https://github.com/AsteriskZuo/simple-build-ios-and-android-script #"
@@ -68,7 +68,7 @@ for opt; do
6868
export COMMON_LIBRARY_VERSION=$(common_get_library_version_from_id $COMMON_LIBRARY_ID)
6969
export COMMON_DOWNLOAD_ADRESS=$(common_get_library_url_from_id $COMMON_LIBRARY_ID)
7070
else
71-
common_die 'name is not in list. please refer ${COMMON_LIBRARY_NAME_LIST}'
71+
common_die "${optval} is not in list. please refer \${COMMON_LIBRARY_NAME_LIST}"
7272
fi
7373
;;
7474
*)

0 commit comments

Comments
 (0)