diff --git a/BasePlatform/v1/build.sh b/BasePlatform/v1/build.sh index 348919b..54f08d6 100755 --- a/BasePlatform/v1/build.sh +++ b/BasePlatform/v1/build.sh @@ -5,13 +5,13 @@ CONF_PATH=`dirname $0` if [ -z "$NO_32BIT" ]; then flatpak-builder $2 --arch=i386 build32 "$CONF_PATH/Base$1-i386.yaml" || exit 1 if [ ! -z $3 ]; then - flatpak-builder $4 --arch=i386 --export-only "--repo=$3" build32 "$CONF_PATH/Base$1-i386.yaml" || exit 3 + flatpak-builder $4 --arch=i386 --export-only --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build32 "$CONF_PATH/Base$1-i386.yaml" || exit 3 fi fi if [ -z "$NO_64BIT" ]; then ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Platform.Compat.i386/x86_64/18.08 > "$CONF_PATH/i386.tar" && flatpak-builder $2 --arch=x86_64 build64 "$CONF_PATH/Base$1-x86_64.yaml" || exit 2 if [ ! -z $3 ]; then - flatpak-builder $4 --arch=x86_64 --export-only "--repo=$3" build64 "$CONF_PATH/Base$1-x86_64.yaml" || exit 3 + flatpak-builder $4 --arch=x86_64 --export-only --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build64 "$CONF_PATH/Base$1-x86_64.yaml" || exit 3 fi fi diff --git a/Platform/v1.0/Platform-i386.yaml b/Platform/v1.0/Platform-i386.yaml new file mode 100644 index 0000000..2644b46 --- /dev/null +++ b/Platform/v1.0/Platform-i386.yaml @@ -0,0 +1,34 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.Platform +branch: "v1.0" + +sdk: de.marko10_000.winebarrels.BaseSdk +runtime: de.marko10_000.winebarrels.BasePlatform +runtime-version: "v1" +separate-locales: false + +inherit-extensions: + - org.freedesktop.Platform.GL + - org.freedesktop.Platform.Timezones + - org.freedesktop.Platform.GStreamer + - org.freedesktop.Platform.Icontheme + - org.gtk.Gtk3theme + - org.freedesktop.Platform.VAAPI.Intel + - org.freedesktop.Platform.html5-codecs + +modules: + - name: test-arch + buildsystem: simple + build-commands: + - false + skip-arches: + - "i386" + +cleanup: + - "*.a" + - "*.la" + - /include + - /lib/debug + - /share/man diff --git a/Platform/v1.0/Platform-x86_64.yaml b/Platform/v1.0/Platform-x86_64.yaml new file mode 100644 index 0000000..333b3bd --- /dev/null +++ b/Platform/v1.0/Platform-x86_64.yaml @@ -0,0 +1,35 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.Platform +branch: "v1.0" + +sdk: de.marko10_000.winebarrels.BaseSdk +runtime: de.marko10_000.winebarrels.BasePlatform +runtime-version: "v1" +separate-locales: false + +inherit-extensions: + - org.freedesktop.Platform.GL + - org.freedesktop.Platform.Timezones + - org.freedesktop.Platform.GStreamer + - org.freedesktop.Platform.Icontheme + - org.gtk.Gtk3theme + - org.freedesktop.Platform.VAAPI.Intel + - org.freedesktop.Platform.html5-codecs + - org.freedesktop.Platform.GL32 + +modules: + - name: test-arch + buildsystem: simple + build-commands: + - false + skip-arches: + - x86_64 + +cleanup: + - "*.a" + - "*.la" + - /include + - /lib/debug + - /share/man diff --git a/Platform/v1.0/Sdk-i386.yaml b/Platform/v1.0/Sdk-i386.yaml new file mode 100644 index 0000000..b880184 --- /dev/null +++ b/Platform/v1.0/Sdk-i386.yaml @@ -0,0 +1,32 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.Sdk +branch: "v1.0" + +sdk: de.marko10_000.winebarrels.BaseSdk +runtime: de.marko10_000.winebarrels.BaseSdk +runtime-version: "v1" +separate-locales: false + +inherit-extensions: + - org.freedesktop.Platform.GL + - org.freedesktop.Platform.Timezones + - org.freedesktop.Platform.GStreamer + - org.freedesktop.Platform.Icontheme + - org.gtk.Gtk3theme + - org.freedesktop.Platform.html5-codecs + - org.freedesktop.Sdk.Extension + - org.freedesktop.Platform.VAAPI.Intel + +modules: + - name: test-arch + buildsystem: simple + build-commands: + - false + skip-arches: + - "i386" + +cleanup: + - /lib/debug + - /share/man diff --git a/Platform/v1.0/Sdk-x86_64.yaml b/Platform/v1.0/Sdk-x86_64.yaml new file mode 100644 index 0000000..ca8fbd0 --- /dev/null +++ b/Platform/v1.0/Sdk-x86_64.yaml @@ -0,0 +1,33 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.Sdk +branch: "v1.0" + +sdk: de.marko10_000.winebarrels.BaseSdk +runtime: de.marko10_000.winebarrels.BaseSdk +runtime-version: "v1" +separate-locales: false + +inherit-extensions: + - org.freedesktop.Platform.GL + - org.freedesktop.Platform.Timezones + - org.freedesktop.Platform.GStreamer + - org.freedesktop.Platform.Icontheme + - org.gtk.Gtk3theme + - org.freedesktop.Platform.html5-codecs + - org.freedesktop.Sdk.Extension + - org.freedesktop.Platform.VAAPI.Intel + - org.freedesktop.Platform.GL32 + +modules: + - name: test-arch + buildsystem: simple + build-commands: + - false + skip-arches: + - x86_64 + +cleanup: + - /lib/debug + - /share/man diff --git a/Platform/v1.0/build.sh b/Platform/v1.0/build.sh new file mode 100755 index 0000000..2086b3e --- /dev/null +++ b/Platform/v1.0/build.sh @@ -0,0 +1,18 @@ +#! /usr/bin/env bash + +CONF_PATH=`dirname $0` + +if [ -z "$NO_32BIT" ]; then + if [ -z $3 ]; then + flatpak-builder $2 --arch=i386 build32 "$CONF_PATH/$1-i386.yaml" || exit 1 + else + flatpak-builder $2 --arch=i386 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build32 "$CONF_PATH/$1-i386.yaml" || exit 2 + fi +fi +if [ -z "$NO_64BIT" ]; then + if [ -z $3 ]; then + flatpak-builder $2 --arch=x86_64 build64 "$CONF_PATH/$1-x86_64.yaml" || exit 2 + else + flatpak-builder $2 --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build64 "$CONF_PATH/$1-x86_64.yaml" || exit 2 + fi +fi