ObjFW: Check-in [79fe29dbf4]

Overview

Comment:	Remove underscores from library & framework names This is more compatible with the various conventions used on various systems.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA3-256:	79fe29dbf45fc79e2b8a081ae4438c42d07e50c37afe575c4c20e2f9f943991d
User & Date:	js on 2019-06-17 00:38:44
Other Links:	manifest \| tags

Context

2019-06-17
02:33		Remove underscores from class names check-in: 17d57e01ff user: js tags: trunk
00:38		Remove underscores from library & framework names check-in: 79fe29dbf4 user: js tags: trunk
2019-06-16
15:11		bridge: Make -[OFException throw] OF_NO_RETURN check-in: 6499e22e06 user: js tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified .gitignore from [6b7c38a229] to [c477958019].

Modified configure.ac from [1674316f0b] to [7b78df7df0].

Modified extra.mk.in from [30769b532e] to [24ff396ef7].

Modified generators/Makefile from [74fa5c5d76] to [3ca3993514].

Modified src/OFObject.m from [2b218f823b] to [9fed2e9f2d].

Modified src/bridge/Info.plist.in from [b45cb6eacb] to [8dcff1a319].

Modified src/bridge/Makefile from [2f7998359b] to [ce4a0c019e].

Modified src/bridge/NSArray+OFObject.h from [33667f5ceb] to [691f5b950d].

Modified src/bridge/NSBridging.h from [b9ec6aa2e5] to [5153bbcc02].

Modified src/bridge/NSDictionary+OFObject.h from [8ff74d6e47] to [ac669dd57d].

Modified src/bridge/NSString+OFObject.h from [9a240ce10e] to [6ee46f2214].

Modified src/bridge/OFArray+NSObject.h from [6b90b369d8] to [b17b385f77].

Modified src/bridge/OFBridging.h from [35465b0136] to [54da8c2065].

Modified src/bridge/OFDictionary+NSObject.h from [9a0de02468] to [8910636eb9].

Modified src/bridge/OFString+NSObject.h from [d0c5d982e3] to [803c3532aa].

Added src/bridge/ObjFWBridge.h version [235870b2b1].

Deleted src/bridge/ObjFW_Bridge.h version [235870b2b1].

Modified src/bridge/module.modulemap from [41a71de0ee] to [a8756331d9].

Modified src/macros.h from [989f46865e] to [e1abebe584].

Modified src/runtime/Makefile from [5df25b2e4e] to [ec23ad162e].

Added src/runtime/ObjFWRT.h version [ae5ec75af6].

Deleted src/runtime/ObjFW_RT.h version [ae5ec75af6].

Modified src/runtime/amiga-glue.m from [ed9ba802b7] to [503dc0b454].

Modified src/runtime/amiga-library.m from [7e60f6ed92] to [980704d720].

Modified src/runtime/amigaos3.sfd from [2296d58876] to [e2960d0e01].

Modified src/runtime/arc.m from [39e51eca73] to [0243808085].

Modified src/runtime/category.m from [153181212b] to [5c4513a7b1].

Modified src/runtime/class.m from [889cba075c] to [15508d0871].

Modified src/runtime/dtable.m from [cf2f11a647] to [4a911fd981].

Modified src/runtime/exception.m from [ef7a9d3c88] to [fae3aff94d].

Modified src/runtime/hashtable.m from [3b13e94c04] to [96b292ba8e].

Modified src/runtime/init.m from [fc1b267682] to [8f157610ad].

Modified src/runtime/linklib/Makefile from [87f2019e8e] to [90ff5bb4a5].

Modified src/runtime/linklib/linklib.m from [5fd34ee158] to [8e395bc89c].

Modified src/runtime/lookup.m from [15533381ae] to [f359b0b2e3].

Modified src/runtime/misc.m from [09fc423a7b] to [50df5eb67e].

Modified src/runtime/property.m from [d9999f1e54] to [bfdd708620].

