aboutsummaryrefslogtreecommitdiffstats
path: root/scons/custom.py
Commit message (Collapse)AuthorAgeFilesLines
* scons: add py3 supportMichel Zou2019-09-281-2/+6
| | | | | | | | | | SCons 3.1 has moved to python 3, requiring this fix to continue supporting scons builds. Closes: #944 Cc: [email protected] Acked-by: Eric Engestrom <[email protected]> Tested-by: Eric Engestrom <[email protected]>
* scons: Compatibility with Scons development version stringpal10002019-03-121-1/+6
| | | | | | | | | | | | | | | | | | | | | This ensures Mesa3D build doesn't fail in this case as encountered when bisecting Scons source code while regression testing https://bugs.freedesktop.org/show_bug.cgi?id=109443 and when testing 3.0.5.a.2 Technical details: Scons version string has consistently been in this format: MajorVersion.MinorVersion.Patch[.alpha/beta.yyyymmdd] so these formulas should strip alpha/beta flags and return Scons version: - as string - `'.'.join(SCons.__version__.split('.')[:3])` - as tuple of integers - `tuple(map(int, SCons.__version__.split('.')[:3]))` - v2: Fixed Scons version retrieval formulas as string and tuple of integers. - v3: Fixed Scons version string format description. Cc: "19.0" <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
* scons: use python3-compatible listsEric Engestrom2017-09-251-4/+4
| | | | | | | These changes were generated using python's `2to3` tool. Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
* scons: allow .inl file extensionTim Rowley2017-06-301-1/+1
| | | | | | Intended for header files which are not meant to be included directly. Reviewed-by: Bruce Cherniak <bruce.cherniak at intel.com>
* scons: ignore .hpp files in parse_source_list()George Kyriazis2016-11-211-1/+1
| | | | | | | Drivers that contain C++ .hpp files need to ignore them too, along with .h files, when building source file lists. Reviewed-by: Emil Velikov <[email protected]>
* scons: Fix the Python dependency scanner.Jose Fonseca2016-10-141-2/+8
| | | | | | | | | | | | | | modulefinder wasn't searching for dependencies in the script dir. It's not capable of detecting the sys.path manipulations scripts do internally neither. This change fixes the first issue, and hacks around the second. Honestly, I've come to the conclusion that automatic Python dependency it will always be too brittle. I think we should start manually typing the dependencies like we do in automake. At very least it will enable any person to eyeball and spot/fix missing dependencies, without dig into SCons internals.
* scons: support 2.5.0Giuseppe Bilotta2016-05-251-1/+8
| | | | | | | | | | | | | | The get_implicit_deps changed in SCons 2.5, expecting a callable rather than a path as third argument. Detect the SCons versions and set the argument appropriately to support both 2.5 and earlier versions. This closes #95211. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95211 Signed-off-by: Giuseppe Bilotta <[email protected]> Cc: [email protected] Acked-by: Emil Velikov <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* scons: Improve Python module dependency discovery.Jose Fonseca2016-05-091-18/+9
| | | | | | | | | | Several NIR scripts were using `from ... import ...` syntax, which wasn't supported. Using Python standard libary's modulefinder solves the problem with less effort and hacks. Reviewed-by: Brian Paul <[email protected]>
* scons: do not include headers from the sources listsJose Fonseca2014-08-141-0/+3
| | | | | | | | | | The SCons documentation is not explicit on the topic yet building mesa with SCons and MSVC is known to have problems when headers are listed. So be safe just drop them for now. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82534 Tested-by: Vinson Lee <[email protected]> Acked-by: Emil Velikov <[email protected]>
* s/Tungsten Graphics/VMware/José Fonseca2014-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tungsten Graphics Inc. was acquired by VMware Inc. in 2008. Leaving the old copyright name is creating unnecessary confusion, hence this change. This was the sed script I used: $ cat tg2vmw.sed # Run as: # # git reset --hard HEAD && find include scons src -type f -not -name 'sed*' -print0 | xargs -0 sed -i -f tg2vmw.sed # # Rename copyrights s/Tungsten Gra\(ph\|hp\)ics,\? [iI]nc\.\?\(, Cedar Park\)\?\(, Austin\)\?\(, \(Texas\|TX\)\)\?\.\?/VMware, Inc./g /Copyright/s/Tungsten Graphics\(,\? [iI]nc\.\)\?\(, Cedar Park\)\?\(, Austin\)\?\(, \(Texas\|TX\)\)\?\.\?/VMware, Inc./ s/TUNGSTEN GRAPHICS/VMWARE/g # Rename emails s/[email protected]/[email protected]/ s/[email protected]/[email protected]/g s/jrfonseca-at-tungstengraphics-dot-com/jfonseca-at-vmware-dot-com/ s/jrfonseca\[email protected]/[email protected]/g s/keithw\[email protected]/[email protected]/g s/[email protected]/[email protected]/g s/thomas-at-tungstengraphics-dot-com/thellstom-at-vmware-dot-com/ s/[email protected]/[email protected]/ # Remove dead links s@Tungsten Graphics (http://www.tungstengraphics.com)@Tungsten Graphics@g # C string src/gallium/state_trackers/vega/api_misc.c s/"Tungsten Graphics, Inc"/"VMware, Inc"/ Reviewed-by: Brian Paul <[email protected]>
* scons: Fix implicit python dependency discovery on Windows.José Fonseca2013-06-081-1/+2
| | | | | | | | Probably due to CRLF endings, the discovery of python import statements was not working on Windows builds, causing incremental builds to often fail unless one wiped out the build directory. NOTE: This is a candidate for stable branches.
* scons: Fix source lists parsing on Windows.José Fonseca2013-01-231-2/+7
| | | | | | | | | | | / vs \ mismatch was causing .objs to be put in the source tree, causing breakeage when doing different build types in the same tree (eg., debug vs release). Fix this by normalizing everything to / slashes. It's probably a good idea to purge all .objs from source tree to prevent issues completely.
* scons: Fix MinGW cross compilation.José Fonseca2012-08-161-3/+22
| | | | | Compensate for the recent changes and assumptions added to Makefiles.sources
* scons: Populate top_srcdir and top_builddir variables when reading ↵José Fonseca2012-08-141-0/+4
| | | | | | | Makefiles.sources. This is not entirely correct, as scons doesn't put binaries in a "src" subdirectory, but doesn't seem to be a problem for now.
* scons: Require same pkg-config versions as configure.José Fonseca2012-02-071-1/+4
|
* scons: MacOSX build fixes.José Fonseca2011-09-201-4/+2
|
* scons: add ParseSourceList methodChia-I Wu2011-08-231-0/+36
| | | | | | | | | | | | | | ParseSourceList() can be used to parse a source list file and returns the source files defined in it. It is supposed to be used like this # get the list of source files from C_SOURCES in Makefile.sources sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES') The syntax of a source list file is compatible with GNU Make. This effectively allows SConscript and Makefile to share the source lists. Acked-by: José Fonseca <[email protected]> Acked-by: Chad Versace <[email protected]>
* scons: Expose pkg-config in a simpler manner.José Fonseca2011-06-301-0/+76
|
* scons: Accept verbose=yes instead of quiet=no.José Fonseca2011-06-171-1/+2
| | | | 'verbose' is affirmative, and much more common name for this sort of option.
* scons: Add a few more human friendly messages.José Fonseca2011-05-041-0/+1
|
* scons: Add human friendlier build messages for lex/yacc.José Fonseca2011-03-031-0/+2
|
* scons: User friendly message for code generated filesJosé Fonseca2010-02-101-1/+3
|
* scons: Remove duplicated code.José Fonseca2010-01-021-31/+0
|
* scons: Expose convienience libraries to the host environment.José Fonseca2010-01-011-0/+198
This fixes MinGW cross compilation build, recently broken due to the use of convenience libraries in the GLSL preprocessor.