ObjFW  Check-in [50dce32144]

Overview
Comment:Don't build test plugin as bundle and plugin
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 50dce32144850e5f0a95cebc17530c6817f82e9e9570bcf5a2ed575dd393ae3f
User & Date: js on 2024-11-16 13:31:43
Other Links: manifest | tags
Context
2024-11-16
14:17
OFSecureTransportTLSStream: Use more error codes Leaf check-in: 33dbefb035 user: js tags: trunk
13:31
Don't build test plugin as bundle and plugin check-in: 50dce32144 user: js tags: trunk
13:31
Update buildsys check-in: 89ca6c7896 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified configure.ac from [0cee982cd2] to [ce4406a7fa].

︙︙
462
463
464
465
466
467
468


469
470
471
472
473
474
475

		AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
		AC_SUBST(OBJFWHID_FRAMEWORK, "ObjFWHID.framework")
		build_framework="yes"
	])

	BUILDSYS_BUNDLE([
		AC_SUBST(TESTPLUGIN_BUNDLE, "TestPlugin.bundle")


	])
], [
	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")
	AC_SUBST(LIBOBJFWHID_DEP, "../src/hid/libobjfwhid.a")
	AC_SUBST(LIBOBJFWHID_DEP_LVL2, "../../src/hid/libobjfwhid.a")








>
>








462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477

		AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
		AC_SUBST(OBJFWHID_FRAMEWORK, "ObjFWHID.framework")
		build_framework="yes"
	])

	BUILDSYS_BUNDLE([
		AC_SUBST(TESTPLUGIN_BUNDLE, "TestPlugin.bundle")
	], [
		AC_SUBST(TESTPLUGIN_PLUGIN, 'TestPlugin${PLUGIN_SUFFIX}')
	])
], [
	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")
	AC_SUBST(LIBOBJFWHID_DEP, "../src/hid/libobjfwhid.a")
	AC_SUBST(LIBOBJFWHID_DEP_LVL2, "../../src/hid/libobjfwhid.a")
︙︙

Modified extra.mk.in from [5c2a22977f] to [345fdf7b48].

︙︙
86
87
88
89
90
91
92

93
94
95
96
97
98
99

RUNTIME_FRAMEWORK_LIBS = @RUNTIME_FRAMEWORK_LIBS@
RUNTIME_INSTANCE_M = @RUNTIME_INSTANCE_M@
RUNTIME_LIBS = @RUNTIME_LIBS@
SUBPROCESS = @SUBPROCESS@
TESTPLUGIN = @TESTPLUGIN@
TESTPLUGIN_BUNDLE = @TESTPLUGIN_BUNDLE@
TESTPLUGIN_LIBS = @TESTPLUGIN_LIBS@

TESTS_LIBS = @TESTS_LIBS@
TESTS_STATIC_LIB = @TESTS_STATIC_LIB@
TLS = @TLS@
TLS_CPPFLAGS = @TLS_CPPFLAGS@
TLS_LIBS = @TLS_LIBS@
UNICODE_M = @UNICODE_M@
USE_INCLUDES_ATOMIC = @USE_INCLUDES_ATOMIC@








>








86
87
88
89
90
91
92
93
94
95
96
97
98
99
100

RUNTIME_FRAMEWORK_LIBS = @RUNTIME_FRAMEWORK_LIBS@
RUNTIME_INSTANCE_M = @RUNTIME_INSTANCE_M@
RUNTIME_LIBS = @RUNTIME_LIBS@
SUBPROCESS = @SUBPROCESS@
TESTPLUGIN = @TESTPLUGIN@
TESTPLUGIN_BUNDLE = @TESTPLUGIN_BUNDLE@
TESTPLUGIN_LIBS = @TESTPLUGIN_LIBS@
TESTPLUGIN_PLUGIN = @TESTPLUGIN_PLUGIN@
TESTS_LIBS = @TESTS_LIBS@
TESTS_STATIC_LIB = @TESTS_STATIC_LIB@
TLS = @TLS@
TLS_CPPFLAGS = @TLS_CPPFLAGS@
TLS_LIBS = @TLS_LIBS@
UNICODE_M = @UNICODE_M@
USE_INCLUDES_ATOMIC = @USE_INCLUDES_ATOMIC@
︙︙

Modified tests/plugin/Makefile from [64681afff9] to [5a77823505]. 

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

include ../../extra.mk

DISTCLEAN = Info.plist

PLUGIN_NOINST = TestPlugin${PLUGIN_SUFFIX}
BUNDLE_NOINST = ${TESTPLUGIN_BUNDLE}
SRCS = TestPlugin.m

include ../../buildsys.mk

CPPFLAGS += -I../.. -I../../src -I../../src/runtime
LIBS := ${TESTPLUGIN_LIBS} ${LIBS}





|








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

include ../../extra.mk

DISTCLEAN = Info.plist

PLUGIN_NOINST = ${TESTPLUGIN_PLUGIN}
BUNDLE_NOINST = ${TESTPLUGIN_BUNDLE}
SRCS = TestPlugin.m

include ../../buildsys.mk

CPPFLAGS += -I../.. -I../../src -I../../src/runtime
LIBS := ${TESTPLUGIN_LIBS} ${LIBS}
︙︙