Attachment 123628 Details for Bug 95274 – Generate metadata in the makefile [version 3]

[patch] Generate metadata in the makefile [version 3]

0001-Generate-metadata-from-make-variables.patch (text/plain), 3.98 KB, created by Tristan Van Berkom on 2016-05-11 20:16:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tristan Van Berkom

Created: 2016-05-11 20:16:54 UTC

Size: 3.98 KB

patch

obsolete

>From 86a5b5144dc7c7e8bec0b94a883f42ffa57c2d0a Mon Sep 17 00:00:00 2001
>From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
>Date: Mon, 11 Apr 2016 16:34:21 +0100
>Subject: [PATCH 1/2] Generate metadata from make variables.
>
>This allows one to use the same makefiles when
>building for other (host compatible) arches.
>
>One can build i386 on an x86_64 machine with:
>
>  make ARCH=i386
>
>The metadata files will be regenerated on every
>invocation of make.
>---
> Makefile             | 26 +++++++++++++++++++-------
> metadata.platform    |  4 ----
> metadata.platform.in |  4 ++++
> metadata.sdk         |  4 ----
> metadata.sdk.in      |  4 ++++
> 5 files changed, 27 insertions(+), 15 deletions(-)
> delete mode 100644 metadata.platform
> create mode 100644 metadata.platform.in
> delete mode 100644 metadata.sdk
> create mode 100644 metadata.sdk.in
>
>diff --git a/Makefile b/Makefile
>index 5e9f0a7..97ab4d0 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -1,9 +1,21 @@
>+# Override the arch with `make ARCH=i386`
>+VERSION = 1.5
>+ARCH   ?= $(shell xdg-app --default-arch)
>+
>+# Canned recipe for generating metadata
>+#   $1 = the input file to substitute
>+#   $2 = the output to create
>+define subst-metadata
>+	@echo -n "Generating $${dest}... ";	\
>+	sed -e 's/@@ARCH@@/${ARCH}/g' 		\
>+	    -e 's/@@VERSION@@/${VERSION}/g'	\
>+	   ${1} > ${2}.tmp && mv ${2}.tmp ${2} || exit 1;
>+	@echo "Done.";
>+endef
>+
> srcdir = $(CURDIR)
> builddir = $(CURDIR)
>-
> NULL=
>-ARCH=x86_64
>-VERSION=1.5
> HASH:=$(shell git rev-parse HEAD)
> IMAGEDIR=images/${ARCH}
> SDK_IMAGE=${IMAGEDIR}/freedesktop-contents-sdk-${ARCH}-${HASH}.tar.gz
>@@ -29,24 +41,24 @@ ${IMAGES} allimages:
> 
> sdk: ${FILE_REF_SDK}
> 
>-${FILE_REF_SDK}: metadata.sdk ${SDK_IMAGE}
>+${FILE_REF_SDK}: metadata.sdk.in ${SDK_IMAGE}
> 	if [ !  -d repo ]; then  ostree  init --mode=archive-z2 --repo=repo;  fi
> 	rm -rf sdk
> 	mkdir sdk
> 	(cd sdk; tar --transform 's,^./usr,files,S' --transform 's,^./etc,files/etc,S' --exclude="./[!eu]*" -xvf ../${SDK_IMAGE}  > /dev/null)
>-	cp metadata.sdk sdk/metadata
>+	$(call subst-metadata,metadata.sdk.in,sdk/metadata)
> 	ostree commit ${COMMIT_ARGS} ${GPG_ARGS} --branch=${REF_SDK}  -s "build of ${HASH}" sdk
> 	ostree summary -u --repo=repo ${GPG_ARGS}
> 	rm -rf sdk
> 
> platform: ${FILE_REF_PLATFORM}
> 
>-${FILE_REF_PLATFORM}: metadata.platform ${PLATFORM_IMAGE}
>+${FILE_REF_PLATFORM}: metadata.platform.in ${PLATFORM_IMAGE}
> 	if [ !  -d repo ]; then  ostree  init --mode=archive-z2 --repo=repo;  fi
> 	rm -rf platform
> 	mkdir platform
> 	(cd platform; tar --transform 's,^./usr,files,S' --transform 's,^./etc,files/etc,S' --exclude="./[!eu]*" -xvf ../${PLATFORM_IMAGE}  > /dev/null)
>-	cp metadata.platform platform/metadata
>+	$(call subst-metadata,metadata.platform.in,platform/metadata)
> 	ostree commit ${COMMIT_ARGS} ${GPG_ARGS} --branch=${REF_PLATFORM}  -s "build of ${HASH}" platform
> 	ostree summary -u --repo=repo ${GPG_ARGS}
> 	rm -rf platform
>diff --git a/metadata.platform b/metadata.platform
>deleted file mode 100644
>index c2ca72e..0000000
>--- a/metadata.platform
>+++ /dev/null
>@@ -1,4 +0,0 @@
>-[Runtime]
>-name=org.freedesktop.BasePlatform
>-runtime=org.freedesktop.BasePlatform/x86_64/1.5
>-sdk=org.freedesktop.BaseSdk/x86_64/1.5
>diff --git a/metadata.platform.in b/metadata.platform.in
>new file mode 100644
>index 0000000..b46703a
>--- /dev/null
>+++ b/metadata.platform.in
>@@ -0,0 +1,4 @@
>+[Runtime]
>+name=org.freedesktop.BasePlatform
>+runtime=org.freedesktop.BasePlatform/@@ARCH@@/@@VERSION@@
>+sdk=org.freedesktop.BaseSdk/@@ARCH@@/@@VERSION@@
>diff --git a/metadata.sdk b/metadata.sdk
>deleted file mode 100644
>index a0b520e..0000000
>--- a/metadata.sdk
>+++ /dev/null
>@@ -1,4 +0,0 @@
>-[Runtime]
>-name=org.freedesktop.BaseSdk
>-runtime=org.freedesktop.BasePlatform/x86_64/1.5
>-sdk=org.freedesktop.BaseSdk/x86_64/1.5
>diff --git a/metadata.sdk.in b/metadata.sdk.in
>new file mode 100644
>index 0000000..f69621d
>--- /dev/null
>+++ b/metadata.sdk.in
>@@ -0,0 +1,4 @@
>+[Runtime]
>+name=org.freedesktop.BaseSdk
>+runtime=org.freedesktop.BasePlatform/@@ARCH@@/@@VERSION@@
>+sdk=org.freedesktop.BaseSdk/@@ARCH@@/@@VERSION@@
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 95274: 123481 | 123528 | 123628 | 123632

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.