add no-archive/no-framework option in top level build scripts

pull/7/head
Taner Sener 4 years ago
parent c0be432062
commit d94bd1b873
  1. 47
      android.sh
  2. 44
      ios.sh
  3. 44
      macos.sh
  4. 2
      scripts/function-android.sh
  5. 6
      scripts/function-ios.sh
  6. 6
      scripts/function-macos.sh
  7. 6
      scripts/function-tvos.sh
  8. 6
      scripts/function.sh
  9. 45
      tvos.sh

@ -61,6 +61,9 @@ while [ ! $# -eq 0 ]; do
skip_library "${SKIP_LIBRARY}" skip_library "${SKIP_LIBRARY}"
;; ;;
--no-archive)
NO_ARCHIVE="1"
;;
--no-output-redirection) --no-output-redirection)
no_output_redirection no_output_redirection
;; ;;
@ -270,25 +273,33 @@ if [[ -n ${ANDROID_ARCHITECTURES} ]]; then
echo "skipped" echo "skipped"
fi fi
echo -e -n "\n\nCreating Android archive under prebuilt: " echo -e -n "\n"
# BUILD ANDROID ARCHIVE # DO NOT BUILD ANDROID ARCHIVE
./gradlew ffmpeg-kit-android-lib:clean ffmpeg-kit-android-lib:assembleRelease ffmpeg-kit-android-lib:testReleaseUnitTest 1>>"${BASEDIR}"/build.log 2>&1 if [[ ${NO_ARCHIVE} -ne 1 ]]; then
if [ $? -ne 0 ]; then
echo -e "failed\n"
exit 1
fi
# COPY ANDROID ARCHIVE TO PREBUILT DIRECTORY echo -e -n "\nCreating Android archive under prebuilt: "
FFMPEG_KIT_AAR="${BASEDIR}/prebuilt/$(get_aar_directory)/ffmpeg-kit"
rm -rf "${FFMPEG_KIT_AAR}" 1>>"${BASEDIR}"/build.log 2>&1 # BUILD ANDROID ARCHIVE
mkdir -p "${FFMPEG_KIT_AAR}" 1>>"${BASEDIR}"/build.log 2>&1 ./gradlew ffmpeg-kit-android-lib:clean ffmpeg-kit-android-lib:assembleRelease ffmpeg-kit-android-lib:testReleaseUnitTest 1>>"${BASEDIR}"/build.log 2>&1
cp "${BASEDIR}"/android/ffmpeg-kit-android-lib/build/outputs/aar/ffmpeg-kit-release.aar "${FFMPEG_KIT_AAR}"/ffmpeg-kit.aar 1>>"${BASEDIR}"/build.log 2>&1 if [ $? -ne 0 ]; then
if [ $? -ne 0 ]; then echo -e "failed\n"
echo -e "failed\n" exit 1
exit 1 fi
fi
echo -e "Created ffmpeg-kit Android archive successfully.\n" 1>>"${BASEDIR}"/build.log 2>&1 # COPY ANDROID ARCHIVE TO PREBUILT DIRECTORY
echo -e "ok\n" FFMPEG_KIT_AAR="${BASEDIR}/prebuilt/$(get_aar_directory)/ffmpeg-kit"
rm -rf "${FFMPEG_KIT_AAR}" 1>>"${BASEDIR}"/build.log 2>&1
mkdir -p "${FFMPEG_KIT_AAR}" 1>>"${BASEDIR}"/build.log 2>&1
cp "${BASEDIR}"/android/ffmpeg-kit-android-lib/build/outputs/aar/ffmpeg-kit-release.aar "${FFMPEG_KIT_AAR}"/ffmpeg-kit.aar 1>>"${BASEDIR}"/build.log 2>&1
if [ $? -ne 0 ]; then
echo -e "failed\n"
exit 1
fi
echo -e "INFO: Created ffmpeg-kit Android archive successfully.\n" 1>>"${BASEDIR}"/build.log 2>&1
echo -e "ok\n"
else
echo -e "INFO: Skipped creating Android archive.\n" 1>>"${BASEDIR}"/build.log 2>&1
fi
fi fi

