ObjFW  Check-in [1ccdae4fd6]

Overview
Comment:Fix includes of ObjFW-Bridge.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 1ccdae4fd6dabb8c7e365caaa4da5aa8fd9203dd91f5d7749edc1a802dfdb4ca
User & Date: js on 2013-02-24 11:17:21
Other Links: manifest | tags
Context
2013-02-26
18:40
OFNumber: Add long long. check-in: fd8c1728ea user: js tags: trunk
2013-02-24
11:17
Fix includes of ObjFW-Bridge. check-in: 1ccdae4fd6 user: js tags: trunk
11:03
Add missing file to Xcode project. check-in: 4710e7867b user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified ObjFW.xcodeproj/project.pbxproj from [7afade168f] to [12af806c8e].

︙︙
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999

2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033

2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049

			};
			name = Release;
		};
		4B187E20163EA29F0049A832 /* Debug */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;
				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
				CLANG_CXX_LIBRARY = "libc++";
				CLANG_WARN_EMPTY_BODY = YES;
				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
				COMBINE_HIDPI_IMAGES = YES;
				COPY_PHASE_STRIP = NO;
				DYLIB_COMPATIBILITY_VERSION = 7;
				DYLIB_CURRENT_VERSION = 7;
				FRAMEWORK_VERSION = A;
				GCC_DYNAMIC_NO_PIC = NO;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_OPTIMIZATION_LEVEL = 0;
				GCC_PRECOMPILE_PREFIX_HEADER = YES;
				GCC_PREPROCESSOR_DEFINITIONS = (
					"DEBUG=1",

					"$(inherited)",
				);
				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
				GCC_WARN_ABOUT_RETURN_TYPE = YES;
				GCC_WARN_UNINITIALIZED_AUTOS = YES;
				GCC_WARN_UNUSED_VARIABLE = YES;
				INFOPLIST_FILE = src/bridge/Info.plist;
				MACOSX_DEPLOYMENT_TARGET = "";
				ONLY_ACTIVE_ARCH = YES;
				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
				PRODUCT_NAME = "$(TARGET_NAME)";
				SDKROOT = macosx;
				WRAPPER_EXTENSION = framework;
			};
			name = Debug;
		};
		4B187E21163EA29F0049A832 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;
				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
				CLANG_CXX_LIBRARY = "libc++";
				CLANG_WARN_EMPTY_BODY = YES;
				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
				COMBINE_HIDPI_IMAGES = YES;
				COPY_PHASE_STRIP = YES;
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
				DYLIB_COMPATIBILITY_VERSION = 7;
				DYLIB_CURRENT_VERSION = 7;
				FRAMEWORK_VERSION = A;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_PRECOMPILE_PREFIX_HEADER = YES;

				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
				GCC_WARN_ABOUT_RETURN_TYPE = YES;
				GCC_WARN_UNINITIALIZED_AUTOS = YES;
				GCC_WARN_UNUSED_VARIABLE = YES;
				INFOPLIST_FILE = src/bridge/Info.plist;
				MACOSX_DEPLOYMENT_TARGET = "";
				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
				PRODUCT_NAME = "$(TARGET_NAME)";
				SDKROOT = macosx;
				WRAPPER_EXTENSION = framework;
			};
			name = Release;
		};
		4B23CA8C133811610047A1D9 /* Debug */ = {
			isa = XCBuildConfiguration;
			buildSettings = {








<




<
<









>








<
<
<

<








<




<
<
<





>





<
<

<








1977
1978
1979
1980
1981
1982
1983

1984
1985
1986
1987


1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005



2006

2007
2008
2009
2010
2011
2012
2013
2014

2015
2016
2017
2018



2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029


2030

2031
2032
2033
2034
2035
2036
2037

			};
			name = Release;
		};
		4B187E20163EA29F0049A832 /* Debug */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;

				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
				CLANG_CXX_LIBRARY = "libc++";
				CLANG_WARN_EMPTY_BODY = YES;
				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;


				DYLIB_COMPATIBILITY_VERSION = 7;
				DYLIB_CURRENT_VERSION = 7;
				FRAMEWORK_VERSION = A;
				GCC_DYNAMIC_NO_PIC = NO;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_OPTIMIZATION_LEVEL = 0;
				GCC_PRECOMPILE_PREFIX_HEADER = YES;
				GCC_PREPROCESSOR_DEFINITIONS = (
					"DEBUG=1",
					OF_BRIDGE_LOCAL_INCLUDES,
					"$(inherited)",
				);
				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
				GCC_WARN_ABOUT_RETURN_TYPE = YES;
				GCC_WARN_UNINITIALIZED_AUTOS = YES;
				GCC_WARN_UNUSED_VARIABLE = YES;
				INFOPLIST_FILE = src/bridge/Info.plist;



				PRODUCT_NAME = "$(TARGET_NAME)";

				WRAPPER_EXTENSION = framework;
			};
			name = Debug;
		};
		4B187E21163EA29F0049A832 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;

				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
				CLANG_CXX_LIBRARY = "libc++";
				CLANG_WARN_EMPTY_BODY = YES;
				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;



				DYLIB_COMPATIBILITY_VERSION = 7;
				DYLIB_CURRENT_VERSION = 7;
				FRAMEWORK_VERSION = A;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_PRECOMPILE_PREFIX_HEADER = YES;
				GCC_PREPROCESSOR_DEFINITIONS = OF_BRIDGE_LOCAL_INCLUDES;
				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
				GCC_WARN_ABOUT_RETURN_TYPE = YES;
				GCC_WARN_UNINITIALIZED_AUTOS = YES;
				GCC_WARN_UNUSED_VARIABLE = YES;
				INFOPLIST_FILE = src/bridge/Info.plist;


				PRODUCT_NAME = "$(TARGET_NAME)";

				WRAPPER_EXTENSION = framework;
			};
			name = Release;
		};
		4B23CA8C133811610047A1D9 /* Debug */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
