From 094621e921e6a5e1168abadb77f7a72ac4c9bd9b Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 15 Feb 2021 09:31:24 +0000 Subject: [PATCH] Fix some typos --- .travis.yml | 1 + build.sh | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c43f2c2..2956dcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,7 @@ install: - bash ${TRAVIS_BUILD_DIR}/.travis/install.sh script: + - echo 1 > ${HOME}/PawPawBuilds/builds/macos-universal/.last-build-version - bash ${TRAVIS_BUILD_DIR}/build.sh ${TARGET} deploy: diff --git a/build.sh b/build.sh index ee88838..607500f 100755 --- a/build.sh +++ b/build.sh @@ -51,7 +51,11 @@ fi if [ ${BUILD_VERSION} -eq 2 ]; then # qt build takes too long on macos-universal target, download and use premade builds if [ "${TARGET}" = "macos-universal" ]; then + CROSS_COMPILING=1 + MACOS=1 + MACOS_OLD=0 MACOS_UNIVERSAL=1 + WIN32=0 source "${TRAVIS_BUILD_DIR}/PawPaw/setup/versions.sh" mkdir "${PAWPAW_BUILDDIR}/qtbase-everywhere-src-${QT5_VERSION}" touch "${PAWPAW_BUILDDIR}/qtbase-everywhere-src-${QT5_VERSION}/.stamp_configured" @@ -70,7 +74,7 @@ if [ ${BUILD_VERSION} -eq 2 ]; then touch "${PAWPAW_BUILDDIR}/qttools-everywhere-src-${QT5_VERSION}/.stamp_configured" touch "${PAWPAW_BUILDDIR}/qttools-everywhere-src-${QT5_VERSION}/.stamp_built" touch "${PAWPAW_BUILDDIR}/qttools-everywhere-src-${QT5_VERSION}/.stamp_installed" - pushd "${PAWPAW_DIR}/target/${TARGET}" + pushd "${PAWPAW_DIR}/targets/${TARGET}" curl -L "https://falktx.com/data/pawpaw-qt-macos-universal.tar.xz" -o "pawpaw-qt-macos-universal.tar.xz" --fail tar xvf pawpaw-qt-macos-universal.tar.xz popd