From e9532ffbfd4b0b0c9f83d6c58ef772a3354f02d9 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Tue, 5 May 2020 22:39:22 +0400 Subject: [PATCH] Try with git --- buildbox/build-telegram.sh | 3 ++- buildbox/guest-build-telegram.sh | 4 +++- third-party/webrtc/BUCK | 2 ++ third-party/webrtc/build-webrtc-buck.sh | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh index 8a98f552d6..420badd8d2 100644 --- a/buildbox/build-telegram.sh +++ b/buildbox/build-telegram.sh @@ -128,7 +128,8 @@ fi SOURCE_DIR=$(basename "$BASE_DIR") rm -f "$BUILDBOX_DIR/transient-data/source.tar" -tar cf "$BUILDBOX_DIR/transient-data/source.tar" --exclude "$BUILDBOX_DIR" --exclude ".git" --exclude "buck-out" --exclude ".buckd" --exclude "build" "." +#temporarily include .git (reverse later with --exclude ".git") +tar cf "$BUILDBOX_DIR/transient-data/source.tar" --exclude "$BUILDBOX_DIR" --exclude "buck-out" --exclude ".buckd" --exclude "build" "." PROCESS_ID="$$" diff --git a/buildbox/guest-build-telegram.sh b/buildbox/guest-build-telegram.sh index 0f136a3518..c76c532da7 100644 --- a/buildbox/guest-build-telegram.sh +++ b/buildbox/guest-build-telegram.sh @@ -57,7 +57,9 @@ fi mkdir "$SOURCE_PATH" -if [ "$1" != "verify" ]; then +USE_RAMDISK="0" + +if [ "$USE_RAMDISK" == "1" ]; then SIZE_IN_BLOCKS=$((12*1024*1024*1024/512)) DEV=`hdid -nomount ram://$SIZE_IN_BLOCKS` diff --git a/third-party/webrtc/BUCK b/third-party/webrtc/BUCK index 340e71b46f..4d62e6de3d 100644 --- a/third-party/webrtc/BUCK +++ b/third-party/webrtc/BUCK @@ -14,6 +14,7 @@ genrule( bash = """ set -x + echo "SRCDIR=$SRCDIR" OUT_DIR="ios" @@ -24,6 +25,7 @@ genrule( mkdir -p "$BUILD_DIR" mkdir -p "$BUILD_DIR/webrtc-ios" + cp -R "$SRCDIR/webrtc-ios/.git" "$BUILD_DIR/webrtc-ios/.git" cp -R "$SRCDIR/webrtc-ios/src" "$BUILD_DIR/webrtc-ios/src" DEPOT_TOOLS_PATH="$(location //third-party:depot_tools_sources)" diff --git a/third-party/webrtc/build-webrtc-buck.sh b/third-party/webrtc/build-webrtc-buck.sh index 4c698aa6a4..4bbd9cd716 100755 --- a/third-party/webrtc/build-webrtc-buck.sh +++ b/third-party/webrtc/build-webrtc-buck.sh @@ -27,7 +27,7 @@ if [ "$ARCH" == "x64" ]; then OUT_DIR="ios_sim" fi -buildtools/mac/gn gen out/$OUT_DIR --args="use_xcode_clang=true "" target_cpu=\"$ARCH\""' target_os="ios" is_debug=false is_component_build=false rtc_include_tests=false use_rtti=true rtc_use_x11=false use_custom_libcxx=false use_custom_libcxx_for_host=false rtc_include_builtin_video_codecs=false rtc_build_ssl=false rtc_build_examples=false rtc_build_tools=false ios_deployment_target="9.0" ios_enable_code_signing=false is_unsafe_developer_build=false rtc_enable_protobuf=false rtc_include_builtin_video_codecs=false rtc_use_gtk=false rtc_use_metal_rendering=false rtc_ssl_root="//openssl"' +gn gen out/$OUT_DIR --args="use_xcode_clang=true "" target_cpu=\"$ARCH\""' target_os="ios" is_debug=false is_component_build=false rtc_include_tests=false use_rtti=true rtc_use_x11=false use_custom_libcxx=false use_custom_libcxx_for_host=false rtc_include_builtin_video_codecs=false rtc_build_ssl=false rtc_build_examples=false rtc_build_tools=false ios_deployment_target="9.0" ios_enable_code_signing=false is_unsafe_developer_build=false rtc_enable_protobuf=false rtc_include_builtin_video_codecs=false rtc_use_gtk=false rtc_use_metal_rendering=false rtc_ssl_root="//openssl"' ninja -C out/$OUT_DIR webrtc popd