ObjFW  Check-in [1cd17a28dd]

Overview
Comment:Build ObjFWTest only as a static library

There is no reason to have this as a shared library (or .framework) as
it's only used for tests. This also means there doesn't need to be a
stable ABI.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | objfwtest
Files: files | file ages | folders
SHA3-256: 1cd17a28dda632e8a91f773870d847137af2ce497d13f49bb92b736f78cb5ebe
User & Date: js on 2024-02-10 00:27:45
Other Links: branch diff | manifest | tags
Context
2024-02-10
10:58
Remove src/test/Info.plist.in check-in: 52384975f5 user: js tags: objfwtest
00:27
Build ObjFWTest only as a static library check-in: 1cd17a28dd user: js tags: objfwtest
2024-02-06
23:01
ObjFWTest: Add OTAssert() check-in: 5cd1585ae1 user: js tags: objfwtest
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified configure.ac from [dcf22b00ec] to [84c8505c23].

︙
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419

398
399
400
401
402
403
404

405
406
407
408
409
410

411
412
413
414
415
416
417








-






-








AC_ARG_ENABLE(shared,
	AS_HELP_STRING([--disable-shared], [do not build shared library]))
AS_IF([test x"$enable_shared" != x"no"], [
	BUILDSYS_SHARED_LIB
	BUILDSYS_PLUGIN

	AC_SUBST(OBJFW_SHARED_LIB, '${LIB_PREFIX}objfw${LIB_SUFFIX}')
	AC_SUBST(OBJFWTEST_SHARED_LIB, '${LIB_PREFIX}objfwtest${LIB_SUFFIX}')
	AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a")
	AC_SUBST(FORWARDING_LIB_A, "forwarding.lib.a")
	AC_SUBST(LOOKUP_ASM_LIB_A, "lookup-asm.lib.a")

	BUILDSYS_FRAMEWORK([
		AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
		AC_SUBST(OBJFWTEST_FRAMEWORK, "ObjFWTest.framework")
		build_framework="yes"
	])
], [
	AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built])
	AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a")
	AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a")
])
︙
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443

427
428
429
430
431
432
433

434
435
436
437
438
439
440








-









AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
AS_IF([test x"$enable_shared" = x"no"], [
	enable_static="yes"
])
AS_IF([test x"$enable_static" = x"yes"], [
	AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a")
	AC_SUBST(OBJFWTEST_STATIC_LIB, "libobjfwtest.a")
	AC_SUBST(EXCEPTIONS_A, "exceptions.a")
	AC_SUBST(FORWARDING_A, "forwarding.a")
	AC_SUBST(LOOKUP_ASM_A, "lookup-asm.a")
])

AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [
︙

Modified extra.mk.in from [70364e1e07] to [6ed0317cce].

︙
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

24
25
26
27
28
29
30







31
32
33
34
35
36
37








-
-
-
-
-
-
-








OBJFWTLS_SHARED_LIB = @OBJFWTLS_SHARED_LIB@
OBJFWTLS_STATIC_LIB = @OBJFWTLS_STATIC_LIB@
OBJFWTLS_FRAMEWORK = @OBJFWTLS_FRAMEWORK@
OBJFWTLS_LIB_MAJOR = 1
OBJFWTLS_LIB_MINOR = 0
OBJFWTLS_LIB_PATCH = 2

OBJFWTEST_SHARED_LIB = @OBJFWTEST_SHARED_LIB@
OBJFWTEST_STATIC_LIB = @OBJFWTEST_STATIC_LIB@
OBJFWTEST_FRAMEWORK = @OBJFWTEST_FRAMEWORK@
OBJFWTEST_LIB_MAJOR = 1
OBJFWTEST_LIB_MINOR = 0
OBJFWTEST_LIB_PATCH = 0

BIN_PREFIX = @BIN_PREFIX@
BRIDGE = @BRIDGE@
CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@
ENCODINGS_A = @ENCODINGS_A@
ENCODINGS_LIB_A = @ENCODINGS_LIB_A@
ENCODINGS_SRCS = @ENCODINGS_SRCS@
EXCEPTIONS_A = @EXCEPTIONS_A@
︙

Modified src/test/Makefile from [7573a19b66] to [b269c69e19]. 

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





-
-
+
-
-
-
-








include ../../extra.mk

DISTCLEAN = Info.plist

SHARED_LIB = ${OBJFWTEST_SHARED_LIB}
STATIC_LIB = ${OBJFWTEST_STATIC_LIB}
STATIC_LIB = libobjfwtest.a
FRAMEWORK = ${OBJFWTEST_FRAMEWORK}
LIB_MAJOR = ${OBJFWTEST_LIB_MAJOR}
LIB_MINOR = ${OBJFWTEST_LIB_MINOR}
LIB_PATCH = ${OBJFWTEST_LIB_PATCH}

SRCS = OTAssert.m	\
       OTTestCase.m
INCLUDES := ${SRCS:.m=.h}	\
	    ObjFWTest.h
SRCS += OTAppDelegate.m			\
	OTAssertionFailedException.m
︙

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