diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh index 6c164e57c1..8d60a611e3 100644 --- a/buildbox/build-telegram.sh +++ b/buildbox/build-telegram.sh @@ -25,7 +25,11 @@ if [ ! -d "$BUILDBOX_DIR/$CODESIGNING_SUBPATH" ]; then exit 1 fi -tar czf "$BUILDBOX_DIR/transient-data/source.tar.gz" --exclude "$BUILDBOX_DIR" . +BASE_DIR=$(pwd) +SOURCE_DIR=$(basename "$BASE_DIR") +cd .. +tar cf "$SOURCE_DIR/$BUILDBOX_DIR/transient-data/source.tar" --exclude "$SOURCE_DIR/$BUILDBOX_DIR" "$SOURCE_DIR" +cd "$BASE_DIR" VM_BASE_NAME="macos10_14_3_Xcode10_1" @@ -44,8 +48,13 @@ prlctl snapshot-switch "$VM_NAME" -i "$SNAPSHOT_ID" VM_IP=$(prlctl exec "$VM_NAME" "ifconfig | grep inet | grep broadcast | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' | head -1 | tr '\n' '\0'") scp -pr "$BUILDBOX_DIR/$CODESIGNING_SUBPATH" telegram@"$VM_IP":codesigning_data -scp -pr "$BUILDBOX_DIR/transient-data/telegram-ios-shared" telegram@"$VM_IP":telegram-ios-shared -scp -pr "$BUILDBOX_DIR/guest-build-telegram.sh" "$BUILDBOX_DIR/transient-data/source.tar.gz" telegram@"$VM_IP": + +if [ "$BUILD_CONFIGURATION" == "verify" ]; then + scp -pr "$BUILDBOX_DIR/fake-shared" telegram@"$VM_IP":telegram-ios-shared +else + scp -pr "$BUILDBOX_DIR/transient-data/telegram-ios-shared" telegram@"$VM_IP":telegram-ios-shared +fi +scp -pr "$BUILDBOX_DIR/guest-build-telegram.sh" "$BUILDBOX_DIR/transient-data/source.tar" telegram@"$VM_IP": ssh telegram@"$VM_IP" -o ServerAliveInterval=60 -t "bash -l guest-build-telegram.sh $BUILD_CONFIGURATION" diff --git a/buildbox/fake-shared/Config/AppStoreLLC/Config.xcconfig b/buildbox/fake-shared/Config/AppStoreLLC/Config.xcconfig new file mode 100644 index 0000000000..d381ccc3d0 --- /dev/null +++ b/buildbox/fake-shared/Config/AppStoreLLC/Config.xcconfig @@ -0,0 +1,8 @@ +APP_NAME=Telegram +APP_BUNDLE_ID=ph.telegra.Telegraph +APP_SPECIFIC_URL_SCHEME=tgapp + +GLOBAL_CONSTANTS = APP_CONFIG_IS_INTERNAL_BUILD=false APP_CONFIG_IS_APPSTORE_BUILD=true APP_CONFIG_APPSTORE_ID=686449807 APP_SPECIFIC_URL_SCHEME="\"$(APP_SPECIFIC_URL_SCHEME)\"" +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(GLOBAL_CONSTANTS) + +#include "Data.xcconfig" diff --git a/buildbox/fake-shared/Config/AppStoreLLC/Data.xcconfig b/buildbox/fake-shared/Config/AppStoreLLC/Data.xcconfig new file mode 100644 index 0000000000..935e871569 --- /dev/null +++ b/buildbox/fake-shared/Config/AppStoreLLC/Data.xcconfig @@ -0,0 +1 @@ +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) APP_CONFIG_DATA="\"\"" \ No newline at end of file diff --git a/buildbox/fake-shared/fastlane/Fastfile b/buildbox/fake-shared/fastlane/Fastfile new file mode 100644 index 0000000000..e69de29bb2 diff --git a/buildbox/guest-build-telegram.sh b/buildbox/guest-build-telegram.sh index 11542dd0fa..9f0c7fa272 100644 --- a/buildbox/guest-build-telegram.sh +++ b/buildbox/guest-build-telegram.sh @@ -5,13 +5,14 @@ if [ "$1" == "hockeyapp" ]; then elif [ "$1" == "appstore" ]; then FASTLANE_BUILD_CONFIGURATION="testflight_llc" elif [ "$1" == "verify" ]; then - FASTLANE_BUILD_CONFIGURATION="testflight_llc" + FASTLANE_BUILD_CONFIGURATION="build_for_appstore" else echo "Unknown configuration $1" exit 1 fi security unlock-keychain -p telegram +security set-keychain-settings -lut 7200 CERTS_PATH="codesigning_data/certs" for f in $(ls "$CERTS_PATH"); do @@ -27,17 +28,15 @@ for f in $(ls "$PROFILES_PATH"); do cp "$PROFILE_PATH" "$HOME/Library/MobileDevice/Provisioning Profiles/$uuid.mobileprovision" done -SOURCE_PATH="source" +SOURCE_PATH="telegram-ios" if [ -d "$SOURCE_PATH" ]; then echo "$SOURCE_PATH must not exist" exit 1 fi -mkdir -p "$SOURCE_PATH" - echo "Unpacking files..." -tar -xzf "source.tar.gz" -C "$SOURCE_PATH" +tar -xf "source.tar" cd "$SOURCE_PATH" fastlane "$FASTLANE_BUILD_CONFIGURATION"