ObjFW  Check-in [4ded726bdb]

Overview
Comment:Add latest changes from default branch to 0.3 branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | 0.3
Files: files | file ages | folders
SHA3-256: 4ded726bdb403a3bbe4b7f129e3a4c68a19c3af7a8076408ec4e352df4b418d7
User & Date: js on 2010-05-09 13:57:37
Other Links: branch diff | manifest | tags
Context
2010-05-09
14:46
Merge latest changes from defaeult branch into 0.3 branch. check-in: 32d8ae959e user: js tags: 0.3
13:57
Add latest changes from default branch to 0.3 branch. check-in: 4ded726bdb user: js tags: 0.3
2010-05-05
17:31
Merge latest changes from default branch to 0.3 branch. check-in: 86ee771c1a user: js tags: 0.3
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified Info.plist from [039df37626] to [9c8ea66c73]. 

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









-
-
+
+

-
+


-
-


-
-

-
+

+
+




<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>CFBundleDevelopmentRegion</key>
	<string>English</string>
	<key>CFBundleExecutable</key>
	<string>ObjFW</string>
	<key>CFBundleGetInfoString</key>
	<string>https://webkeks.org/objfw</string>
	<key>CFBundleName</key>
	<string>ObjFW</string>
	<key>CFBundleIdentifier</key>
	<string>ObjFW</string>
	<string>org.webkeks.objfw</string>
	<key>CFBundleInfoDictionaryVersion</key>
	<string>6.0</string>
	<key>CFBundleName</key>
	<string>objfw</string>
	<key>CFBundlePackageType</key>
	<string>FMWK</string>
	<key>CFBundleShortVersionString</key>
	<string>0.3</string>
	<key>CFBundleSignature</key>
	<string>OBJF</string>
	<string>OBJFW</string>
	<key>CFBundleVersion</key>
	<string>0.3</string>
	<key>CFBundleShortVersionString</key>
	<string>0.3</string>
</dict>
</plist>

Modified configure.ac from [a418b899a7] to [6cc1ac725b].

︙
119
120
121
122
123
124
125







126
127
128
129
130
131
132

119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139








+
+
+
+
+
+
+








if test x"$PLUGIN_SUFFIX" != "x"; then
	AC_SUBST(OFPLUGIN_M, "OFPlugin.m")
	AC_SUBST(OFPLUGINTESTS_M, "OFPluginTests.m")
	AC_SUBST(TESTPLUGIN, "plugin")
	AC_DEFINE(OF_PLUGINS, 1, [Whether we have plugin support])
	AC_SUBST(OFPLUGINS_DEF, "-DOF_PLUGINS")
fi

case "$host_os" in
	darwin*)
		AC_SUBST(REEXPORT_LIBOBJC, [-Wl,-reexport-lobjc])
		AC_SUBST(LDFLAGS_REEXPORT, [-Wl,-reexport-lobjfw])
		;;
esac

AC_C_BIGENDIAN([
	AC_DEFINE(OF_BIG_ENDIAN, 1, [Whether we are big endian])
	AC_SUBST(ENDIANESS_DEF, "-DOF_BIG_ENDIAN")])

AC_MSG_CHECKING(for SIZE_MAX)
AC_EGREP_CPP(yes, [
︙

Modified extra.mk.in from [ea8c58d171] to [100b41fa7b]. 

1
2
3
4
5
6
7
8
9
10
11
12
13

14
15
16
17

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18














+





OBJFW_LIB_MAJOR = 2
OBJFW_LIB_MINOR = 0
OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}

ASPRINTF_M = @ASPRINTF_M@
ATOMIC_H = @ATOMIC_H@
OBJC_PROPERTIES_M = @OBJC_PROPERTIES_M@
OBJC_SYNC_M = @OBJC_SYNC_M@
OFPLUGIN_M = @OFPLUGIN_M@
OFPLUGINTESTS_M = @OFPLUGINTESTS_M@
OFTHREAD_M = @OFTHREAD_M@
OFTHREADTESTS_M = @OFTHREADTESTS_M@
PROPERTIESTESTS_M = @PROPERTIESTESTS_M@
REEXPORT_LIBOBJC = @REEXPORT_LIBOBJC@
TESTPLUGIN = @TESTPLUGIN@
TESTS = @TESTS@
TEST_LAUNCHER = @TEST_LAUNCHER@
THREADING_H = @THREADING_H@

Modified m4/buildsys.m4 from [8507639fdf] to [b350cd68ec].

︙
53
54
55
56
57
58
59
60

61
62
63
64
65
66

67
68
69
70
71
72
73

53
54
55
56
57
58
59

60
61
62
63
64
65

66
67
68
69
70
71
72
73








-
+





-
+








	AC_REQUIRE([AC_CANONICAL_HOST])
	AC_MSG_CHECKING(for shared library system)
	case "$host_os" in
		darwin*)
			AC_MSG_RESULT(Darwin)
			LIB_CPPFLAGS='-DPIC'
			LIB_CFLAGS='-fPIC'
			LIB_LDFLAGS='-dynamiclib -flat_namespace'
			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
			LIB_PREFIX='lib'
			LIB_SUFFIX='.dylib'
			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
			PLUGIN_CPPFLAGS='-DPIC'
			PLUGIN_CFLAGS='-fPIC'
			PLUGIN_LDFLAGS='-bundle -flat_namespace -undefined suppress'
			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
			PLUGIN_SUFFIX='.impl'
			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
			CLEAN_LIB=''
			;;
		solaris*)
			AC_MSG_RESULT(Solaris)
