Differences From Artifact [7b285d2590]:
- File .travis.yml — part of check-in [514862215f] at 2018-02-17 00:42:14 on branch trunk — .travis.yml: Add builds for Wii and PSP (user: js, size: 7905) [annotate] [blame] [check-ins using]
To Artifact [82e1b8c899]:
- File
.travis.yml
— part of check-in
[8dca47ec20]
at
2018-02-17 16:54:40
on branch trunk
— .travis.yml: Several small improvements
* Reduce the iOS deployment target to 9.0.
* Define _Nonnull, _Nullable and _Null_unspecified for Xcode 6.
Xcode 6 used __nonnull, __nullable and __null_unspecified instead,
while already defining __has_feature(nullability).
* Always set WRAPPER=true for iOS simulator builds.
Old versions of Xcode generated binaries that target the simulator
but could be executed outside of it, resulting in the tests being run
as configure noticed it can run binaries, but the tests failing
because they expected an iOS environment. (user: js, size: 8199) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
157 158 159 160 161 162 163 164 165 166 167 168 169 170 |
fi
- if [ "$TRAVIS_OS_NAME" = "osx" -a -z "$config" ]; then
build_mac_32_64() {
build $@;
build OBJC="clang -m32" --host=i386-apple-darwin $@;
};
build_mac_32_64;
build_mac_32_64 --disable-threads;
build_mac_32_64 --disable-threads --disable-sockets;
build_mac_32_64 --disable-threads --disable-files;
build_mac_32_64 --disable-threads --disable-sockets --disable-files;
build_mac_32_64 --disable-sockets;
| > > > > > > | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 |
fi
- if [ "$TRAVIS_OS_NAME" = "osx" -a -z "$config" ]; then
build_mac_32_64() {
build $@;
build OBJC="clang -m32" --host=i386-apple-darwin $@;
};
if xcodebuild -version | grep 'Xcode 6' >/dev/null; then
export CPPFLAGS="-D_Nullable=__nullable
-D_Nonnull=__nonnull
-D_Null_unspecified=__null_unspecified";
fi;
build_mac_32_64;
build_mac_32_64 --disable-threads;
build_mac_32_64 --disable-threads --disable-sockets;
build_mac_32_64 --disable-threads --disable-files;
build_mac_32_64 --disable-threads --disable-sockets --disable-files;
build_mac_32_64 --disable-sockets;
|
| ︙ | ︙ | |||
181 182 183 184 185 186 187 |
--disable-sockets --disable-files;
build_mac_32_64 --enable-runtime --disable-sockets;
build_mac_32_64 --enable-runtime --disable-sockets --disable-files;
build_mac_32_64 --enable-runtime --disable-files;
build_mac_32_64 --enable-runtime --disable-shared;
build_mac_32_64 --enable-runtime --disable-shared --enable-seluid24;
| | | | 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 |
--disable-sockets --disable-files;
build_mac_32_64 --enable-runtime --disable-sockets;
build_mac_32_64 --enable-runtime --disable-sockets --disable-files;
build_mac_32_64 --enable-runtime --disable-files;
build_mac_32_64 --enable-runtime --disable-shared;
build_mac_32_64 --enable-runtime --disable-shared --enable-seluid24;
export IPHONEOS_DEPLOYMENT_TARGET="9.0";
clang="clang --sysroot $(xcrun --sdk iphoneos --show-sdk-path)";
export OBJC="$clang -arch armv7 -arch arm64";
export OBJCPP="$clang -arch armv7 -E";
build --host=arm-apple-darwin --enable-static;
sysroot="$(xcrun --sdk iphonesimulator --show-sdk-path)";
clang="clang --sysroot $sysroot";
export OBJC="$clang -arch i386 -arch x86_64";
export OBJCPP="$clang -arch i386 -E";
build WRAPPER=true --host=i386-apple-darwin --enable-static;
fi
- if [ "$config" = "devkitarm" ]; then
export DEVKITPRO="$HOME/devkitPro";
export PATH="$DEVKITPRO/devkitARM/bin:$PATH";
build --host=arm-none-eabi --with-3ds;
|
| ︙ | ︙ |