Changes In Branch wii-u Through [8384094996] Excluding Merge-Ins
This is equivalent to a diff from 5b6a00a277 to 8384094996
|
2022-07-31
| ||
| 20:10 | Add OFMemoryStream (check-in: e291e6e982 user: js tags: trunk) | |
| 16:48 | OFStdIOStream: Use OSConsoleWrite() on Wii U (check-in: abb642bba9 user: js tags: wii-u) | |
| 16:06 | Ignore tests/tests.rpx in VCS (check-in: 8384094996 user: js tags: wii-u) | |
| 16:04 | tests: Use OSReport() to output test results (check-in: ed618ae2c7 user: js tags: wii-u) | |
| 14:16 | Merge trunk into branch "wii-u" (check-in: e10048ac32 user: js tags: wii-u) | |
| 14:15 | configure: Add missing OBJFW_CPPFLAGS for Switch (check-in: 5b6a00a277 user: js tags: trunk) | |
| 14:06 | Add initial support for Nintendo Switch (check-in: f2d9ec1868 user: js tags: trunk) | |
Modified .fossil-settings/clean-glob from [fba2645b54] to [bce0529260].
| ︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 | tests/plugin/Info.plist tests/terminal/terminal_tests tests/tests tests/tests.3dsx tests/tests.arm9 tests/tests.nds tests/tests.nro utils/objfw-config utils/ofarc/ofarc utils/ofdns/ofdns utils/ofhash/ofhash utils/ofhttp/ofhttp | > | 41 42 43 44 45 46 47 48 49 50 51 52 53 | tests/plugin/Info.plist tests/terminal/terminal_tests tests/tests tests/tests.3dsx tests/tests.arm9 tests/tests.nds tests/tests.nro tests/tests.rpx utils/objfw-config utils/ofarc/ofarc utils/ofdns/ofdns utils/ofhash/ofhash utils/ofhttp/ofhttp |
Modified .fossil-settings/ignore-glob from [a8ddbc70d8] to [af0f124148].
| ︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 | tests/plugin/Info.plist tests/terminal/terminal_tests tests/tests tests/tests.3dsx tests/tests.arm9 tests/tests.nds tests/tests.nro utils/objfw-config utils/ofarc/ofarc utils/ofdns/ofdns utils/ofhash/ofhash utils/ofhttp/ofhttp | > | 46 47 48 49 50 51 52 53 54 55 56 57 58 | tests/plugin/Info.plist tests/terminal/terminal_tests tests/tests tests/tests.3dsx tests/tests.arm9 tests/tests.nds tests/tests.nro tests/tests.rpx utils/objfw-config utils/ofarc/ofarc utils/ofdns/ofdns utils/ofhash/ofhash utils/ofhttp/ofhttp |
Modified .gitignore from [30dcd26802] to [2fa2b2bd7c].
| ︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 | tests/plugin/Info.plist tests/terminal/terminal_tests tests/tests tests/tests.3dsx tests/tests.arm9 tests/tests.nds tests/tests.nro utils/objfw-config utils/ofarc/ofarc utils/ofdns/ofdns utils/ofhash/ofhash utils/ofhttp/ofhttp | > | 46 47 48 49 50 51 52 53 54 55 56 57 58 | tests/plugin/Info.plist tests/terminal/terminal_tests tests/tests tests/tests.3dsx tests/tests.arm9 tests/tests.nds tests/tests.nro tests/tests.rpx utils/objfw-config utils/ofarc/ofarc utils/ofdns/ofdns utils/ofhash/ofhash utils/ofhttp/ofhttp |
Modified configure.ac from [eeebcf4cfa] to [2ca10c3d8d].
| ︙ | ︙ | |||
178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.]) ]) flags="-mrvl -mcpu=750 -meabi -mhard-float" OBJCFLAGS="$OBJCFLAGS $flags" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags" CPPFLAGS="$CPPFLAGS -DGEKKO -I$DEVKITPRO/libogc/include" LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -meabi -mhard-float" LIBS="$LIBS -L$DEVKITPRO/libogc/lib/wii -lfat -logc" TESTS_LIBS="$TESTS_LIBS -lwiiuse -lbte" enable_shared="no" enable_threads="no" # TODO with_tls="no" AC_DEFINE(OF_WII, 1, [Whether we are compiling for Wii]) | > > > > > > > > > > > > > > > > | > > > > > > > > < > < | 178 179 180 181 182 183 184 185 186 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 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.]) ]) flags="-mrvl -mcpu=750 -meabi -mhard-float" OBJCFLAGS="$OBJCFLAGS $flags" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags" CPPFLAGS="$CPPFLAGS -DGEKKO -I$DEVKITPRO/libogc/include" OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DGEKKO -I\$DEVKITPRO/libogc/include" LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -meabi -mhard-float" LIBS="$LIBS -L$DEVKITPRO/libogc/lib/wii -lfat -logc" TESTS_LIBS="$TESTS_LIBS -lwiiuse -lbte" enable_shared="no" enable_threads="no" # TODO with_tls="no" AC_DEFINE(OF_WII, 1, [Whether we are compiling for Wii]) AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map']) ]) AC_ARG_WITH(wii-u, AS_HELP_STRING([--with-wii-u], [build for Wii U])) AS_IF([test x"$with_wii_u" = x"yes"], [ AS_IF([test x"$DEVKITPRO" = x""], [ AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.]) ]) flags="-mcpu=750 -meabi -mhard-float" OBJCFLAGS="$OBJCFLAGS $flags" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags" CPPFLAGS="-isystem $DEVKITPRO/wut/include -D__WIIU__ -D__WUT__" OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -isystem \$DEVKITPRO/wut/include" OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -D__WIIU__ -D__WUT__" LDFLAGS="-specs=$DEVKITPRO/wut/share/wut.specs" LIBS="-L$DEVKITPRO/wut/lib -L$DEVKITPRO/wut/lib/stubs -lwut" enable_shared="no" enable_threads="no" # TODO enable_sockets="no" # TODO AC_DEFINE(OF_WII_U, 1, [Whether we are compiling for Wii U]) AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map']) ]) AC_ARG_WITH(nds, AS_HELP_STRING([--with-nds], [build for Nintendo DS])) AS_IF([test x"$with_nds" = x"yes"], [ AS_IF([test x"$DEVKITPRO" = x""], [ AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.]) ]) flags="-march=armv5te -mtune=arm946e-s -mthumb -mthumb-interwork" OBJCFLAGS="$OBJCFLAGS $flags" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags" CPPFLAGS="$CPPFLAGS -DARM9 -I$DEVKITPRO/libnds/include" OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DARM9 -I\$DEVKITPRO/libnds/include" ASFLAGS="$ASFLAGS -march=armv5te" LDFLAGS="$LDFLAGS -specs=ds_arm9.specs" LIBS="$LIBS -L$DEVKITPRO/libnds/lib -lfilesystem -lfat -lnds9" enable_shared="no" enable_threads="no" # TODO enable_sockets="no" # TODO check_pedantic="no" AC_DEFINE(OF_NINTENDO_DS, 1, [Whether we are compiling for Nintendo DS]) AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map']) ]) AC_ARG_WITH(3ds, AS_HELP_STRING([--with-3ds], [build for Nintendo 3DS])) AS_IF([test x"$with_3ds" = x"yes"], [ AS_IF([test x"$DEVKITPRO" = x""], [ AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.]) ]) flags="-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft" flags="$flags -mword-relocations" OBJCFLAGS="$OBJCFLAGS $flags" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags" CPPFLAGS="$CPPFLAGS -DARM11 -I$DEVKITPRO/libctru/include" OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DARM11 -I\$DEVKITPRO/libctru/include" ASFLAGS="$ASFLAGS -march=armv6k" LDFLAGS="$LDFLAGS -specs=3dsx.specs -march=armv6k -mtune=mpcore" LDFLAGS="$LDFLAGS -mfloat-abi=hard -mtp=soft -mword-relocations" LIBS="$LIBS -L$DEVKITPRO/libctru/lib -lctru" enable_shared="no" enable_threads="no" # TODO with_tls="no" check_pedantic="no" AC_DEFINE(OF_NINTENDO_3DS, 1, [Whether we are compiling for Nintendo 3DS]) AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map']) ]) AC_ARG_WITH(nintendo-switch, AS_HELP_STRING([--with-nintendo-switch], [build for Nintendo Switch])) AS_IF([test x"$with_nintendo_switch" = x"yes"], [ AS_IF([test x"$DEVKITPRO" = x""], [ |
| ︙ | ︙ |
Modified src/objfw-defs.h.in from [72a5ae113a] to [8f5a561d98].
| ︙ | ︙ | |||
44 45 46 47 48 49 50 | #undef OF_NINTENDO_3DS #undef OF_NINTENDO_DS #undef OF_NINTENDO_SWITCH #undef OF_NO_SHARED #undef OF_OBJFW_RUNTIME #undef OF_UNIVERSAL #undef OF_WII | > | 44 45 46 47 48 49 50 51 | #undef OF_NINTENDO_3DS #undef OF_NINTENDO_DS #undef OF_NINTENDO_SWITCH #undef OF_NO_SHARED #undef OF_OBJFW_RUNTIME #undef OF_UNIVERSAL #undef OF_WII #undef OF_WII_U |
Modified tests/Makefile from [7c3cce2239] to [d685186721].
1 2 3 4 5 6 7 8 9 10 |
include ../extra.mk
SUBDIRS = ${TESTPLUGIN} \
${OBJC_SYNC} \
terminal
CLEAN = EBOOT.PBP \
boot.dol \
${PROG_NOINST}.arm9 \
${PROG_NOINST}.nds \
| | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |
include ../extra.mk
SUBDIRS = ${TESTPLUGIN} \
${OBJC_SYNC} \
terminal
CLEAN = EBOOT.PBP \
boot.dol \
${PROG_NOINST}.arm9 \
${PROG_NOINST}.nds \
${PROG_NOINST}.nro \
${PROG_NOINST}.rpx
DISTCLEAN = Info.plist
PROG_NOINST = tests${PROG_SUFFIX}
STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
SRCS = ForwardingTests.m \
OFArrayTests.m \
${OF_BLOCK_TESTS_M} \
|
| ︙ | ︙ | |||
215 216 217 218 219 220 221 222 223 224 225 226 227 |
rm -fr romfs
mkdir -p romfs
cp testfile.bin testfile.txt testfile.ini serialization.xml romfs
nacptool --create "ObjFW tests" "Jonathan Schleifer" \
"${PACKAGE_VERSION}" tests.nacp
elf2nro ${PROG_NOINST} $@ --nacp=tests.nacp --romfsdir=romfs
rm -fr romfs tests.nacp
CPPFLAGS += -I../src -I../src/exceptions -I../src/runtime -I.. -DSTDOUT
OBJCFLAGS_RuntimeARCTests.m = -fobjc-arc -fobjc-arc-exceptions
LIBS := ${TESTS_LIBS} ${LIBS}
LDFLAGS += ${MAP_LDFLAGS}
LD = ${OBJC}
| > > > | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 |
rm -fr romfs
mkdir -p romfs
cp testfile.bin testfile.txt testfile.ini serialization.xml romfs
nacptool --create "ObjFW tests" "Jonathan Schleifer" \
"${PACKAGE_VERSION}" tests.nacp
elf2nro ${PROG_NOINST} $@ --nacp=tests.nacp --romfsdir=romfs
rm -fr romfs tests.nacp
${PROG_NOINST}.rpx: ${PROG_NOINST}
elf2rpl $< $@
CPPFLAGS += -I../src -I../src/exceptions -I../src/runtime -I.. -DSTDOUT
OBJCFLAGS_RuntimeARCTests.m = -fobjc-arc -fobjc-arc-exceptions
LIBS := ${TESTS_LIBS} ${LIBS}
LDFLAGS += ${MAP_LDFLAGS}
LD = ${OBJC}
|
Modified tests/TestsAppDelegate.m from [a6eba3166b] to [845a6f5691].
| ︙ | ︙ | |||
33 34 35 36 37 38 39 40 41 42 43 44 45 46 | #ifdef OF_WII # define asm __asm__ # include <gccore.h> # include <wiiuse/wpad.h> # undef asm #endif #ifdef OF_NINTENDO_DS # define asm __asm__ # include <nds.h> # undef asm #endif | > > > > > > | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | #ifdef OF_WII # define asm __asm__ # include <gccore.h> # include <wiiuse/wpad.h> # undef asm #endif #ifdef OF_WII_U # define BOOL WUT_BOOL # include <coreinit/debug.h> # undef BOOL #endif #ifdef OF_NINTENDO_DS # define asm __asm__ # include <nds.h> # undef asm #endif |
| ︙ | ︙ | |||
224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 |
consoleExit(NULL);
abort();
# else
abort();
# endif
}
#else
return OFApplicationMain(&argc, &argv, [[TestsAppDelegate alloc] init]);
#endif
}
@implementation TestsAppDelegate
- (void)outputTesting: (OFString *)test inModule: (OFString *)module
{
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor yellow]];
[OFStdOut writeFormat: @"[%@] %@: testing...", module, test];
} else
[OFStdOut writeFormat: @"[%@] %@: ", module, test];
#ifdef OF_NINTENDO_SWITCH
updateConsole(false);
#endif
}
- (void)outputSuccess: (OFString *)test inModule: (OFString *)module
{
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor lime]];
[OFStdOut eraseLine];
[OFStdOut writeFormat: @"\r[%@] %@: ok\n", module, test];
} else
[OFStdOut writeLine: @"ok"];
#ifdef OF_NINTENDO_SWITCH
updateConsole(false);
#endif
}
- (void)outputFailure: (OFString *)test inModule: (OFString *)module
{
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor red]];
[OFStdOut eraseLine];
[OFStdOut writeFormat: @"\r[%@] %@: failed\n", module, test];
} else
[OFStdOut writeLine: @"failed"];
| > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | > > > | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 |
consoleExit(NULL);
abort();
# else
abort();
# endif
}
#elif defined(OF_WII_U)
@try {
return OFApplicationMain(&argc, &argv,
[[TestsAppDelegate alloc] init]);
} @catch (id e) {
OSReport("\nRuntime error: Unhandled exception:\n%s\n",
[[e description] UTF8String]);
OSReport("\nBacktrace:\n %s\n\n",
[[e backtrace] componentsJoinedByString: @"\n "]
.UTF8String);
abort();
}
#else
return OFApplicationMain(&argc, &argv, [[TestsAppDelegate alloc] init]);
#endif
}
@implementation TestsAppDelegate
- (void)outputTesting: (OFString *)test inModule: (OFString *)module
{
#ifndef OF_WII_U
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor yellow]];
[OFStdOut writeFormat: @"[%@] %@: testing...", module, test];
} else
[OFStdOut writeFormat: @"[%@] %@: ", module, test];
#else
OSReport("[%s] %s: ", module.UTF8String, test.UTF8String);
#endif
#ifdef OF_NINTENDO_SWITCH
updateConsole(false);
#endif
}
- (void)outputSuccess: (OFString *)test inModule: (OFString *)module
{
#ifndef OF_WII_U
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor lime]];
[OFStdOut eraseLine];
[OFStdOut writeFormat: @"\r[%@] %@: ok\n", module, test];
} else
[OFStdOut writeLine: @"ok"];
#else
OSReport("ok\n");
#endif
#ifdef OF_NINTENDO_SWITCH
updateConsole(false);
#endif
}
- (void)outputFailure: (OFString *)test inModule: (OFString *)module
{
#ifndef OF_WII_U
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor red]];
[OFStdOut eraseLine];
[OFStdOut writeFormat: @"\r[%@] %@: failed\n", module, test];
} else
[OFStdOut writeLine: @"failed"];
# ifdef OF_WII
[OFStdOut reset];
[OFStdOut writeLine: @"Press A to continue!"];
for (;;) {
WPAD_ScanPads();
if (WPAD_ButtonsDown(0) & WPAD_BUTTON_A)
return;
VIDEO_WaitVSync();
}
# endif
# ifdef OF_PSP
[OFStdOut reset];
[OFStdOut writeLine: @"Press X to continue!"];
for (;;) {
SceCtrlData pad;
sceCtrlReadBufferPositive(&pad, 1);
if (pad.Buttons & PSP_CTRL_CROSS) {
for (;;) {
sceCtrlReadBufferPositive(&pad, 1);
if (!(pad.Buttons & PSP_CTRL_CROSS))
return;
}
}
}
# endif
# ifdef OF_NINTENDO_DS
[OFStdOut reset];
[OFStdOut writeString: @"Press A to continue!"];
for (;;) {
swiWaitForVBlank();
scanKeys();
if (keysDown() & KEY_A)
break;
}
# endif
# ifdef OF_NINTENDO_3DS
[OFStdOut reset];
[OFStdOut writeString: @"Press A to continue!"];
for (;;) {
hidScanInput();
if (hidKeysDown() & KEY_A)
break;
gspWaitForVBlank();
}
# endif
# ifdef OF_NINTENDO_SWITCH
[OFStdOut reset];
[OFStdOut writeString: @"Press A to continue!"];
while (appletMainLoop()) {
PadState pad;
padUpdate(&pad);
updateConsole(true);
if (padGetButtonsDown(&pad) & HidNpadButton_A)
break;
}
# endif
if (OFStdOut.hasTerminal) {
[OFStdOut writeString: @"\r"];
[OFStdOut reset];
[OFStdOut eraseLine];
}
#else
OSReport("failed\n");
#endif
}
- (void)applicationDidFinishLaunching
{
#if defined(OF_IOS) && defined(OF_HAVE_FILES)
CFBundleRef mainBundle = CFBundleGetMainBundle();
CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
|
| ︙ | ︙ |