︙

Modified src/Makefile from [a0ae7ee314] to [6ee6942889].

︙
47
48
49
50
51
52
53


47
48
49
50
51
52
53
54








+

	${OBJC_SYNC_M}

include ../buildsys.mk

CPPFLAGS += -I.. ${LIB_CPPFLAGS}
OBJCFLAGS += ${LIB_CFLAGS}
LD = ${OBJC}
LDFLAGS += ${REEXPORT_LIBOBJC}

Modified src/OFExceptions.m from [1b38e5bb50] to [a94e12da30].

︙
82
83
84
85
86
87
88
89

90
91
92
93
94
95
96

82
83
84
85
86
87
88

89
90
91
92
93
94
95
96








-
+








					      selector: _cmd];
}

- initWithClass: (Class)class_
{
	self = [super init];

	class_ = class_;
	inClass = class_;

	return self;
}

- (void)dealloc
{
	[string release];
︙
1255
1256
1257
1258
1259
1260
1261
1262

1263
1264
1265
1266
1267
1268
1269

1255
1256
1257
1258
1259
1260
1261

1262
1263
1264
1265
1266
1267
1268
1269








-
+








- (OFString*)string
{
	if (string != nil)
		return string;

	string = [[OFString alloc] initWithFormat:
	    @"A connection to service %s on node %s could not be established "
	    @"in class %s! " ERRFMT, [node cString], [service cString],
	    @"in class %s! " ERRFMT, [service cString], [node cString],
	    [inClass className], ERRPARAM];

	return string;
}

- (int)errNo
{
︙

Modified src/objfw-defs.h.in from [8c68c7e68e] to [5c69853c4a]. 

1

2
3
4
5

6
7
8
9
10
11
12
13
14
15

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17


+




+











#undef OF_APPLE_RUNTIME
#undef OF_HAVE_ASPRINTF
#undef OF_ATOMIC_OPS
#undef OF_BIG_ENDIAN
#undef OF_GNU_RUNTIME
#undef OF_HAVE_ASPRINTF
#undef OF_HAVE_FAST_ENUMERATION
#undef OF_HAVE_GCC_ATOMIC_OPS
#undef OF_HAVE_LIBKERN_OSATOMIC_H
#undef OF_HAVE_PROPERTIES
#undef OF_HAVE_PTHREADS
#undef OF_HAVE_PTHREAD_SPINLOCKS
#undef OF_HAVE_SCHED_YIELD
#undef OF_OBJFW_RUNTIME
#undef OF_PLUGINS
#undef OF_THREADS
#undef SIZE_MAX

Modified utils/objfw-config.in from [398daa9578] to [6023991631]. 

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
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

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
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













+















+

















+
-
+








#!/bin/sh
prefix="@prefix@"
exec_prefix="@exec_prefix@"
libdir="@libdir@"
CFLAGS=""
CPPFLAGS="-I@includedir@"
CXXFLAGS=""
OBJC="@OBJC@"
OBJCFLAGS="@GNU_RUNTIME@ -fexceptions -fobjc-exceptions"
OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString"
OBJCFLAGS="$OBJCFLAGS @NO_CONST_CFSTRINGS@ @NO_WARN_UNUSED@ @ATOMIC_OBJCFLAGS@"
LDFLAGS=""
LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@"
LDFLAGS_RPATH="@LDFLAGS_RPATH@"
LIBS="-L${libdir} -lobjfw @LIBS@"
VERSION="0.3"

show_help() {
	cat <<__EOF__
objfw-config: Available arguments are:

	--all		Outputs all flags + libs
	--cflags	Outputs the required CFLAGS
	--cppflags	Outputs the required CPPFLAGS
	--cxxflags	Outputs the required CXXFLAGS
	--objc		Outputs the OBJC used to compile ObjFW
	--objcflags	Outputs the required OBJCFLAGS
	--ldflags	Outputs the required LDFLAGS
	--reexport	Outputs LDFLAGS to reexport ObjFW
	--rpath		Outputs LDFLAGS for using rpath
	--libs		Outputs the required LIBS
	--version	Outputs the installed version
__EOF__
	exit 0
}

test -z "$1" && show_help

while test ! -z "$1"; do
	case "$1" in
		--all)
			echo "$CFLAGS"
			echo "$CPPFLAGS"
			echo "$CXXFLAGS"
			echo "$OBJCFLAGS"
			echo "$LDFLAGS"
			echo "$LDFLAGS_REEXPORT"
			echo "$RPATH_LDFLAGS"
			echo "$LDFLAGS_RPATH"
			echo "$LIBS"
			;;
		--cflags)
			echo "$CFLAGS"
			;;
		--cppflags)
			echo "$CPPFLAGS"
︙
62
63
64
65
66
67
68



69
70
71
72
73
74
75

65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81








+
+
+








			;;
		--libs)
			echo "$LIBS"
			;;
		--ldflags)
			echo "$LDFLAGS"
			;;
		--reexport)
			echo "$LDFLAGS_REEXPORT"
			;;
		--rpath)
			echo "$LDFLAGS_RPATH"
			;;
		--version)
			echo "$VERSION"
			;;
		*)
︙

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