Comment: | Merge branch 'master' into 1.0 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | 1.0 |
Files: | files | file ages | folders |
SHA3-256: |
11e303eb3be475958577f5eaa0f4d72b |
User & Date: | js on 2019-12-15 15:37:07 |
Other Links: | branch diff | manifest | tags |
2019-12-15
| ||
15:37 | Remove OFThreadPool check-in: 38cf0b9cef user: js tags: 1.0 | |
15:37 | Merge branch 'master' into 1.0 check-in: 11e303eb3b user: js tags: 1.0 | |
14:42 | Make +[OFSecureData isSecure] per instance check-in: 60caadeb5d user: js tags: trunk | |
2019-09-29
| ||
19:57 | Merge branch 'master' into 1.0 check-in: 76245b4665 user: js tags: 1.0 | |
Modified .travis.yml from [2b9da8daec] to [a4ba9a887a].
︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | + + + + + + + + + + + + + + + + + + + + + + + | sudo: required - os: linux compiler: clang dist: trusty sudo: required # macOS - os: osx osx_image: xcode11.2 language: objective-c env: - no32bit=1 - noruntime=1 # Broken compiler in this version of Xcode - os: osx osx_image: xcode11.1 language: objective-c env: - no32bit=1 - noruntime=1 # Broken compiler in this version of Xcode - os: osx osx_image: xcode11 language: objective-c env: - no32bit=1 - noruntime=1 # Broken compiler in this version of Xcode - os: osx osx_image: xcode10.3 language: objective-c env: - no32bit=1 - os: osx osx_image: xcode10.2 language: objective-c env: - no32bit=1 - os: osx osx_image: xcode10.1 |
︙ | |||
62 63 64 65 66 67 68 69 70 71 72 73 74 75 | 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | osx_image: xcode8 language: objective-c - os: osx osx_image: xcode7.3 language: objective-c # iOS - os: osx osx_image: xcode11.2 language: objective-c env: - config=ios - os: osx osx_image: xcode11.1 language: objective-c env: - config=ios - os: osx osx_image: xcode11 language: objective-c env: - config=ios - os: osx osx_image: xcode10.3 language: objective-c env: - config=ios - os: osx osx_image: xcode10.2 language: objective-c env: - config=ios - os: osx osx_image: xcode10.1 language: objective-c env: - config=ios - os: osx osx_image: xcode10 language: objective-c env: - config=ios - os: osx osx_image: xcode9.4 language: objective-c env: - config=ios - os: osx osx_image: xcode9.3 |
︙ | |||
104 105 106 107 108 109 110 | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 | - - - - + + + + - - - - - + + + + | - os: osx osx_image: xcode7.3 language: objective-c env: - config=ios # AmigaOS |
︙ | |||
234 235 236 237 238 239 240 | 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 | + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + | 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; build_mac_32_64 --disable-sockets --disable-files; build_mac_32_64 --disable-files; build_mac_32_64 --disable-shared; if [ -z "$noruntime" ]; then |
︙ |
Modified README.md from [a3fc1bdda7] to [0c9a55fe73].
︙ | |||
49 50 51 52 53 54 55 | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | - + - + - + - + | ### Building as a framework When building for macOS or iOS, everything is built as a `.framework` by default if `--disable-shared` has not been specified to `configure`. To build for iOS, use something like this: |
︙ |
Modified configure.ac from [d5db25efd9] to [112940991b].
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | - | AC_INIT(ObjFW, 1.0, js@heap.zone) AC_CONFIG_SRCDIR(src) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_MACRO_DIR(build-aux/m4) AC_DEFINE(OBJFW_VERSION_MAJOR, 1, [The major version of ObjFW]) AC_DEFINE(OBJFW_VERSION_MINOR, 0, [The minor version of ObjFW]) |
︙ | |||
1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 | 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 | + | msdosdjgpp*) dnl DJGPP has the type, but it's not really usable. ;; *) AC_CHECK_TYPE(off64_t, [ AC_DEFINE(OF_HAVE_OFF64_T, 1, [Whether we have off64_t]) AC_CHECK_FUNCS([lseek64 lstat64 open64 stat64]) ]) ;; esac AC_CHECK_HEADERS([pwd.h grp.h]) AC_CHECK_FUNC(chmod, [ AC_DEFINE(OF_HAVE_CHMOD, 1, [Whether we have chmod()]) |
︙ |
Modified extra.mk.in from [c2430594e6] to [6a46caddbb].
1 2 3 4 5 6 7 8 9 10 11 12 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | - + | 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} OBJFWRT_SHARED_LIB = @OBJFWRT_SHARED_LIB@ OBJFWRT_STATIC_LIB = @OBJFWRT_STATIC_LIB@ OBJFWRT_FRAMEWORK = @OBJFWRT_FRAMEWORK@ OBJFWRT_AMIGA_LIB = @OBJFWRT_AMIGA_LIB@ |
︙ |
Modified src/Makefile from [04a46c14e4] to [32504c7040].
︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | - | OFDictionary.m \ OFEnumerator.m \ OFFileManager.m \ OFGZIPStream.m \ OFHMAC.m \ OFInflate64Stream.m \ OFInflateStream.m \ |
︙ | |||
119 120 121 122 123 124 125 | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 | - + + + | ${USE_SRCS_WINDOWS} SRCS_FILES = OFFile.m \ OFINICategory.m \ OFINIFile.m \ OFSettings.m \ OFString+PathAdditions.m SRCS_PLUGINS = OFPlugin.m |
︙ | |||
195 196 197 198 199 200 201 | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | + - + + | OFSubarray.m \ OFUTF8String.m \ ${AUTORELEASE_M} \ ${INSTANCE_M} \ ${LIBBASES_M} SRCS_FILES += OFFileURLHandler.m \ OFINIFileSettings.m SRCS_SOCKETS += OFDNSResolverSettings.m \ |
︙ |
Modified src/OFAdjacentArray.h from [cebe5ad233] to [6f24e09a18].
︙ | |||
17 18 19 20 21 22 23 | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | - | #import "OFArray.h" OF_ASSUME_NONNULL_BEGIN @class OFMutableData; |
Modified src/OFAdjacentSubarray.h from [bd17bec51a] to [089d0764c2].
︙ | |||
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 | - | * file. */ #import "OFSubarray.h" OF_ASSUME_NONNULL_BEGIN |
Modified src/OFApplication.h from [93b516bfa0] to [1ecf36756b].
︙ | |||
126 127 128 129 130 131 132 | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | - - - | @interface OFApplication: OFObject { OFString *_programName; OFArray OF_GENERIC(OFString *) *_arguments; OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_environment; int *_argc; char ***_argv; |
︙ |
Modified src/OFApplication.m from [c0cd7cc60a] to [641d94e4fd].
︙ | |||
13 14 15 16 17 18 19 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | - - | * 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" |
︙ | |||
97 98 99 100 101 102 103 | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | - - - - - - - - - - - - - - - - - - - | [delegate release]; #if defined(OF_HAVE_THREADS) && defined(OF_HAVE_SOCKETS) && defined(OF_AMIGAOS) of_socket_deinit(); #endif } |
︙ | |||
154 155 156 157 158 159 160 161 162 163 164 165 166 167 | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | + + + + + + + + + + + + + + + + + + + | @implementation OFApplication @synthesize programName = _programName, arguments = _arguments; @synthesize environment = _environment; #ifdef OF_HAVE_SANDBOX @synthesize activeSandbox = _activeSandbox; @synthesize activeSandboxForChildProcesses = _activeSandboxForChildProcesses; #endif #define SIGNAL_HANDLER(signal) \ static void \ handle##signal(int sig) \ { \ app->_##signal##Handler(app->_delegate, \ @selector(applicationDidReceive##signal)); \ } SIGNAL_HANDLER(SIGINT) #ifdef SIGHUP SIGNAL_HANDLER(SIGHUP) #endif #ifdef SIGUSR1 SIGNAL_HANDLER(SIGUSR1) #endif #ifdef SIGUSR2 SIGNAL_HANDLER(SIGUSR2) #endif #undef SIGNAL_HANDLER + (OFApplication *)sharedApplication { return app; } + (OFString *)programName |
︙ |
Added src/OFArray+Private.h version [a806faad1b].
|
Modified src/OFArray.h from [72663abff1] to [3219a87afc].
︙ | |||
88 89 90 91 92 93 94 | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | - - - - | * @brief An abstract class for storing objects in an array. * * @note Subclasses must implement @ref count and @ref objectAtIndex:. */ @interface OFArray OF_GENERIC(ObjectType): OFObject <OFCopying, OFMutableCopying, OFCollection, OFSerialization, OFJSONRepresentation, OFMessagePackRepresentation> |
︙ | |||
492 493 494 495 496 497 498 | 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | - - - - - - - - - - - - - | - (nullable id)foldUsingBlock: (of_array_fold_block_t)block; #endif #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # undef ObjectType #endif @end |
Modified src/OFArray.m from [b12c539371] to [9bb6a6b4d8].
︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | + | #include <stdarg.h> #include <stdlib.h> #include <assert.h> #import "OFArray.h" #import "OFArray+Private.h" #import "OFAdjacentArray.h" #import "OFData.h" #import "OFNull.h" #import "OFString.h" #import "OFSubarray.h" #import "OFXMLElement.h" |
︙ |
Modified src/OFBitSetCharacterSet.h from [0f5e448e50] to [354358342b].
︙ | |||
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | - | * file. */ #import "OFCharacterSet.h" OF_ASSUME_NONNULL_BEGIN |
Modified src/OFBlock.m from [acebb38475] to [b86036ff7d].
︙ | |||
67 68 69 70 71 72 73 | 67 68 69 70 71 72 73 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 | - + - - + + - - - + + + + - - - + + + - - - + + + + - - - + + + - - - + + + + - + - - + + | @protocol RetainRelease - (instancetype)retain; - (void)release; @end #ifdef OF_OBJFW_RUNTIME /* Begin of ObjC module */ |
︙ |
Modified src/OFBytesValue.h from [12d8c96477] to [064f02062a].
︙ | |||
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | - | * file. */ #import "OFValue.h" OF_ASSUME_NONNULL_BEGIN |
Modified src/OFColor.m from [1d58b7ab36] to [9416cbb4f4].
︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 70 71 | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | + + + | return self; } - (bool)isEqual: (id)object { OFColor *other; if (object == self) return true; if (![object isKindOfClass: [OFColor class]]) return false; other = object; if (other->_red != _red) |
︙ |
Modified src/OFCountedMapTableSet.h from [54cdfe273c] to [425da1187b].
︙ | |||
17 18 19 20 21 22 23 | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | - | #import "OFCountedSet.h" OF_ASSUME_NONNULL_BEGIN @class OFMapTable; |
Modified src/OFCountedSet.h from [2ecebf0177] to [4abf7110e4].
︙ | |||
44 45 46 47 48 49 50 | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | - - - - | * of @ref OFSet and @ref OFMutableSet that need to be implemented. */ @interface OFCountedSet OF_GENERIC(ObjectType): OFMutableSet OF_GENERIC(ObjectType) #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # define ObjectType id #endif |
︙ |
Added src/OFDNSQuery.h version [823e60afdb].
|
Added src/OFDNSQuery.m version [e62571f4f4].