︙︙

Modified src/bridge/Makefile from [28fa63a000] to [6d54b8e6bd].

︙︙
21
22
23
24
25
26
27
28
29
30
31

	   OFBridging.h		\
	   ObjFW-Bridge.h

includesubdir = ObjFW-Bridge

include ../../buildsys.mk

CPPFLAGS += -I. -I.. -I../.. -I../exceptions
LD = ${OBJC}
LDFLAGS += -Wl,-flat_namespace,-undefined,suppress
LIBS = -L.. -lobjfw -framework Foundation








|




21
22
23
24
25
26
27
28
29
30
31

	   OFBridging.h		\
	   ObjFW-Bridge.h

includesubdir = ObjFW-Bridge

include ../../buildsys.mk

CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOF_BRIDGE_LOCAL_INCLUDES
LD = ${OBJC}
LDFLAGS += -Wl,-flat_namespace,-undefined,suppress
LIBS = -L.. -lobjfw -framework Foundation

Modified src/bridge/OFArray+NSObject.h from [b6076b6b74] to [29b01899ca].

︙︙
10
11
12
13
14
15
16

17



18
19
20
21
22
23
24
25

 *
 * 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 "OFArray.h"




#import "OFBridging.h"

/*!
 * @brief Support for bridging OFArrays to NSArrays.
 */
@interface OFArray (NSObject) <OFBridging>
@end








>
|
>
>
>









10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

 *
 * 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.
 */

#ifdef OF_BRIDGE_LOCAL_INCLUDES
# import "OFArray.h"
#else
# import <ObjFW/OFArray.h>
#endif

#import "OFBridging.h"

/*!
 * @brief Support for bridging OFArrays to NSArrays.
 */
@interface OFArray (NSObject) <OFBridging>
@end

Modified src/bridge/OFArray_NSArray.h from [02bad917af] to [e32ecbcdeb].

︙︙
10
11
12
13
14
15
16

17



18
19
20
21
22
23
24
25
26
27

 *
 * 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 "OFArray.h"




@class NSArray;

@interface OFArray_NSArray: OFArray
{
	NSArray *_array;
}

- initWithNSArray: (NSArray*)array;
@end








>
|
>
>
>











10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

 *
 * 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.
 */

#ifdef OF_BRIDGE_LOCAL_INCLUDES
# import "OFArray.h"
#else
# import <ObjFW/OFArray.h>
#endif

@class NSArray;

@interface OFArray_NSArray: OFArray
{
	NSArray *_array;
}

- initWithNSArray: (NSArray*)array;
@end

Modified src/bridge/OFDictionary+NSObject.h from [c3917c25f4] to [635526a50d].

︙︙
10
11
12
13
14
15
16

17



18
19
20
21
22
23
24
25

 *
 * 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 "OFDictionary.h"




#import "OFBridging.h"

/*!
 * @brief Support for bridging OFDictionaries to NSDictionaries.
 */
@interface OFDictionary (NSObject) <OFBridging>
@end








>
|
>
>
>









10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

 *
 * 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.
 */

#ifdef OF_BRIDGE_LOCAL_INCLUDES
# import "OFDictionary.h"
#else
# import <ObjFW/OFDictionary.h>
#endif

#import "OFBridging.h"

/*!
 * @brief Support for bridging OFDictionaries to NSDictionaries.
 */
@interface OFDictionary (NSObject) <OFBridging>
@end

Modified src/bridge/OFDictionary_NSDictionary.h from [f68f3a5712] to [0fe8d62997].

︙︙
10
11
12
13
14
15
16

17



18
19
20
21
22
23
24
25
26
27

 *
 * 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 "OFDictionary.h"




@class NSDictionary;

@interface OFDictionary_NSDictionary: OFDictionary
{
	NSDictionary *_dictionary;
}

- initWithNSDictionary: (NSDictionary*)dictionary;
@end








>
|
>
>
>











10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

 *
 * 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.
 */

#ifdef OF_BRIDGE_LOCAL_INCLUDES
# import "OFDictionary.h"
#else
# import <ObjFW/OFDictionary.h>
#endif

@class NSDictionary;

@interface OFDictionary_NSDictionary: OFDictionary
{
	NSDictionary *_dictionary;
}

- initWithNSDictionary: (NSDictionary*)dictionary;
@end

Modified src/bridge/OFString+NSObject.h from [05a9dca7bd] to [f6180df35d].

︙︙
10
11
12
13
14
15
16

17




18
19
20
21
22
23
24
25
26
27
28

 *
 * 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 "OFString.h"




#import "OFBridging.h"

/*!
 * @brief Support for bridging OFStrings to NSStrings.
 *
 * Unfortunately, they need to be copied, as NSString is not capable of
 * handling UCS-4 properly (a character of NSString is only 2 bytes, while a
 * character of OFString is 4).
 */
@interface OFString (NSObject) <OFBridging>
@end








>
|
>
>
>
>












10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

 *
 * 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.
 */

#ifdef OF_BRIDGE_LOCAL_INCLUDES
# import "OFString.h"
#else
# import <ObjFW/OFString.h>
#endif

#import "OFBridging.h"

/*!
 * @brief Support for bridging OFStrings to NSStrings.
 *
 * Unfortunately, they need to be copied, as NSString is not capable of
 * handling UCS-4 properly (a character of NSString is only 2 bytes, while a
 * character of OFString is 4).
 */
@interface OFString (NSObject) <OFBridging>
@end

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.037s