summaryrefslogtreecommitdiff
path: root/bin
AgeCommit message (Collapse)AuthorFilesLines
2017-12-04meson: extend install_megadrivers script to handle symmlinkingDylan Baker1-0/+14
Which is required for the gallium media state trackers. v2: - Make symlinks local instead of absolute Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-11-09meson: Add script to use VERSION file for getting versionDylan Baker1-0/+35
Meson has up until this point set it's version in the root meson.build script, while the other build systems read the VERSION file. This is just "one more thing" to duplicate between meson and every other build system. This script is a simple "read, strip, print" sort of deal to allow meson to read the VERSION file. I chose to implement this in python since python is portable, and to keep the meson.build script clean. This is also complicated by the fact that the project() call *must* be the first non-comment,non-blank in the toplevel meson.build script. v2: - Move from scripts/ to bin/ - use python explicitly to run the scripts to support windows Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-10-30git_sha1_gen: create empty file in fallback pathEric Engestrom1-0/+2
I missed this part in my conversion, the old stream redirection meant the file was always created. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103496 Fixes: 7088622e5fb506b64c90 "buildsys: move file regeneration logic to the script itself" Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2017-10-27meson: bring MESA_GIT_SHA1 in line with other build systemsEric Engestrom1-0/+21
Meson's vcs_tag() uses the output of `git describe`, eg. 17.3-branchpoint-5-gfbf29c3cd15ae831e249+ Whereas the other build systems used a script that outputs only the sha1 of the HEAD commit, eg. fbf29c3cd1 Given that this information is used by printing it next to the version number, there's some redundancy here, and inconsistency between build systems. Bring Meson in line by making it use the same script, with the added advantage of now supporting the MESA_GIT_SHA1_OVERRIDE env var. Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2017-10-27buildsys: move file regeneration logic to the script itselfEric Engestrom1-1/+12
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2017-10-26install_megadrivers: print the full path with driver nameDylan Baker1-1/+1
Instead of just the path. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2017-10-16git_sha1_gen: use git_sha1.h.in on all build systemsEric Engestrom1-1/+4
Meson already uses this, let's get the other build sys to use it too. Note: rstrip() was dropped, as truncating to the first 10 chars already gets rid of the terminating newline (not an issue with the env var either, unless maliciously crafted to break the build... not sure this is a real-world issue). Verified to work and give the same output as before on both python 2 and 3 :) Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2017-10-10git_sha1_gen: accept MESA_GIT_SHA1_OVERRIDE env varBrian Paul1-13/+26
If one uses a parent build script to download/build Mesa we may not have a full git repository (maybe a tar archive) so the 'git rev-parse' command will fail. This updates the script to look for a MESA_GIT_SHA1_OVERRIDE env var. If it's set, use that sha1 instead of using git rev-parse. With this change we can put a git hash in the GL_VERSION string even when we don't have a git repo. v2: incorporate Dylan's suggestions to simplify the code Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2017-10-09meson: Build i965 and dri stackDylan Baker1-0/+55
This gets pretty much the entire classic tree building, as well as i965, including the various glapis. There are some workarounds for bugs that are fixed in meson 0.43.0, which is due out on October 8th. I have tested this with piglit using glx. v2: - fix typo "vaule" -> "value" - use gtest dep instead of linking to libgtest (rebase error) - use gtest dep instead of linking against libgtest (rebase error) - copy the megadriver, then create hard links from that, then delete the megadriver. This matches the behavior of the autotools build. (Eric A) - Use host_machine instead of target_machine (Eric A) - Put a comment in the right place (Eric A) - Don't have two variables for the same information (Eric A) - Put pre_args at top of file in this patch (Eric A) - Fix glx generators in this patch instead of next (Eric A) - Remove -DMESON hack (Eric A) - add sha1_h to mesa in this patch (Eric A) - Put generators in loops when possible to reduce code in mapi/glapi/gen (Eric A) v3: - put HAVE_X11_PLATFORM in this patch Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2017-09-25git_sha1_gen: fix output on python3Eric Engestrom1-1/+1
String handling has changed on python3. Before this patch, on python3: #define MESA_GIT_SHA1 "git-b'b99dcbfeb3'" After: #define MESA_GIT_SHA1 "git-b99dcbfeb3" (No change on python2, it always looked ok) Cc: Jose Fonseca <jfonseca@vmware.com> Fixes: b99dcbfeb344390fea99 "build: Convert git_sha1_gen script to Python." Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
2017-08-02git_sha1_gen: catch any error the same wayEric Engestrom1-5/+2
Acked-by: Jose Fonseca <jfonseca@vmware.com> Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-08-02build: Don't bail on OSError in git_sha1_gen.pyTobias Klausmann1-0/+3
When building sandboxed, we may encounter additional errors. Ignore the errors, as we are in a constrained environment. This can be observed when building latest git with OBS. Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-08-01build: Convert git_sha1_gen script to Python.Jose Fonseca2-12/+20
Python is the scripting language we've been using for scripts that need to run across all supported platforms. Shell is *not* a portable language for scripts. Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-07-06build systems: move git_sha1_gen.sh to bin/Eric Engestrom1-0/+12
There was no reason for this script to live outside the scripts directory. Suggested-by: Brian Paul <brianp@vmware.com> Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Brian Paul <brianp@vmware.com>
2017-06-15bin/get-fixes-pick-list.sh: better identify multiple "fixes:" tagsAndres Gomez1-4/+7
We were not considering as multiple fixes lines with: Fixes: $sha_1, Fixes: $sha_2 Now, we split the lines so we will consider them individually, as in: Fixes: $sha_1, Fixes: $sha_2 Additionally, we try to get the SHA from split lines so: Fixes: $sha_1 Will be considered as: Fixes: $sha_1 v2: - Treat empty spaces earlier in fix lines (Emil) - Fold 2 lines into one to gather fix commit ids (Emil) Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Emil Velikov <emli.velikov@collabora.com>
2017-06-15bin/get-fixes-pick-list.sh: parse just the commit messageAndres Gomez1-2/+2
We were parsing the whole diff, although the candidates were identified only by the commit message. Now, we only use the commit message for parsing. Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Emil Velikov <emli.velikov@collabora.com>
2017-05-13bin/get-fixes-pick-list.sh: bring back the warningAndres Gomez1-7/+13
We warn again if there are more than one line with the "fixes:" tag. The warning is silenced when the commit has already landed or each fixes tag reference a commit that is in branch. v2: - Warn if any of the fixes tags has not landed (Emil) v3: - Remove unnecessary head command - Clarify commit message (Emil) - Skip already picked commits sooner (Emil) Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-05-09bin/*py: honor editorconfig formattingAndres Gomez1-2/+2
Replace the two stray tabs with respective space. Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-05-09bin: use tabs for coding style on *.sh filesAndres Gomez1-2/+1
v2: Instead of changing *.sh, adapt the editorconfig file (Emil). Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-05-08bin/get-fixes-pick-list.sh: don't warn if more than one, go over themAndres Gomez1-25/+26
If an identified commit was having more than one fix, we would warn about that and only treat the first. Now, we don't warn but treat all of them. Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Eric Engestrom <eric@engestrom.ch>
2017-04-20bin/get-{extra,fixes}-pick-list.sh: improve outputJuan A. Suarez Romero2-3/+8
Show the commit hash and the title in a way that it is easier to copy and paste in the bin/.cherry-ignore-extra file if we want to ignore those commits for the future. v2: - Use printf instead echo (Eric Engestrom) Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-04-20bin/get-{extra,fixes}-pick-list.sh: add support for ignore listJuan A. Suarez Romero2-0/+13
Both scripts does not use a file with the commits to ignore. So if we have handled one of the suggested commits and decided we won't pick it, the scripts will continue suggesting them. v2: - Mark the candidates in bin/get-extra-pick-list.sh (Juan A. Suarez) - Use bin/.cherry-ignore to store rejected patches (Emil) Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-04-04bin/get-fixes-pick-list.sh: fix typoJuan A. Suarez Romero1-1/+1
Replace "nore" by "more". Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2017-03-10bin/get-fixes-pick-list.sh: do not mandate bashEmil Velikov1-1/+1
Silly thinko on my end, as I was writing the script. There is nothing bash specific in there. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-03-10bin/shortlog_mesa.sh: remove the final bashismEmil Velikov1-2/+2
Remove the typeset built-in and toggle to /bin/sh Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-03-10bin/bugzilla_mesa.sh: rework the looping methodEmil Velikov1-26/+12
We don't use DRYRUN (and no others scripts have one) so just drop it. This allows us to rework the loop to the more commonly used "git .... | while read foo; do ... done" That in itself gets rid of the only remaining bashism and we can toggle the shebang to /bin/sh. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-03-10bin/perf-annotate-jit: add .py suffixEmil Velikov1-0/+0
To provide direct feedback about the file in question. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-02-16bin/get-fixes-pick-list.sh: add new scriptEmil Velikov1-0/+61
The script parses the "Fixes" tags and nominates respective commit if applicable. Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-02-16bin/get-pick-list.sh: remove ancient way of nominating patchesEmil Velikov1-1/+1
The old way of nominating patches [NOTE: .*[Cc]andidate] was deprecated and has been unused for approx. 3 years. Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-02-16bin/get-pick-list.sh: limit `git grep ...' only as neededEmil Velikov1-2/+5
Analogous to previous commit. Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-02-16bin/get-typod-pick-list.sh: limit `git grep ...' to only as neededEmil Velikov1-2/+5
The currently used range HEAD..origin/master is far too broad. It looks for nominations within the already_landed list (branchpoint..HEAD). Similarly we look for already_landed whiting the [possible] nominations Rand branchpoint..origin/master. Improve things by limiting the look ups to the branch point. Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-02-16bin/get-extra-pick-list: rework to use already_picked listEmil Velikov1-8/+11
Currently we loop (git log --grep) to check if the fix has landed. We can simplify and make things faster by storing the already_picked list and grep ping through it. Slim down the message while we're here. Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-02-16bin/get-extra-pick-list: use git merge-base to get the branchpointEmil Velikov1-2/+1
Since mesa development history is linear and the only diversion is at the branchpoint. Thus we can drop the ad-hoc parsing and use git merge-base to retrieve it. Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-01-13get-typod-pick-list.sh: add new scriptEmil Velikov1-0/+39
Typos do happen as people nominate patches for stable. This script aims to catch most of those. Due to the subtle nature of things, one has to pay special attention to the output, similar to get-extra-pick-list.sh. At the moment only the following is handled: grep -i "CC:.*mesa-dev" Cc: 12.0 13.0 <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2016-08-31Introduce .editorconfigEric Engestrom1-0/+3
A few weeks ago, Jose Fonseca suggested [0] we use .editorconfig files to try and enforce the formatting of the code, to which Michel Dänzer suggested [1] we start by importing the existing .dir-locals.el settings. The first draft was discussed in the RFC [2]. These .editorconfig are a first step, one that has the advantage of requiring little to no intervention from the devs once the settings files are in place, but the settings are very limited. This does have the advantage of applying while the code is being written. This doesn't replace the need for more comprehensive formatting tools such as clang-format & clang-tidy, but those reformat the code after the fact. [0] https://lists.freedesktop.org/archives/mesa-dev/2016-June/121545.html [1] https://lists.freedesktop.org/archives/mesa-dev/2016-June/121639.html [2] https://lists.freedesktop.org/archives/mesa-dev/2016-July/123431.html Acked-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Acked-by: Eric Anholt <eric@anholt.net> Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
2016-07-07bugzilla_mesa.sh: Drop "Bug " from sed commandEmil Velikov1-1/+1
After a recent Bugzilla update the word is no longer in the title. Thus the script ended up producing bogus HTML. Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2016-02-29mesa; add get-extra-pick-list.sh script into bin/Emil Velikov1-0/+35
This is a very rudimentary script that checks if any of the applied cherry-picks have been referenced (fixed?) by another patch. With the latter either missing the stable tag or hasn't yet been picked. Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-07-13bugzilla_mesa.sh: sort the bugs list by numberEmil Velikov1-8/+5
v2: Use change sed/sort based on Ilia's suggestion. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-07-31get-pick-list: Allow for non-whitespace between "CC:" and "mesa-stable"Carl Worth1-1/+1
We recently proposed a new syntax for stable-patch nominations such as: CC: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> and this has already appeared in the wild. So we extend the regular expression to pick this up as well.
2013-07-30get-pick-list.sh: Include commits mentionining "CC: mesa-stable..." in pick listCarl Worth1-1/+1
We recently adopted a new convention that patches can be nominated for the stable branch by including a line in the commit message as follows: CC: mesa-stable@lists.freedesktop.org This is a convenient syntax as "git send-email" will notice this line and automatically copy the resulting patch email to the mesa-stable mailing list. Here we extend the regular expression in the get-pick-list.sh script to also notice this pattern, (as well as the traditional "NOTE: This patch is a candidate..." form.
2013-05-01mesa: add usage examples to get-pick-list and shortlog scriptsAndreas Boll2-0/+12
NOTE: This is a candidate for the stable branches.
2013-05-01mesa: Add a script to generate the list of fixed bugsAndreas Boll1-0/+52
This list appears in the fixed bugs section of the release notes. v2: Add usage examples NOTE: This is a candidate for the stable branches.
2013-04-17gallivm: JIT symbol resolution with linux perf.José Fonseca1-0/+251
Details on docs/llvmpipe.html Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com>
2013-03-05mesa: Modify candidate search stringIan Romanick1-1/+1
Several commits on master for the 9.1 branch had "NOTE" messages in a slightly different format. NOTE: This is a candidate for stable branches Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2013-01-10Remove installmesaMatt Turner1-74/+0
2013-01-10Remove minstallMatt Turner1-112/+0
2013-01-10Remove mklibMatt Turner1-1043/+0
2013-01-03Add new .gitignore entries for Automake 1.13 testsPaul Berry1-0/+1
Automake 1.13 creates a bunch of new build artefacts: - bin/test-driver, a script for running tests. - *.trs files for every "make check" test result. - *.log files containing the output of every test run by "make check". Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-11-14mesa: use .cherry-ignore in the get-pick-list.sh scriptAndreas Boll1-2/+2
NOTE: This is a candidate for the stable branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-10-23mesa: fix indentation in get-pick-list.sh scriptAndreas Boll1-4/+4
NOTE: This is a candidate for the stable branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-11 18:38:18 +0000