antonlyap/ffmpeg-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix duplicate apple framework identifiers, fixes #93

Browse Source
This commit is contained in:
Taner Sener 2021-09-16 08:41:21 +01:00
parent 28612fce75
commit d4c6cba517
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/function-apple.sh
View File

@ -424,9 +424,9 @@ create_single_framework() {
initialize_folder "${FRAMEWORK_PATH}" initialize_folder "${FRAMEWORK_PATH}"
local CAPITAL_CASE_LIBRARY_NAME=$(to_capital_case "${LIBRARY_NAME}") local CAPITAL_CASE_FRAMEWORK_NAME=$(to_capital_case "${FRAMEWORK_NAME}")
build_info_plist "${FRAMEWORK_PATH}/Info.plist" "${LIBRARY_NAME}" "com.arthenica.ffmpegkit.${CAPITAL_CASE_LIBRARY_NAME}" "${LIBRARY_VERSION}" "${LIBRARY_VERSION}" build_info_plist "${FRAMEWORK_PATH}/Info.plist" "${LIBRARY_NAME}" "com.arthenica.ffmpegkit.${CAPITAL_CASE_FRAMEWORK_NAME}" "${LIBRARY_VERSION}" "${LIBRARY_VERSION}"
cp "${BASEDIR}/prebuilt/$(get_universal_library_directory "${ARCHITECTURE_VARIANT}")/${LIBRARY_NAME}/lib/${STATIC_LIBRARY_NAME}.a" "${FRAMEWORK_PATH}/${FRAMEWORK_NAME}" 1>>"${BASEDIR}/build.log" 2>&1 cp "${BASEDIR}/prebuilt/$(get_universal_library_directory "${ARCHITECTURE_VARIANT}")/${LIBRARY_NAME}/lib/${STATIC_LIBRARY_NAME}.a" "${FRAMEWORK_PATH}/${FRAMEWORK_NAME}" 1>>"${BASEDIR}/build.log" 2>&1

8
scripts/function.sh
View File

@ -1318,8 +1318,8 @@ get_external_library_license_path() {
copy_external_library_license() { copy_external_library_license() {
output_path_array=("$2") output_path_array=("$2")
for output_path in "${output_path_array[@]}"; do for output_path in "${output_path_array[@]}"; do
$(copy_external_library_license_file "$1" "${output_path}/LICENSE") RESULT=$(copy_external_library_license_file "$1" "${output_path}/LICENSE")
if [[ $? -ne 0 ]]; then if [[ ${RESULT} -ne 0 ]]; then
echo 1 echo 1
return return
fi fi
@ -1330,8 +1330,8 @@ copy_external_library_license() {
# 1 - library index # 1 - library index
# 2 - output path # 2 - output path
copy_external_library_license_file() { copy_external_library_license_file() {
$(cp $(get_external_library_license_path "$1") "$2" 1>>"${BASEDIR}"/build.log 2>&1) RESULT=$(cp $(get_external_library_license_path "$1") "$2" 1>>"${BASEDIR}"/build.log 2>&1)
if [[ $? -ne 0 ]]; then if [[ ${RESULT} -ne 0 ]]; then
echo 1 echo 1
return return
fi fi