@ -68,6 +68,9 @@ while [ ! $# -eq 0 ]; do
skip_library "${SKIP_LIBRARY}" skip_library "${SKIP_LIBRARY}"
;; ;;
--no-framework)
NO_FRAMEWORK="1"
;;
--no-output-redirection) --no-output-redirection)
no_output_redirection no_output_redirection
;; ;;
@ -249,30 +252,39 @@ for run_arch in {0..12}; do
fi fi
done done
# BUILD FFMPEG-KIT echo -e -n "\n"
if [[ -n ${TARGET_ARCH_LIST[0]} ]]; then
# DO NOT BUILD FRAMEWORKS
if [[ ${NO_FRAMEWORK} -ne 1 ]]; then
# BUILD FFMPEG-KIT
if [[ -n ${TARGET_ARCH_LIST[0]} ]]; then
# INITIALIZE TARGET FOLDERS # INITIALIZE TARGET FOLDERS
initialize_prebuilt_ios_folders initialize_prebuilt_ios_folders
# PREPARE PLATFORM ARCHITECTURE STRINGS # PREPARE PLATFORM ARCHITECTURE STRINGS
build_apple_architecture_variant_strings build_apple_architecture_variant_strings
if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then
echo -e -n "\n\nCreating universal libraries and xcframeworks under prebuilt: " echo -e -n "\nCreating universal libraries and xcframeworks under prebuilt: "
create_universal_libraries_for_ios_xcframeworks create_universal_libraries_for_ios_xcframeworks
create_frameworks_for_ios_xcframeworks create_frameworks_for_ios_xcframeworks
create_ios_xcframeworks create_ios_xcframeworks
else else
echo -e -n "\n\nCreating universal libraries and frameworks under prebuilt: " echo -e -n "\nCreating universal libraries and frameworks under prebuilt: "
create_universal_libraries_for_ios_default_frameworks
create_universal_libraries_for_ios_default_frameworks create_ios_default_frameworks
fi
create_ios_default_frameworks echo -e "ok\n"
fi fi
echo -e "ok\n" else
echo -e "INFO: Skipped creating iOS frameworks.\n" 1>>"${BASEDIR}"/build.log 2>&1
fi fi

@ -68,6 +68,9 @@ while [ ! $# -eq 0 ]; do
skip_library "${SKIP_LIBRARY}" skip_library "${SKIP_LIBRARY}"
;; ;;
--no-framework)
NO_FRAMEWORK="1"
;;
--no-output-redirection) --no-output-redirection)
no_output_redirection no_output_redirection
;; ;;
@ -223,30 +226,39 @@ for run_arch in {0..12}; do
fi fi
done done
# BUILD FFMPEG-KIT echo -e -n "\n"
if [[ -n ${TARGET_ARCH_LIST[0]} ]]; then
# DO NOT BUILD FRAMEWORKS
if [[ ${NO_FRAMEWORK} -ne 1 ]]; then
# BUILD FFMPEG-KIT
if [[ -n ${TARGET_ARCH_LIST[0]} ]]; then
# INITIALIZE TARGET FOLDERS # INITIALIZE TARGET FOLDERS
initialize_prebuilt_macos_folders initialize_prebuilt_macos_folders
# PREPARE PLATFORM ARCHITECTURE STRINGS # PREPARE PLATFORM ARCHITECTURE STRINGS
build_apple_architecture_variant_strings build_apple_architecture_variant_strings
if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then
echo -e -n "\n\nCreating universal libraries and xcframeworks under prebuilt: " echo -e -n "\nCreating universal libraries and xcframeworks under prebuilt: "
create_universal_libraries_for_macos_xcframeworks create_universal_libraries_for_macos_xcframeworks
create_frameworks_for_macos_xcframeworks create_frameworks_for_macos_xcframeworks
create_macos_xcframeworks create_macos_xcframeworks
else else
echo -e -n "\n\nCreating universal libraries and frameworks under prebuilt: " echo -e -n "\nCreating universal libraries and frameworks under prebuilt: "
create_universal_libraries_for_macos_default_frameworks
create_universal_libraries_for_macos_default_frameworks create_macos_default_frameworks
fi
create_macos_default_frameworks echo -e "ok\n"
fi fi
echo -e "ok\n" else
echo -e "INFO: Skipped creating macOS frameworks.\n" 1>>"${BASEDIR}"/build.log 2>&1
fi fi

