buildsys  Check-in [5abbdc7a0a]

Overview
Comment:Create .frameworks for macOS and iOS differently
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5abbdc7a0a39925071a56d373ab4b27ac1b952b782b923d6cf6ab8c2fb459583
User & Date: js on 2023-09-10 23:30:05
Other Links: manifest | tags
Context
2024-05-05
00:15
Make a distinction between plugins and bundles check-in: 5695217e58 user: js tags: trunk
2023-09-10
23:30
Create .frameworks for macOS and iOS differently check-in: 5abbdc7a0a user: js tags: trunk
23:00
Remove --timestamp=none from codesign for plugins check-in: 2cc751b1a0 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified build-aux/m4/buildsys.m4 from [9c2e5f90a3] to [8bcbdfb241].

︙
149
150
151
152
153
154
155

156
157
158
159
160
161
162

149
150
151
152
153
154
155
156
157
158
159
160
161
162
163








+








			#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || \
			    (defined(TARGET_OS_SIMULATOR) && \
			    TARGET_OS_SIMULATOR)
			yes
			#endif
		], [
			host_is_ios="yes"
			AC_SUBST(HOST_IS_IOS, yes)
		], [
			host_is_ios="no"
		])
		AC_MSG_RESULT($host_is_ios)
		AC_CHECK_TOOL(CODESIGN, codesign)
		;;
	esac
︙
314
315
316
317
318
319
320
321
322


323
324
325
326
327
328
329
330
331
332

315
316
317
318
319
320
321


322
323
324
325

326
327
328
329
330
331
332








-
-
+
+


-








AC_DEFUN([BUILDSYS_FRAMEWORK], [
	AC_REQUIRE([AC_CANONICAL_HOST])
	AC_REQUIRE([BUILDSYS_CHECK_IOS])
	AC_REQUIRE([BUILDSYS_SHARED_LIB])

	case "$host_os" in
	darwin*)
		AS_IF([test x"$host_is_ios" = x"yes"], [
			FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
		FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
		AS_IF([test x"$host_is_ios" = x"yes"], [
			FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}'
		], [
			FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
			FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
		])

		AC_SUBST(FRAMEWORK_LDFLAGS)
		AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
		AC_SUBST(FRAMEWORK_LIBS)
︙

Modified buildsys.mk.in from [685b657d9f] to [2c79875d24].

︙
204
205
206
207
208
209
210

211

212
213
214
215
216
217




218
219

220
221

222
223
224
225
226
227
228





229
230
231
232
233
234





235
236
237
238






239






























240
241



242
243
244
245
246
247
248

204
205
206
207
208
209
210
211

212






213
214
215
216


217


218







219
220
221
222
223






224
225
226
227
228




229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265


266
267
268
269
270
271
272
273
274
275








+
-
+
-
-
-
-
-
-
+
+
+
+
-
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+








	else \
		${LINK_FAILED}; \
	fi

${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
	${LINK_STATUS}
	out="$@"; \
	if test x"@HOST_IS_IOS@" = x"yes"; then \
	if rm -fr $@ && \
		if rm -fr $@ && \
	    ${MKDIR_P} $@/Versions/${LIB_MAJOR} && \
	    ${LN_S} ${LIB_MAJOR} $@/Versions/Current && \
	    ${MAKE} @MAKEFLAGS_SILENT@ \
		COPY_HEADERS_IF_SUBDIR=${includesubdir} \
		COPY_HEADERS_DESTINATION=$$PWD/$@/Versions/${LIB_MAJOR}/Headers\
		copy-headers-into-framework && \
		    ${MAKE} @MAKEFLAGS_SILENT@ \
			COPY_HEADERS_IF_SUBDIR=${includesubdir} \
			COPY_HEADERS_DESTINATION=$$PWD/$@/Headers \
			copy-headers-into-framework && \
	    ${LN_S} Versions/Current/Headers $@/Headers && \
	    if test -f Info.plist; then \
		    if test -f Info.plist; then \
		    ${MKDIR_P} $@/Versions/${LIB_MAJOR}/Resources && \
		    ${INSTALL} -m 644 Info.plist \
			    ${INSTALL} -m 644 Info.plist $@/Info.plist; \
			$@/Versions/${LIB_MAJOR}/Resources/Info.plist && \
		    ${LN_S} Versions/Current/Resources $@/Resources; \
	    fi && \
	    if test -f module.modulemap; then \
		    ${MKDIR_P} $@/Versions/${LIB_MAJOR}/Modules && \
		    ${INSTALL} -m 644 module.modulemap \
			$@/Versions/${LIB_MAJOR}/Modules/module.modulemap && \
		    fi && \
		    if test -f module.modulemap; then \
			    ${MKDIR_P} $@/Modules && \
			    ${INSTALL} -m 644 module.modulemap \
				$@/Modules/module.modulemap; \
		    ${LN_S} Versions/Current/Modules $@/Modules; \
	    fi && \
	    ${LD} -o $@/Versions/${LIB_MAJOR}/$${out%.framework} ${LIB_OBJS} \
	        ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} \
		${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} \
		${FRAMEWORK_LIBS} && \
		    fi && \
		    ${LD} -o $@/$${out%.framework} \
			${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} \
			${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} \
			${FRAMEWORK_LIBS} && \
	    ${LN_S} Versions/Current/$${out%.framework} \
		$@/$${out%.framework} && \
	    ${CODESIGN} -fs ${CODESIGN_IDENTITY} $@; then \
		${LINK_OK}; \
		    ${CODESIGN} -fs ${CODESIGN_IDENTITY} $@; then \
			${LINK_OK}; \
		else \
			rm -fr $$out; false; \
			${LINK_FAILED}; \
		fi; \
	else \
		versiondir="$@/Versions/${LIB_MAJOR}"; \
		if rm -fr $@ && \
		    ${MKDIR_P} $$versiondir && \
		    ${LN_S} ${LIB_MAJOR} $@/Versions/Current && \
		    ${MAKE} @MAKEFLAGS_SILENT@ \
			COPY_HEADERS_IF_SUBDIR=${includesubdir} \
			COPY_HEADERS_DESTINATION=$$PWD/$$versiondir/Headers \
			copy-headers-into-framework && \
		    ${LN_S} Versions/Current/Headers $@/Headers && \
		    if test -f Info.plist; then \
			    ${MKDIR_P} $$versiondir/Resources && \
			    ${INSTALL} -m 644 Info.plist \
				$$versiondir/Resources/Info.plist && \
			    ${LN_S} Versions/Current/Resources $@/Resources; \
		    fi && \
		    if test -f module.modulemap; then \
			    ${MKDIR_P} $$versiondir/Modules && \
			    ${INSTALL} -m 644 module.modulemap \
				$$versiondir/Modules/module.modulemap && \
			    ${LN_S} Versions/Current/Modules $@/Modules; \
		    fi && \
		    ${LD} -o $$versiondir/$${out%.framework} \
			${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} \
			${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} \
			${FRAMEWORK_LIBS} && \
		    ${LN_S} Versions/Current/$${out%.framework} \
			$@/$${out%.framework} && \
		    ${CODESIGN} -fs ${CODESIGN_IDENTITY} $@; then \
			${LINK_OK}; \
		else \
		rm -fr $$out; false; \
		${LINK_FAILED}; \
			rm -fr $$out; false; \
			${LINK_FAILED}; \
		fi; \
	fi

copy-headers-into-framework:
	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
		test x"$$i" = x"" && continue; \
		cd $$i || exit 1; \
		${MAKE} @MAKEFLAGS_SILENT@ copy-headers-into-framework || \
︙