.
Created attachment 398513 [details] Patch
Created attachment 398514 [details] Patch
Forgot to mention the bst workspace stuff, hands-on: https://wiki.gnome.org/Newcomers/BuildSystemComponent#Running_software_built_with_BuildStream
Comment on attachment 398514 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398514&action=review > Tools/ChangeLog:30 > + To build the SDK, run `Tools/Scripts/webkit-flatpak-sdk --build`, > + this can take hours and use gigabytes of your hard-drive. To build > + a single recipe, use something like: > + > + `Tools/Scripts/bst-wrapper build sdk/gtk.bst` > + > + To enter the Buildstream SDK shell and debug stuff when hacking on > + a specific dependency, `Tools/Scripts/bst-wrapper shell sdk/gtk.bst`. > + > + To test your changes in WebKit: > + ```shell > + $ Tools/Scripts/webkit-flatpak -u --repo=Tools/buildstream/repo > + $ Tools/Scripts/run-minibrowser --gtk --flatpak-repo=Tools/buildstream/repo <url> > + ... > + ``` > + > + bst-wrapper has the same options as bst itself, documented on > + https://docs.buildstream.build/1.4.2/index.html. > + > + Internally the bst-wrapper will install Buildstream and a few > + other python dependencies in a local virtualenv managed by pipenv. > + This is all abstracted though, in theory direct access to the > + pipenv environment shouldn't be needed. Nice summary of how to use this. Can we add this info in a README file inside Tools/buildstream as well? > Tools/buildstream/utils/generate-version:16 > +#!/bin/sh > + > +timestamp=$(git log -1 --format="%at" HEAD) > +datestring=$(date -d @$timestamp -Idate) > + > +version=$(git describe --always --dirty) > + > +cat >$1 <<EOF > +# no-commit > +# This file is generated by utils/generate-version as part of the > +# Makefile / CI system. Please do not commit it. > + > +variables: > + runtime-version: '${version}' > + runtime-version-date: '${datestring}' > +EOF Using the git hash as the runtime-version looks less optimal than using the svn version (which its guaranteed to be a monotonically increasing number) You can get that by calling the script Tools/glib/svn-revision
Comment on attachment 398514 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398514&action=review >> Tools/ChangeLog:30 >> + pipenv environment shouldn't be needed. > > Nice summary of how to use this. > Can we add this info in a README file inside Tools/buildstream as well? Yep! >> Tools/buildstream/utils/generate-version:16 >> +EOF > > Using the git hash as the runtime-version looks less optimal than using the svn version (which its guaranteed to be a monotonically increasing number) > You can get that by calling the script Tools/glib/svn-revision Ah yes, this was in a git repo before. Makes sense to use svn rev indeed. Good catch.
Created attachment 398600 [details] Patch
Comment on attachment 398600 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398600&action=review > Tools/buildstream/utils/generate-version:2 > +#!/bin/sh > + # To make this script more robust I would set here: set -eu
Committed r261274: <https://trac.webkit.org/changeset/261274>
<rdar://problem/62966399>