@ -48,7 +48,7 @@ under the prebuilt folder.\n"
display_help_common_libraries display_help_common_libraries
display_help_gpl_libraries display_help_gpl_libraries
display_help_advanced_options display_help_advanced_options " --no-archive\t\t\tdo not build Android archive [no]"
} }
enable_main_build() { enable_main_build() {

@ -51,7 +51,11 @@ libraries are created under the prebuilt folder.\n"
display_help_common_libraries display_help_common_libraries
display_help_gpl_libraries display_help_gpl_libraries
display_help_advanced_options if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then
display_help_advanced_options " --no-framework\t\tdo not build xcframework bundles [no]"
else
display_help_advanced_options " --no-framework\t\tdo not build framework bundles and universal libraries [no]"
fi
} }
enable_main_build() { enable_main_build() {

@ -39,7 +39,11 @@ When compilation ends, libraries are created under the prebuilt folder.\n"
display_help_common_libraries display_help_common_libraries
display_help_gpl_libraries display_help_gpl_libraries
display_help_advanced_options if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then
display_help_advanced_options " --no-framework\t\tdo not build xcframework bundles [no]"
else
display_help_advanced_options " --no-framework\t\tdo not build framework bundles and universal libraries [no]"
fi
} }
enable_main_build() { enable_main_build() {

@ -37,7 +37,11 @@ When compilation ends, libraries are created under the prebuilt folder.\n"
display_help_common_libraries display_help_common_libraries
display_help_gpl_libraries display_help_gpl_libraries
display_help_advanced_options if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then
display_help_advanced_options " --no-framework\t\tdo not build xcframework bundles [no]"
else
display_help_advanced_options " --no-framework\t\tdo not build framework bundles and universal libraries [no]"
fi
} }
enable_main_build() { enable_main_build() {

@ -595,7 +595,11 @@ display_help_advanced_options() {
echo -e "Advanced options:" echo -e "Advanced options:"
echo -e " --reconf-LIBRARY\t\trun autoreconf before building LIBRARY [no]" echo -e " --reconf-LIBRARY\t\trun autoreconf before building LIBRARY [no]"
echo -e " --redownload-LIBRARY\t\tdownload LIBRARY even if it is detected as already downloaded [no]" echo -e " --redownload-LIBRARY\t\tdownload LIBRARY even if it is detected as already downloaded [no]"
echo -e " --rebuild-LIBRARY\t\tbuild LIBRARY even if it is detected as already built [no]\n" echo -e " --rebuild-LIBRARY\t\tbuild LIBRARY even if it is detected as already built [no]"
if [ -n "$1" ]; then
echo -e "$1"
fi
echo -e ""
} }
# #

@ -68,6 +68,9 @@ while [ ! $# -eq 0 ]; do
skip_library "${SKIP_LIBRARY}" skip_library "${SKIP_LIBRARY}"
;; ;;
--no-framework)
NO_FRAMEWORK="1"
;;
--no-output-redirection) --no-output-redirection)
no_output_redirection no_output_redirection
;; ;;
@ -220,30 +223,38 @@ for run_arch in {0..12}; do
fi fi
done done
# BUILD FFMPEG-KIT echo -e -n "\n"
if [[ -n ${TARGET_ARCH_LIST[0]} ]]; then
# INITIALIZE TARGET FOLDERS # DO NOT BUILD FRAMEWORKS
initialize_prebuilt_tvos_folders if [[ ${NO_FRAMEWORK} -ne 1 ]]; then
# PREPARE PLATFORM ARCHITECTURE STRINGS # BUILD FFMPEG-KIT
build_apple_architecture_variant_strings if [[ -n ${TARGET_ARCH_LIST[0]} ]]; then
if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then # INITIALIZE TARGET FOLDERS
echo -e -n "\n\nCreating universal libraries and xcframeworks under prebuilt: " initialize_prebuilt_tvos_folders
create_universal_libraries_for_tvos_xcframeworks # PREPARE PLATFORM ARCHITECTURE STRINGS
build_apple_architecture_variant_strings
create_frameworks_for_tvos_xcframeworks if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then
echo -e -n "\nCreating universal libraries and xcframeworks under prebuilt: "
create_tvos_xcframeworks create_universal_libraries_for_tvos_xcframeworks
else
echo -e -n "\n\nCreating universal libraries and frameworks under prebuilt: "
create_universal_libraries_for_tvos_default_frameworks create_frameworks_for_tvos_xcframeworks
create_tvos_default_frameworks create_tvos_xcframeworks
fi else
echo -e -n "\nCreating universal libraries and frameworks under prebuilt: "
create_universal_libraries_for_tvos_default_frameworks
echo -e "ok\n" create_tvos_default_frameworks
fi
echo -e "ok\n"
fi
else
echo -e "INFO: Skipped creating tvOS frameworks.\n" 1>>"${BASEDIR}"/build.log 2>&1
fi fi

Loading…
Cancel
Save