From cc0240c002805673c204ceacb62cd735f2089746 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Tue, 14 Jul 2020 04:38:37 +0200 Subject: [PATCH] Support name builds --- Platform-v2.0/WineApp/WineApp-staging.yaml | 136 +++++++++++++++++++++ Platform-v2.0/WineApp/WineApp.yaml | 2 +- Platform-v2.0/WineApp/build.sh | 4 +- Platform-v2.0/current.csv | 3 + tools | 2 +- 5 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 Platform-v2.0/WineApp/WineApp-staging.yaml create mode 100644 Platform-v2.0/current.csv diff --git a/Platform-v2.0/WineApp/WineApp-staging.yaml b/Platform-v2.0/WineApp/WineApp-staging.yaml new file mode 100644 index 0000000..54cff61 --- /dev/null +++ b/Platform-v2.0/WineApp/WineApp-staging.yaml @@ -0,0 +1,136 @@ +id: de.marko10_000.winebarrels.WineApp +branch: "{{VERSION_NAME}}-staging" + +sdk: de.marko10_000.winebarrels.Sdk +runtime: de.marko10_000.winebarrels.Platform +runtime-version: "v2.0" +separate-locales: false + +build-options: + env: + - SOURCE_DATE_EPOCH=1 + - FLATPAK_BUILDER_N_JOBS=1 + - HOME=/tmp + ldflags: --build-id=none + +modules: + - name: test-arch + buildsystem: simple + build-commands: + - false + skip-arches: + - x86_64 + - name: wine-64bit-buildonly + sources: + - type: archive + url: {{WINE_SOURCE}} + sha256: {{WINE_SOURCE_SHA256}} + - type: git + url: https://github.com/wine-staging/wine-staging.git + tag: "{{WINE_TAG_STAGING}}" + commit: "{{WINE_TAG_STAGING_COMMIT}}" + dest: wine-staging-patches + - type: shell + commands: + - wine-staging-patches/patches/patchinstall.sh --all + - type: file + url: https://s3.marko10-000.de/general/flatpaks/wine/deterministic_pub1.diff + sha256: e8ab1abeae7191ebd6f9055238fa38e7d946e9cb492537e4387f54f94b008b1d + - type: file + url: https://s3.marko10-000.de/general/flatpaks/wine/deterministic_pub1_fix_old.diff + sha256: 2380b9f133a3869e83826701a4e5d36fab57daca59377138bc2116a846055fd0 + - type: file + url: https://s3.marko10-000.de/general/flatpaks/wine/deterministic_ignore_env.diff + sha256: 38e8d54c305cde5eb06b4f343933edf7fef6b0f3b0eeb673e7aea15d535a9986 + - type: file + url: https://s3.marko10-000.de/general/flatpaks/wine/globale_time.diff + sha256: 4c11764b1f065446d9c58ac0d980548ae95a6a2da6232ad34acb0700359b7bfc + - type: shell + commands: + - "git apply -v deterministic_pub1.diff || (echo !!! OLD VERSION !!! && git apply -v deterministic_pub1_fix_old.diff)" + - git apply -v deterministic_ignore_env.diff + - git apply -v globale_time.diff + - rm deterministic_pub1.diff deterministic_pub1_fix_old.diff deterministic_ignore_env.diff globale_time.diff + config-opts: + - --enable-win64 + - --with-x + - --without-mingw + - CROSSCC=ccache x86_64-w64-mingw32-gcc + make-args: + - -l + builddir: true + build-options: + ldflags-override: true + no-debuginfo: true + no-debuginfo-compression: true + strip: false + no-make-install: true + post-install: + - mkdir -pv /app/tmp/64bit && cp -rav ../. /app/tmp/64bit/ + cleanup: + - /tmp + - name: wine-32bit + sources: + - type: archive + url: {{WINE_SOURCE}} + sha256: {{WINE_SOURCE_SHA256}} + - type: git + url: https://github.com/wine-staging/wine-staging.git + tag: "{{WINE_TAG_STAGING}}" + commit: "{{WINE_TAG_STAGING_COMMIT}}" + dest: wine-staging-patches + - type: shell + commands: + - wine-staging-patches/patches/patchinstall.sh --all + - type: file + url: https://s3.marko10-000.de/general/flatpaks/wine/deterministic_pub1.diff + sha256: e8ab1abeae7191ebd6f9055238fa38e7d946e9cb492537e4387f54f94b008b1d + - type: file + url: https://s3.marko10-000.de/general/flatpaks/wine/deterministic_pub1_fix_old.diff + sha256: 2380b9f133a3869e83826701a4e5d36fab57daca59377138bc2116a846055fd0 + - type: file + url: https://s3.marko10-000.de/general/flatpaks/wine/deterministic_ignore_env.diff + sha256: 38e8d54c305cde5eb06b4f343933edf7fef6b0f3b0eeb673e7aea15d535a9986 + - type: file + url: https://s3.marko10-000.de/general/flatpaks/wine/globale_time.diff + sha256: 4c11764b1f065446d9c58ac0d980548ae95a6a2da6232ad34acb0700359b7bfc + - type: shell + commands: + - "git apply -v deterministic_pub1.diff || (echo !!! OLD VERSION !!! && git apply -v deterministic_pub1_fix_old.diff)" + - git apply -v deterministic_ignore_env.diff + - git apply -v globale_time.diff + - rm deterministic_pub1.diff deterministic_pub1_fix_old.diff deterministic_ignore_env.diff globale_time.diff + config-opts: + - --disable-tests + - --disable-win64 + - --libdir=/app/lib32 + - --with-wine64=/app/tmp/64bit/_flatpak_build + - --with-x + - --without-mingw + - CROSSCC=ccache i686-w64-mingw32-gcc + make-args: + - -l + builddir: true + build-options: + ldflags-override: true + no-debuginfo-compression: true + #post-install: + # - find /app/lib32/wine -name \*.dll -exec strip -v --strip-debug '{}' \; + # - find /app/lib32/wine -name \*.exe -exec strip -v --strip-debug '{}' \; + - name: wine-64bit-install + buildsystem: simple + build-commands: + - cd /app/tmp/64bit/_flatpak_build && make install + # - find /app/lib64/wine -name \*.dll -exec strip -v --strip-debug '{}' \; + # - find /app/lib64/wine -name \*.exe -exec strip -v --strip-debug '{}' \; + - printenv > /app/build_env.txt + build-options: + no-debuginfo-compression: true + +cleanup: + - /include + - "*.a" + - "*.la" + - /share/info + - /share/doc + - /share/man diff --git a/Platform-v2.0/WineApp/WineApp.yaml b/Platform-v2.0/WineApp/WineApp.yaml index 1e07942..68c7637 100644 --- a/Platform-v2.0/WineApp/WineApp.yaml +++ b/Platform-v2.0/WineApp/WineApp.yaml @@ -1,5 +1,5 @@ id: de.marko10_000.winebarrels.WineApp -branch: "{{VERSION}}" +branch: "{{VERSION_NAME}}" sdk: de.marko10_000.winebarrels.Sdk runtime: de.marko10_000.winebarrels.Platform diff --git a/Platform-v2.0/WineApp/build.sh b/Platform-v2.0/WineApp/build.sh index a1b5319..ca93875 100755 --- a/Platform-v2.0/WineApp/build.sh +++ b/Platform-v2.0/WineApp/build.sh @@ -1,6 +1,8 @@ #! /usr/bin/env bash # Args: [] +export VERSIONS_NAMES="$(dirname "$0")/../current.csv" && export VERSIONS_OUT="$(dirname "$0")/scripts" && mkdir -p "$VERSIONS_OUT" && -exec "$(dirname "$0")/../../tools/run_versions.sh" "$(dirname "$0")/WineApp.yaml" "$(dirname "$0")/../wine_sources.yaml" "$(dirname "$0")/../build_amd64.sh" "$1" "$2" +"$(dirname "$0")/../../tools/run_versions.sh" "$(dirname "$0")/WineApp.yaml" "$(dirname "$0")/../wine_sources.yaml" "$(dirname "$0")/../build_amd64.sh" "$1" "$2" && +"$(dirname "$0")/../../tools/run_versions.sh" "$(dirname "$0")/WineApp-staging.yaml" "$(dirname "$0")/../wine_sources.yaml" "$(dirname "$0")/../build_amd64.sh" "$1" "$2" diff --git a/Platform-v2.0/current.csv b/Platform-v2.0/current.csv new file mode 100644 index 0000000..c1d5fcc --- /dev/null +++ b/Platform-v2.0/current.csv @@ -0,0 +1,3 @@ +stable,5.0.1 +5-stable,5.0.1 +latest,5.12 \ No newline at end of file diff --git a/tools b/tools index f8ec81d..97b6940 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit f8ec81de4bb9386b6713db6c186da7d6b0c2e6cd +Subproject commit 97b69409b6a9adf2477fbefca82f0ca049c75944