Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nit: Clean iOS build folder, if not empty #8542

Merged
merged 5 commits into from
Nov 13, 2023
Merged

Nit: Clean iOS build folder, if not empty #8542

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b7e50f
Nit: Clean iOS build folder, if not empty
strseb Nov 13, 2023
6a10b50
Also macos
strseb Nov 13, 2023
2e5697f
duh.
strseb Nov 13, 2023
8f97459
Update taskcluster/scripts/build/ios_build_no_adjust_cmake.sh
strseb Nov 13, 2023
ba79469
Update taskcluster/scripts/build/macos_build.sh
strseb Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions taskcluster/scripts/build/ios_build_no_adjust_cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,24 @@ print G "done."

print Y "Configuring the build..."
QTVERSION=$(ls ${MOZ_FETCHES_DIR}/qt_ios)


if [ -d ${TASK_HOME}/build ]; then
echo "Found old build-folder, wierd!"
strseb marked this conversation as resolved.
Show resolved Hide resolved
echo "Removing it..."
rm -r ${TASK_HOME}/build
fi
mkdir ${TASK_HOME}/build



$MOZ_FETCHES_DIR/qt_ios/$QTVERSION/ios/bin/qt-cmake -S . -B ${TASK_HOME}/build -GXcode \
-DQT_HOST_PATH="$MOZ_FETCHES_DIR/qt_ios/$QTVERSION/macos" \
-DCMAKE_PREFIX_PATH=$MOZ_FETCHES_DIR/qt_ios/lib/cmake \
-DCMAKE_OSX_ARCHITECTURES="arm64" \
-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="" \
-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED="NO" \
-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED="NO" \
-DSENTRY_DSN="dummy" \
-DSENTRY_ENVELOPE_ENDPOINT="dummy" \
-DCMAKE_BUILD_TYPE=Release

print Y "Building the client..."
Expand Down
5 changes: 5 additions & 0 deletions taskcluster/scripts/build/macos_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ then
fi

print Y "Configuring the build..."
if [ -d ${TASK_HOME}/build ]; then
echo "Found old build-folder, wierd!"
strseb marked this conversation as resolved.
Show resolved Hide resolved
echo "Removing it..."
rm -r ${TASK_HOME}/build
fi
mkdir ${TASK_HOME}/build

cmake -S . -B ${TASK_HOME}/build -GNinja \
Expand Down
Loading