Modified src/runtime/protocol.m from [4cf5f39401] to [a6c68f71a3].

Modified src/runtime/selector.m from [97ce324a27] to [99b2d0f965].

Modified src/runtime/sparsearray.m from [4f833eac9f] to [db78821eca].

Modified src/runtime/static-instances.m from [ca4604a232] to [8c2bdd3f07].

Modified src/runtime/synchronized.m from [b295d8a24c] to [b6b74f5fb8].

Modified src/runtime/threading.m from [7a03675ae5] to [4b5bfa32f7].

Modified tests/Makefile from [7bd30502da] to [d75cc7b769].

Modified tests/objc_sync/Makefile from [bedcf46763] to [b99d2a03c8].

Modified utils/ofarc/Makefile from [54cd9e2243] to [957c305108].

Modified utils/ofdns/Makefile from [83fe6860c6] to [3c6086809b].

Modified utils/ofhash/Makefile from [9510c81193] to [4405db897f].

Modified utils/ofhttp/Makefile from [5bee3112e5] to [ca0ac82289].

︙
54 55 56 57 58 59 60 ~~61 62~~ 63 64 65 66 67 68 69	54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69	- - + +	enable_threads="no" enable_sockets="no" enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" ac_cv_snprintf_useful_ret="yes" AS_IF([test x"$enable_amiga_lib" != x"no"], [ ~~AC_SUBST(OBJFW_RT_AMIGA_LIB, 'objfw~~_rt_${OBJFW_RT_LIB_MAJOR}_~~68k.library')~~ AC_SUBST(OBJFWRT_AMIGA_LIB, 'objfwrt68k.library') AC_SUBST(SFDC_TARGET, m68k-amigaos) AC_SUBST(SFD_FILE, amigaos3.sfd) AC_SUBST(SFDC_INLINE_H, inline.h) dnl For 68000, GCC emits calls to helper functions that dnl do not work properly in a library. AC_SUBST(AMIGA_LIB_CFLAGS, "-mcpu=68020 -fbaserel -ffreestanding")
︙
84 85 86 87 88 89 90 ~~91 92 93~~ 94 95 96 97 98 99 100	84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99	- - - + +	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -noixemul" LDFLAGS="$LDFLAGS -noixemul" enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" check_pedantic="no" # Breaks generated inlines AS_IF([test x"$enable_amiga_lib" != x"no"], [ ~~~~t='objfw_rt_${OBJFW_RT_LIB_MAJOR}_morphos'~~ t="$t.library" AC_SUBST(OBJFW_RT_AMIGA_LIB, $t)~~ t='objfwrt.library' AC_SUBST(OBJFWRT_AMIGA_LIB, $t) AC_SUBST(CVINCLUDE_INLINE_H, inline.h) t="-mresident32 -ffreestanding" AC_SUBST(AMIGA_LIB_CFLAGS, $t) t="-mresident32 -nostartfiles -nodefaultlibs" t="$t -lc" AC_SUBST(AMIGA_LIB_LDFLAGS, $t) ])
︙
510 511 512 513 514 515 516 ~~517 518~~ 519 520 521 ~~522~~ 523 524 525 ~~526 527~~ 528 529 530 ~~531~~ 532 ~~533 534 535~~ 536 ~~537~~ 538 539 540 541 ~~542 543 544~~ 545 546 547 548 549 550 551	509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550	- - + + - + - - + + - + - - - + + + - + - - - + + +	AC_MSG_RESULT(no) old_compiler="yes" ]) AC_SUBST(RUNTIME, "runtime") AS_IF([test x"$enable_shared" != x"no"], [ ~~AC_SUBST(OBJFW_RT_SHARED_LIB, "${LIB_PREFIX}objfw_rt${LIB_SUFFIX}")~~ AC_SUBST(OBJFWRT_SHARED_LIB, "${LIB_PREFIX}objfwrt${LIB_SUFFIX}") ]) AS_IF([test x"$enable_static" = x"yes"], [ ~~AC_SUBST(OBJFW_RT_STATIC_LIB, "libobjfw_rt.a")~~ AC_SUBST(OBJFWRT_STATIC_LIB, "libobjfwrt.a") ]) AS_IF([test x"$build_framework" = x"yes"], [ ~~AC_SUBST(OBJFW_RT_FRAMEWORK, "ObjFW_RT.framework") AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFW_RT")~~ AC_SUBST(OBJFWRT_FRAMEWORK, "ObjFWRT.framework") AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFWRT") ]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ ~~AC_SUBST(RUNTIME_LIBS, "-lobjfw_rt.library")~~ AC_SUBST(RUNTIME_LIBS, "-lobjfwrt.library") AC_SUBST(LINKLIB, linklib) ~~tmp="../src/runtime/linklib/libobjfw_rt.library.a" AC_SUBST(LIBOBJFW_RT_DEP, "$tmp") AC_SUBST(LIBOBJFW_RT_DEP_LVL2, "../$tmp")~~ tmp="../src/runtime/linklib/libobjfwrt.library.a" AC_SUBST(LIBOBJFWRT_DEP, "$tmp") AC_SUBST(LIBOBJFWRT_DEP_LVL2, "../$tmp") ], [ ~~AC_SUBST(RUNTIME_LIBS, "-lobjfw_rt")~~ AC_SUBST(RUNTIME_LIBS, "-lobjfwrt") ]) AS_IF([test x"$enable_shared" = x"no" \ -a x"$enable_amiga_lib" = x"no"], [ ~~tmp="../src/runtime/libobjfw_rt.a" AC_SUBST(LIBOBJFW_RT_DEP, "$tmp") AC_SUBST(LIBOBJFW_RT_DEP_LVL2, "../$tmp")~~ tmp="../src/runtime/libobjfwrt.a" AC_SUBST(LIBOBJFWRT_DEP, "$tmp") AC_SUBST(LIBOBJFWRT_DEP_LVL2, "../$tmp") ]) AS_IF([test x"$enable_seluid24" = x"yes"], [ AC_DEFINE(OF_SELUID24, 1, [Whether to use 24 bit selector UIDs]) ])
︙
646 647 648 649 650 651 652 ~~653~~ 654 ~~655~~ 656 657 658 659 660 661 662	645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661	- + - +	AS_IF([test x"$objc_runtime" = x"ObjFW runtime"], [ AS_IF([test x"$exception_type" = x"DWARF"], [ LDFLAGS="$LDFLAGS -Wl,-U,___gxx_personality_v0" ]) AS_IF([test x"$exception_type" = x"SjLj"], [ LDFLAGS="$LDFLAGS -Wl,-U,___gxx_personality_sj0" ]) ~~AC_SUBST(REEXPORT_RUNTIME, ["-Wl,-reexport-lobjfw_rt"])~~ AC_SUBST(REEXPORT_RUNTIME, ["-Wl,-reexport-lobjfwrt"]) AC_SUBST(REEXPORT_RUNTIME_FRAMEWORK, ~~["-Wl,-reexport_framework,ObjFW_RT"])~~ ["-Wl,-reexport_framework,ObjFWRT"]) ]) AC_CHECK_HEADERS(sysdir.h) AC_CHECK_FUNCS(sysdir_start_search_path_enumeration) AS_IF([test x"$host_is_ios" = x"yes"], [ AC_SUBST(TESTS_STATIC_LIB, tests.a)
︙
1431 1432 1433 1434 1435 1436 1437 ~~1438 1439~~ 1440 1441 1442 ~~1443~~ 1444 1445 ~~1446 1447~~ 1448 1449 1450 1451 1452 1453 1454	1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453	- - + + - + - - + +	AS_IF([test x"$objc_runtime" = x"Apple runtime"], [ AC_CHECK_HEADER(Foundation/NSObject.h, [ AC_SUBST(FOUNDATION_COMPAT_M, "foundation-compat.m") AC_SUBST(BRIDGE, "bridge") AS_IF([test x"$enable_shared" != x"no"], [ ~~AC_SUBST(OBJFW_BRIDGE_SHARED_LIB, "${LIB_PREFIX}objfw_bridge${LIB_SUFFIX}")~~ AC_SUBST(OBJFWBRIDGE_SHARED_LIB, "${LIB_PREFIX}objfwbridge${LIB_SUFFIX}") ]) AS_IF([test x"$enable_static" = x"yes" \ -o x"$enable_shared" = x"no"], [ ~~AC_SUBST(OBJFW_BRIDGE_STATIC_LIB, "libobjfw_bridge.a")~~ AC_SUBST(OBJFWBRIDGE_STATIC_LIB, "libobjfwbridge.a") ]) AS_IF([test x"$build_framework" = x"yes"], [ ~~AC_SUBST(OBJFW_BRIDGE_FRAMEWORK, "ObjFW_Bridge.framework")~~ AC_SUBST(OBJFWBRIDGE_FRAMEWORK, "ObjFWBridge.framework") ]) ]) ]) dnl This needs to be after all other header checks, as they include unistd.h, dnl which in old glibc versions uses __block. This is worked around in the code dnl by providing a wrapper for unistd.h which takes care of this.
︙

1 2 3 4 5 6 7 8 ~~9 10 11 12 13 14 15~~ 16 ~~17 18 19~~ 20 21 22 23 24 25 26	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26	- - - - - - - + + + + + + + - - - + + +	OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@ # When changing: Be sure to also change these in the Xcode project! OBJFW_LIB_MAJOR = 9 OBJFW_LIB_MINOR = 0 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR} OBJFW_RT_SHARED_LIB = @OBJFW_RT_SHARED_LIB@ OBJFW_RT_STATIC_LIB = @OBJFW_RT_STATIC_LIB@ OBJFW_RT_FRAMEWORK = @OBJFW_RT_FRAMEWORK@ OBJFW_RT_AMIGA_LIB = @OBJFW_RT_AMIGA_LIB@ OBJFW_RT_LIB_MAJOR = 0 OBJFW_RT_LIB_MINOR = 0 OBJFW_RT_LIB_MAJOR_MINOR = ${OBJFW_RT_LIB_MAJOR}.${OBJFW_RT_LIB_MINOR} OBJFWRT_SHARED_LIB = @OBJFWRT_SHARED_LIB@ OBJFWRT_STATIC_LIB = @OBJFWRT_STATIC_LIB@ OBJFWRT_FRAMEWORK = @OBJFWRT_FRAMEWORK@ OBJFWRT_AMIGA_LIB = @OBJFWRT_AMIGA_LIB@ OBJFWRT_LIB_MAJOR = 0 OBJFWRT_LIB_MINOR = 0 OBJFWRT_LIB_MAJOR_MINOR = ${OBJFWRT_LIB_MAJOR}.${OBJFWRT_LIB_MINOR} ~~OBJFW_BRIDGE_SHARED_LIB = @OBJFW_BRIDGE_SHARED_LIB@ OBJFW_BRIDGE_STATIC_LIB = @OBJFW_BRIDGE_STATIC_LIB@ OBJFW_BRIDGE_FRAMEWORK = @OBJFW_BRIDGE_FRAMEWORK@~~ OBJFWBRIDGE_SHARED_LIB = @OBJFWBRIDGE_SHARED_LIB@ OBJFWBRIDGE_STATIC_LIB = @OBJFWBRIDGE_STATIC_LIB@ OBJFWBRIDGE_FRAMEWORK = @OBJFWBRIDGE_FRAMEWORK@ AUTORELEASE_M = @AUTORELEASE_M@ BIN_PREFIX = @BIN_PREFIX@ BRIDGE = @BRIDGE@ CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@ ENCODINGS = @ENCODINGS@ ENCODINGS_A = @ENCODINGS_A@
︙
38 39 40 41 42 43 44 45 46 ~~47 48~~ 49 50 51 52 53 54 55	38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55	+ + - -	FORWARDING_LIB_A = @FORWARDING_LIB_A@ FOUNDATION_COMPAT_M = @FOUNDATION_COMPAT_M@ INSTANCE_M = @INSTANCE_M@ INVOCATION_A = @INVOCATION_A@ INVOCATION_INVOCATION_A = @INVOCATION_INVOCATION_A@ INVOCATION_INVOCATION_LIB_A = @INVOCATION_INVOCATION_LIB_A@ INVOCATION_LIB_A = @INVOCATION_LIB_A@ LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@ LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@ LIBOBJFW_DEP = @LIBOBJFW_DEP@ LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@ ~~LIBOBJFW_RT_DEP = @LIBOBJFW_RT_DEP@~~ ~~LIBOBJFW_RT_DEP_LVL2 = @LIBOBJFW_RT_DEP_LVL2@~~ LINKLIB = @LINKLIB@ LOOKUP_ASM_A = @LOOKUP_ASM_A@ LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@ LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@ LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ OFARC = @OFARC@
︙

︙
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37	13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37	- + - +	* Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" ~~#import "ObjFW_RT.h"~~ #import "ObjFWRT.h" #import "private.h" #include <exec/libraries.h> #include <exec/nodes.h> #include <exec/resident.h> #include <proto/exec.h> #define CONCAT_VERSION2(major, minor) #major "." #minor #define CONCAT_VERSION(major, minor) CONCAT_VERSION2(major, minor) ~~#define VERSION_STRING CONCAT_VERSION(OBJFW_RT_LIB_MAJOR, OBJFW_RT_LIB_MINOR)~~ #define VERSION_STRING CONCAT_VERSION(OBJFWRT_LIB_MAJOR, OBJFWRT_LIB_MINOR) #if defined(OF_AMIGAOS_M68K) # define DATA_OFFSET 0x7FFE #elif defined(OF_MORPHOS) # define DATA_OFFSET 0x8000 #endif
︙
659 660 661 662 663 664 665 ~~666~~ 667 668 ~~669 670~~ 671 672 673 ~~674~~ 675 676 677 678 679 680 681 682 683 684 685 686	659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686	- + - - + + - +	.rt_MatchTag = &resident, .rt_EndSkip = &resident + 1, .rt_Flags = RTF_AUTOINIT #ifdef OF_MORPHOS \| RTF_PPC \| RTF_EXTENDED #endif , ~~.rt_Version = OBJFW_RT_LIB_MAJOR,~~ .rt_Version = OBJFWRT_LIB_MAJOR, .rt_Type = NT_LIBRARY, .rt_Pri = 0, ~~.rt_Name = (char )OBJFW_RT_AMIGA_LIB, .rt_IdString = (char )"ObjFW_RT " VERSION_STRING~~ .rt_Name = (char )OBJFWRT_AMIGA_LIB, .rt_IdString = (char )"ObjFWRT " VERSION_STRING " \xA9 2008-2019 Jonathan Schleifer", .rt_Init = &init_table, #ifdef OF_MORPHOS ~~.rt_Revision = OBJFW_RT_LIB_MINOR,~~ .rt_Revision = OBJFWRT_LIB_MINOR, .rt_Tags = NULL, #endif }; #ifdef OF_MORPHOS __asm__ ( ".section .ctors, \"aw\", @progbits\n" "ctors:\n" " .long -1\n" ".section .text" ); #endif

︙
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27	13 14 15 16 17 18 19 20 21 22 23 24 25 26 27	- +	* Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" ~~#import "ObjFW_RT.h"~~ #import "ObjFWRT.h" #import "private.h" #import "macros.h" #include <proto/exec.h> struct ObjFWRTBase;
︙
202 203 204 205 206 207 208 ~~209 210 211~~ 212 213 214 215 ~~216~~ 217 218 219 220 221 222 223	202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223	- - - + + + - +	.__register_frame_info = __register_frame_info, .__deregister_frame_info = __deregister_frame_info, }; if (initialized) return; ~~if ((ObjFWRTBase = OpenLibrary(OBJFW_RT_AMIGA_LIB, OBJFW_RT_LIB_MINOR)) == NULL) { fputs("Failed to open " OBJFW_RT_AMIGA_LIB "!\n", stderr);~~ if ((ObjFWRTBase = OpenLibrary(OBJFWRT_AMIGA_LIB, OBJFWRT_LIB_MINOR)) == NULL) { fputs("Failed to open " OBJFWRT_AMIGA_LIB "!\n", stderr); abort(); } if (!objc_init(1, &libc, stdout, stderr)) { ~~fputs("Failed to initialize " OBJFW_RT_AMIGA_LIB "!\n", stderr);~~ fputs("Failed to initialize " OBJFWRT_AMIGA_LIB "!\n", stderr); abort(); } initialized = true; } static void __attribute__((__unused__))
︙

︙
74 75 76 77 78 79 80 ~~81 82 83 84~~ 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 ~~100 101 102 103 104 105 106~~ 107 ~~108 109~~ 110 ~~111 112 113~~ 114 ~~115 116 117~~ 118 119 120 121 122 123 124 125 126 127 ~~128 129 130~~ 131 132 133 134 135 136 137	74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137	- - - - + + + + - - - - - - - + + + + + + + - - + + - - - + + + - - - + + + - - - + + +	post-all: ${RUN_TESTS} .PHONY: run run-on-ios run-on-android run: rm -f libobjfw.so.${OBJFW_LIB_MAJOR} rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} rm -f libobjfw.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib ~~rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR} rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR} rm -f libobjfw_rt.dll libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib rm -f ${OBJFW_RT_AMIGA_LIB}~~ rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR} rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} rm -f libobjfwrt.dll libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib rm -f ${OBJFWRT_AMIGA_LIB} if test -f ../src/libobjfw.so; then \ ${LN_S} ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \ ${LN_S} ../src/libobjfw.so \ libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \ elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \ ${LN_S} ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} \ libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \ fi if test -f ../src/libobjfw.dll; then \ ${LN_S} ../src/libobjfw.dll libobjfw.dll; \ fi if test -f ../src/libobjfw.dylib; then \ ${LN_S} ../src/libobjfw.dylib \ libobjfw.${OBJFW_LIB_MAJOR}.dylib; \ fi if test -f ../src/runtime/libobjfw_rt.so; then \ ${LN_S} ../src/runtime/libobjfw_rt.so \ libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR}; \ ${LN_S} ../src/runtime/libobjfw_rt.so \ libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR}; \ elif test -f ../src/runtime/libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR}; then \ ${LN_S} ../src/runtime/libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR} libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR}; \ if test -f ../src/runtime/libobjfwrt.so; then \ ${LN_S} ../src/runtime/libobjfwrt.so \ libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \ ${LN_S} ../src/runtime/libobjfwrt.so \ libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \ elif test -f ../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; then \ ${LN_S} ../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \ fi ~~if test -f ../src/runtime/libobjfw_rt.dll; then \ ${LN_S} ../src/runtime/libobjfw_rt.dll libobjfw_rt.dll; \~~ if test -f ../src/runtime/libobjfwrt.dll; then \ ${LN_S} ../src/runtime/libobjfwrt.dll libobjfwrt.dll; \ fi ~~if test -f ../src/runtime/libobjfw_rt.dylib; then \ ${LN_S} ../src/runtime/libobjfw_rt.dylib \ libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib; \~~ if test -f ../src/runtime/libobjfwrt.dylib; then \ ${LN_S} ../src/runtime/libobjfwrt.dylib \ libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \ fi ~~if test -f ../src/runtime/${OBJFW_RT_AMIGA_LIB}; then \ ${LN_S} ../src/runtime/${OBJFW_RT_AMIGA_LIB} \ ${OBJFW_RT_AMIGA_LIB}; \~~ if test -f ../src/runtime/${OBJFWRT_AMIGA_LIB}; then \ ${LN_S} ../src/runtime/${OBJFWRT_AMIGA_LIB} \ ${OBJFWRT_AMIGA_LIB}; \ fi LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \ DYLD_FRAMEWORK_PATH=../src:../src/runtime$${DYLD_FRAMEWORK_PATH+:}$$DYLD_FRAMEWORK_PATH \ DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \ LIBRARY_PATH=.$${LIBRARY_PATH+:}$$LIBRARY_PATH \ ASAN_OPTIONS=allocator_may_return_null=1 \ ${WRAPPER} ./${PROG_NOINST}; EXIT=$$?; \ rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \ rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} libobjfw.dll; \ rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \ ~~rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR}; \ rm -f libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR_MINOR} libobjfw_rt.dll; \ rm -f libobjfw_rt.${OBJFW_RT_LIB_MAJOR}.dylib; \~~ rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \ rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} libobjfwrt.dll; \ rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \ exit $$EXIT run-on-ios: all if [ -z "${IOS_HOST}" ]; then \ echo "Please set IOS_HOST to the hostname of your iOS host!"; \ exit 1; \ fi
︙
151 152 153 154 155 156 157 ~~158 159 160~~ 161 162 163 164 165 166 167	151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167	- - - + + +	run-on-android: all echo "Uploading files to Android device..." if test -f ../src/libobjfw.so; then \ adb push ../src/libobjfw.so \ /data/local/tmp/objfw/libobjfw.so.${OBJFW_LIB_MAJOR}; \ fi ~~if test -f ../src/runtime/libobjfw_rt.so; then \ adb push ../src/runtime/libobjfw_rt.so \ /data/local/tmp/objfw/libobjfw_rt.so.${OBJFW_RT_LIB_MAJOR}; \~~ if test -f ../src/runtime/libobjfwrt.so; then \ adb push ../src/runtime/libobjfwrt.so \ /data/local/tmp/objfw/libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \ fi adb push tests /data/local/tmp/objfw/tests adb push testfile.bin /data/local/tmp/objfw/testfile.bin adb push testfile.txt /data/local/tmp/objfw/testfile.txt adb push testfile.ini /data/local/tmp/objfw/testfile.ini adb push serialization.xml /data/local/tmp/objfw/serialization.xml if test -f plugin/TestPlugin.so; then \
︙
176 177 178 179 180 181 182 ~~183~~ 184 185 186 187 188 189 190	176 177 178 179 180 181 182 183 184 185 186 187 188 189 190	- +	mksfo "ObjFW Tests" PARAM.SFO psp-strip ${PROG_NOINST} pack-pbp $@ PARAM.SFO NULL NULL NULL NULL NULL ${PROG_NOINST} NULL boot.dol: ${PROG_NOINST} elf2dol ${PROG_NOINST} $@ ~~${PROG_NOINST}: ${LIBOBJFW_DEP} ${LIBOBJFW_RT_DEP}~~ ${PROG_NOINST}: ${LIBOBJFW_DEP} ${LIBOBJFWRT_DEP} ${PROG_NOINST}.arm9: ${PROG_NOINST} arm-none-eabi-objcopy -O binary $< $@ ${PROG_NOINST}.nds: ${PROG_NOINST}.arm9 rm -fr nds-data mkdir -p nds-data
︙

























1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25	+ + + + + + + + + + + + + + + + + + + + + + + + +	/* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, * 2018, 2019 * Jonathan Schleifer <js@heap.zone> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "NSArray+OFObject.h" #import "NSDictionary+OFObject.h" #import "NSString+OFObject.h" #import "OFArray+NSObject.h" #import "OFException+Swift.h" #import "OFDictionary+NSObject.h" #import "OFString+NSObject.h"

ObjFW Check-in [79fe29dbf4]