aboutsummaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* bin: always define MESA_GIT_SHA1 to make it directly usable in codeEric Engestrom2018-08-161-2/+2
| | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* git_sha1: simplify logicEric Engestrom2018-08-161-5/+1
| | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* bin: split `write_if_different()` outEric Engestrom2018-08-161-7/+14
| | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
* bin: whitespace cleanupEric Engestrom2018-08-161-3/+3
| | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
* meson, install_megadrivers: Also remove stale symlinksGert Wollny2018-08-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | os.path.exists doesn't return True for stale symlinks, but they are in the way later, when a link/file with the same name is to be created. For instance it is conceivable that the pointed to file is replaced by a file with a new name, and then the symlink is dead. To handle this check specifically for all existing symlinks to be removed. (This bugged me for some time with a link libXvMCr600.so always being in the way of installing this file) v2: use only os.lexist and replace all instances of os.exist (Dylan Baker) v3: handle directory check correctly (Eric Engestrom) Fixes: f7f1b30f81e842db6057591470ce3cb6d4fb2795 ("meson: extend install_megadrivers script to handle symmlinking") Reviewed-by: Eric Engestrom <[email protected]>(v2 minus dir check) Reviewed-by: Dylan Baker <[email protected]> Signed-off-by: Gert Wollny <[email protected]>
* bin/get-pick-listh.sh: force git --pretty=mediumDylan Baker2018-05-231-1/+1
| | | | | | Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Andres Gomez <[email protected]>
* bin/bugzilla_mesa.sh: explicitly set the --pretty argumentDylan Baker2018-05-231-1/+1
| | | | | | Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Andres Gomez <[email protected]>
* bin: force git show to use default pretty settingDylan Baker2018-04-271-2/+2
| | | | | | | | | | | I have pretty default to short, which breaks this script. v2: - Fix both places that don't define a --pretty (Emil) cc: Juan A. Suarez <[email protected]> Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (v1) Reviewed-by: Emil Velikov <[email protected]>
* bin/install_megadrivers: rename a few variables to make things clearerDylan Baker2018-04-231-8/+8
| | | | | | | Originally the "each" variable was just a part of the "drivers" variable. It's not anymore so it's a bit ambiguous. Signed-off-by: Dylan Baker <[email protected]>
* bin/install_megadrivers: fix DESTDIR and -D*-pathDylan Baker2018-04-231-2/+6
| | | | | | | | | | | This fixes -Ddri-drivers-path, -Dvdpau-libs-path, etc. with DESTDIR when those paths are absolute. Currently due to the way python's os.path.join handles absolute paths these will ignore DESTDIR, which is bad. This fixes them to be relative to DESTDIR if that is set. Fixes: 3218056e0eb375eeda470058d06add1532acd6d4 ("meson: Build i965 and dri stack") Signed-off-by: Dylan Baker <[email protected]>
* meson: fix megadriver symlinkingDylan Baker2018-04-051-1/+1
| | | | | | | | | | | Which should be relative instead of absolute. Fixes: f7f1b30f81e842db6057591470ce3cb6d4fb2795 ("meson: extend install_megadrivers script to handle symmlinking") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105567 Signed-off-by: Dylan Baker <[email protected]> Reviewed-and-Tested-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* meson: extend install_megadrivers script to handle symmlinkingDylan Baker2017-12-041-0/+14
| | | | | | | | | Which is required for the gallium media state trackers. v2: - Make symlinks local instead of absolute Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* meson: Add script to use VERSION file for getting versionDylan Baker2017-11-091-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 <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* git_sha1_gen: create empty file in fallback pathEric Engestrom2017-10-301-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 <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
* meson: bring MESA_GIT_SHA1 in line with other build systemsEric Engestrom2017-10-271-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 <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
* buildsys: move file regeneration logic to the script itselfEric Engestrom2017-10-271-1/+12
| | | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
* install_megadrivers: print the full path with driver nameDylan Baker2017-10-261-1/+1
| | | | | | | Instead of just the path. Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* git_sha1_gen: use git_sha1.h.in on all build systemsEric Engestrom2017-10-161-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 <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* git_sha1_gen: accept MESA_GIT_SHA1_OVERRIDE env varBrian Paul2017-10-101-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 <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
* meson: Build i965 and dri stackDylan Baker2017-10-091-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 <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* git_sha1_gen: fix output on python3Eric Engestrom2017-09-251-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 <[email protected]> Fixes: b99dcbfeb344390fea99 "build: Convert git_sha1_gen script to Python." Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
* git_sha1_gen: catch any error the same wayEric Engestrom2017-08-021-5/+2
| | | | | Acked-by: Jose Fonseca <[email protected]> Signed-off-by: Eric Engestrom <[email protected]>
* build: Don't bail on OSError in git_sha1_gen.pyTobias Klausmann2017-08-021-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 <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* build: Convert git_sha1_gen script to Python.Jose Fonseca2017-08-012-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 <[email protected]>
* build systems: move git_sha1_gen.sh to bin/Eric Engestrom2017-07-061-0/+12
| | | | | | | | | There was no reason for this script to live outside the scripts directory. Suggested-by: Brian Paul <[email protected]> Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* bin/get-fixes-pick-list.sh: better identify multiple "fixes:" tagsAndres Gomez2017-06-151-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 <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* bin/get-fixes-pick-list.sh: parse just the commit messageAndres Gomez2017-06-151-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 <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* bin/get-fixes-pick-list.sh: bring back the warningAndres Gomez2017-05-131-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 <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* bin/*py: honor editorconfig formattingAndres Gomez2017-05-091-2/+2
| | | | | | | Replace the two stray tabs with respective space. Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* bin: use tabs for coding style on *.sh filesAndres Gomez2017-05-091-2/+1
| | | | | | | v2: Instead of changing *.sh, adapt the editorconfig file (Emil). Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* bin/get-fixes-pick-list.sh: don't warn if more than one, go over themAndres Gomez2017-05-081-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 <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/get-{extra,fixes}-pick-list.sh: improve outputJuan A. Suarez Romero2017-04-202-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 <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* bin/get-{extra,fixes}-pick-list.sh: add support for ignore listJuan A. Suarez Romero2017-04-202-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 <[email protected]>
* bin/get-fixes-pick-list.sh: fix typoJuan A. Suarez Romero2017-04-041-1/+1
| | | | | | Replace "nore" by "more". Reviewed-by: Emil Velikov <[email protected]>
* bin/get-fixes-pick-list.sh: do not mandate bashEmil Velikov2017-03-101-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 <[email protected]> Reviewed-by: Andreas Boll <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/shortlog_mesa.sh: remove the final bashismEmil Velikov2017-03-101-2/+2
| | | | | | | | Remove the typeset built-in and toggle to /bin/sh Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andreas Boll <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/bugzilla_mesa.sh: rework the looping methodEmil Velikov2017-03-101-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 <[email protected]> Reviewed-by: Andreas Boll <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/perf-annotate-jit: add .py suffixEmil Velikov2017-03-101-0/+0
| | | | | | | | To provide direct feedback about the file in question. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Jose Fonseca <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/get-fixes-pick-list.sh: add new scriptEmil Velikov2017-02-161-0/+61
| | | | | | | | | The script parses the "Fixes" tags and nominates respective commit if applicable. Cc: "13.0 17.0" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/get-pick-list.sh: remove ancient way of nominating patchesEmil Velikov2017-02-161-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" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/get-pick-list.sh: limit `git grep ...' only as neededEmil Velikov2017-02-161-2/+5
| | | | | | | | Analogous to previous commit. Cc: "13.0 17.0" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/get-typod-pick-list.sh: limit `git grep ...' to only as neededEmil Velikov2017-02-161-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" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/get-extra-pick-list: rework to use already_picked listEmil Velikov2017-02-161-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" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* bin/get-extra-pick-list: use git merge-base to get the branchpointEmil Velikov2017-02-161-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" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
* get-typod-pick-list.sh: add new scriptEmil Velikov2017-01-131-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 <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
* Introduce .editorconfigEric Engestrom2016-08-311-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 <[email protected]> Acked-by: Eric Anholt <[email protected]> Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
* bugzilla_mesa.sh: Drop "Bug " from sed commandEmil Velikov2016-07-071-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" <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
* mesa; add get-extra-pick-list.sh script into bin/Emil Velikov2016-02-291-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" <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
* bugzilla_mesa.sh: sort the bugs list by numberEmil Velikov2015-07-131-8/+5
| | | | | | v2: Use change sed/sort based on Ilia's suggestion. Signed-off-by: Emil Velikov <[email protected]>
* get-pick-list: Allow for non-whitespace between "CC:" and "mesa-stable"Carl Worth2013-07-311-1/+1
| | | | | | | | | | We recently proposed a new syntax for stable-patch nominations such as: CC: "9.2 and 9.1" <[email protected]> and this has already appeared in the wild. So we extend the regular expression to pick this up as well.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 23:23:26 +0000