ObjFW  Check-in [c5f91347e7]

Overview
Comment:objfw-compile: Remove handling of .bundle

`objfw-config --plugin-suffix` no longer returns .bundle, so the branch
can never be taken. Plus, it created an incomplete .bundle anyway.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: c5f91347e72528ad74206b4ae6b6407e2a98857b5783bdf4ab12515a27b81188
User & Date: js on 2024-11-06 21:28:30
Other Links: manifest | tags
Context
2024-11-07
21:17
Add support for MPTCP check-in: 49f5cd5ec5 user: js tags: trunk
21:07
Merge trunk into 1.2 branch check-in: 10cce4f6ef user: js tags: 1.2
2024-11-06
21:28
objfw-compile: Remove handling of .bundle check-in: c5f91347e7 user: js tags: trunk
2024-11-05
23:48
GitHub Actions: Add ObjC++ test on 32 bit Ubuntu check-in: 77b155c1da user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified utils/objfw-compile from [e35f021548] to [aa288d7464].

︙︙
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348

test x"$link_stdcpp" = x"yes" && LIBS="$LIBS -lstdc++"

if test x"$lib" = x"yes"; then
	export SHARED_LIB="$out_prefix$out$out_suffix"
	LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --lib-ldflags)"
fi

if test x"$plugin" = x"yes" -a x"$out_suffix" = x".bundle"; then
	# If $out_suffix is .bundle, it means we are creating a macOS bundle.
	# These are not just a single file, but have a certain directory
	# structure. Therefore we amend the output path to match the expected
	# directory structure.
	mkdir -p $out$out_suffix/Contents/MacOS
	out="$out$out_suffix/Contents/MacOS/$(basename $out)"
	out_suffix=""
fi

if test ! -f "$out_prefix$out$out_suffix" -o x"$link" = x"yes"; then
	status_linking $out_prefix$out$out_suffix
	$OBJC -o $out_prefix$out$out_suffix $objs $LIBS $LDFLAGS || \
		status_link_failed $out $?
	status_linked $out_prefix$out$out_suffix
fi








<
<
<
<
<
<
<
<
<
<







326
327
328
329
330
331
332










333
334
335
336
337
338

test x"$link_stdcpp" = x"yes" && LIBS="$LIBS -lstdc++"

if test x"$lib" = x"yes"; then
	export SHARED_LIB="$out_prefix$out$out_suffix"
	LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --lib-ldflags)"
fi











if test ! -f "$out_prefix$out$out_suffix" -o x"$link" = x"yes"; then
	status_linking $out_prefix$out$out_suffix
	$OBJC -o $out_prefix$out$out_suffix $objs $LIBS $LDFLAGS || \
		status_link_failed $out $?
	status_linked $out_prefix$out$out_suffix
fi