Argparse updates

Signed-off-by: Waf Project <noreply@waf.io>

.gitignore

@@ -8,6 +8,9 @@ build
 demos/*/build*
 playground/*/build*
 .waf-*
+waf-*
+.waf3-*
+waf3-*
 *.log
 .DS_Store
 .AppleDouble
@@ -36,3 +39,9 @@ Temporary Items
 
 # Windows build output
 waf.bat
+
+# Vim temporary files
+*.swp
+
+# YouCompleteMe configuration
+.ycm_extra_conf.py

.pipelines/Jenkinsfile

@@ -0,0 +1,292 @@
+
+pipeline {
+    agent none
+    stages {
+        stage('Build and Lint') {
+            parallel {
+                stage('Python 2.7') {
+                    agent {
+                        label "ubuntu"
+                    }
+                    steps {
+                        sh 'python3 ./waf-light'
+                        sh 'python2.7 ./waf --help'
+                        stash includes: 'waf', name: 'waf'
+                    }
+                }
+                stage('Python 3.6') {
+                    agent {
+                        label "freebsd"
+                    }
+                    steps {
+                        sh 'python3.6 ./waf-light'
+                    }
+                }
+                stage('Deprecation warnings') {
+                    agent {
+                        label "ubuntu"
+                    }
+                    steps {
+                        sh '''
+cd waflib
+find . -iname "*.pyc" -exec rm -f {} \\; || true
+! (((PYTHONWARNINGS=all python3.6 -m compileall . > /dev/null) 2>&1 ) 2>&1) | grep -i DeprecationWarning
+'''
+                    }
+                }
+                stage('Pyflakes') {
+                    agent {
+                        label "freebsd"
+                    }
+                    steps {
+                        sh '''
+cd waflib
+var=`(/usr/local/bin/pyflakes3.py *.py Tools/*.py extras/*.py 2>&1) | egrep "undefined name|invalid syntax|inconsistent use|unindent does not match any outer indentation level" | wc -l`
+if [ "0" -eq "$var" ]
+then
+   /usr/local/bin/pyflakes3.py *.py Tools/*.py extras/*.py || true
+else
+   # just do it again and fail
+   /usr/local/bin/pyflakes3.py *.py Tools/*.py extras/*.py
+   exit 1
+fi
+'''
+                    }
+                }
+                stage('Unit tests') {
+                    agent {
+                        label "fedora"
+                    }
+                    steps {
+                        sh '''
+./waf-light
+cd tests/preproc/
+../../waf distclean
+../../waf configure build
+cd ../..'''
+                        sh '''
+cd tests/install/
+../../waf distclean
+../../waf configure build
+cd ../..'''
+                        sh '''
+cd tests/general/
+../../waf distclean
+../../waf configure build
+cd ../..'''
+                        sh '''
+export PATH=$PATH:$PWD
+cd tests/init/
+../../waf distclean
+../../waf configure build
+cd ../..'''
+                        sh '''
+export WAF_TEST_GROUP=waftest
+cd tests/install_group/
+../../waf distclean
+../../waf configure build
+'''
+                    }
+                }
+            }
+        }
+        stage('Integration') {
+            parallel {
+                stage('Ubuntu') {
+                    stages {
+                        stage('py25') {
+                            agent {
+                                label "ubuntu"
+                            }
+                            steps {
+                                dir('demos') {
+                                        unstash 'waf'
+                                }
+                                sh '''cd demos; LD_LIBRARY_PATH=/opt/lib ./waf distclean configure clean build --top=c'''
+                                sh '''cd demos; LD_LIBRARY_PATH=/opt/lib ./waf distclean configure clean build --top=c++'''
+                                sh '''cd demos; LD_LIBRARY_PATH=/opt/lib ./waf distclean configure clean build --top=java'''
+                                sh '''cd demos; LD_LIBRARY_PATH=/opt/lib ./waf distclean configure clean build --top=perl'''
+                                sh '''cd demos; LD_LIBRARY_PATH=/opt/lib ./waf distclean configure clean build --top=python'''
+                                sh '''cd demos; LD_LIBRARY_PATH=/opt/lib ./waf distclean configure clean build --top=qt5'''
+                                sh '''cd demos; LD_LIBRARY_PATH=/opt/lib ./waf distclean configure clean build --top=subst'''
+                            }
+                        }
+                        stage('py36') {
+                            agent {
+                                label "ubuntu"
+                            }
+                            steps {
+                                dir('demos') {
+                                    unstash 'waf'
+                                }
+                                sh '''cd demos; python3 ./waf configure clean build --top=c'''
+                                sh '''cd demos; python3 ./waf configure clean build --top=c++'''
+                                sh '''cd demos; python3 ./waf configure clean build --top=java'''
+                                sh '''cd demos; python3 ./waf configure clean build --top=perl'''
+                                sh '''cd demos; python3 ./waf configure clean build --top=python'''
+                                sh '''cd demos; python3 ./waf configure clean build --top=qt5'''
+                                sh '''cd demos; python3 ./waf configure clean build --top=subst'''
+                            }
+                        }
+                        stage('py27') {
+                            agent {
+                                label "ubuntu"
+                            }
+                            steps {
+                                dir('demos') {
+                                    unstash 'waf'
+                                }
+                                sh '''cd demos; ./waf configure clean build --top=c'''
+                                sh '''cd demos; ./waf configure clean build --top=c++'''
+                                sh '''cd demos; ./waf configure clean build --top=java'''
+                                sh '''cd demos; ./waf configure clean build --top=perl'''
+                                sh '''cd demos; ./waf configure clean build --top=python'''
+                                sh '''cd demos; ./waf configure clean build --top=qt5'''
+                                sh '''cd demos; ./waf configure clean build --top=subst'''
+                            }
+                        }
+                    }
+                }
+                stage('OpenBSD') {
+                    stages {
+                        stage('Jython') {
+                            agent {
+                                label "openbsd"
+                            }
+                            steps {
+                                sh '''
+        export WAF_NO_PREFORK=1
+        python3 ./waf-light
+        cp waf demos/c
+        cd demos/c
+        /home/jenkins/jython/bin/jython ./waf distclean configure clean build
+        '''
+                            }
+                        }
+                        stage('py38') {
+                            agent {
+                                label "openbsd"
+                            }
+                            steps {
+                                dir('demos') {
+                                    unstash 'waf'
+                                }
+                                sh '''cd demos/asm; python3 ../waf configure clean build'''
+                                sh '''cd demos/c; python3 ../waf configure clean build'''
+                                sh '''cd demos/c++; python3 ../waf configure clean build'''
+                                sh '''cd demos/glib2; python3 ../waf configure clean build'''
+                                sh '''cd demos/perl; python3 ../waf configure clean build'''
+                                sh '''cd demos/python; python3 ../waf configure clean build'''
+                                sh '''cd demos/subst; python3 ../waf configure clean build'''
+                            }
+                        }
+                    }
+                }
+                stage('Windows') {
+                    stages {
+                        stage('C/py34') {
+                            agent {
+                                label "windows"
+                            }
+                            steps {
+                                bat ''' C:/Python34/python.exe waf-light --tools=msvs '''
+                                bat '''
+        copy waf demos\\c /Y
+        cd demos\\c
+        C:/Python34/python.exe waf distclean
+        C:/Python34/python.exe waf configure --no-msvc-lazy build -v
+        '''
+                                bat '''
+        copy waf demos\\qt5 /Y
+        cd demos\\qt5
+        C:/Python34/python.exe waf distclean
+        C:/Python34/python.exe waf configure --no-msvc-lazy build -v
+        '''
+                                bat '''
+        copy waf playground\\msvs /Y
+        cd playground\\msvs
+        C:/Python34/python.exe waf distclean
+        C:/Python34/python.exe waf configure
+        C:/Python34/python.exe waf msvs
+        '''
+                            }
+                        }
+                        stage('C/Msys2/py27') {
+                            agent {
+                                label "windows"
+                            }
+                            steps {
+                                unstash 'waf'
+                                bat '''
+        copy waf demos\\c /Y
+        cd demos\\c
+        set MSYSTEM=MINGW64
+        set WD=C:\\msys64\\usr\\bin
+        set CHERE_INVOKING=1
+        C:\\msys64\\usr\\bin\\sh --login -c 'exec /bin/bash -c "python waf configure clean build && python waf distclean"'
+        '''
+                            }
+                        }
+                        stage('C/Msys2/py35') {
+                            agent {
+                                label "windows"
+                            }
+                            steps {
+                                unstash 'waf'
+                                bat '''
+        copy waf demos\\c /Y
+        cd demos\\c
+        set MSYSTEM=MINGW64
+        set WD=C:\\msys64\\usr\\bin
+        set CHERE_INVOKING=1
+        C:\\msys64\\usr\\bin\\sh --login -c 'exec /bin/bash -c "python3 waf configure clean build && python3 waf distclean"'
+        '''
+                            }
+                        }
+                    }
+                }
+                stage('FreeBSD') {
+                    stages {
+                        stage('py36') {
+                            agent {
+                                label "freebsd"
+                            }
+                            steps {
+                                dir('demos') {
+                                    unstash 'waf'
+                                }
+                                sh '''cd demos/c; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/c++; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/java; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/jni; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/perl; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/python; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/ruby; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/glib2; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/qt5; python3.6 ../waf distclean configure clean build'''
+                                sh '''cd demos/dbus; python3.6 ../waf distclean configure clean build'''
+                            }
+                        }
+                    }
+                }
+                stage('MacOS') {
+                    stages {
+                        stage('py27') {
+                            agent {
+                                label "macos"
+                            }
+                            steps {
+                                dir('demos') {
+                                    unstash 'waf'
+                                }
+                                sh '''cd demos/c; ../waf distclean configure clean build'''
+                                sh '''cd demos/python; ../waf distclean configure clean build'''
+                                sh '''cd demos/mac_app; ../waf distclean configure clean build'''
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

ChangeLog

@@ -1,66 +1,18 @@
-NEW IN WAF 2.0.7
-----------------
-* Apply priorities to dynamically-generated tasks #2137
-* Fix upcoming Python 3.7 incompatibilities #2126
-* Fix Python3 support in extras/xcode6.py #2121
-* Improve priority support in extras/swig.py #2137
-* Improve support extras/protoc.py #2135
-* Improve argument handling in extras/clang_compilation_database.py #2127
-* Add glib DBus bindings in extras/gdbus.py #2134
-* Avoid name collisions for precompiled headers and libraries with similar names in extras/pch.py #2122
+CHANGES IN WAF 2.1.0
+--------------------
+* While the Waf file runs on Python 2 and 3, creating it requires Python 3
++ Added wafcache
++ waf_unit_test: Added task in returned tuples, custom reports should be adapted
+~ Ensure ConfigurationContext.load and Context.load definitions are consistent and remove unused *k parameters
+~ Remove the dependency on optparse and use argparse instead
+- Remove waflib.Runner.PriorityTasks.appendleft
+- Remove waflib.Task.TaskBase
+- Remove the upper class of waflib.Task.Task (metaclass syntax)
+- Remove Winphone/WinCE detection in msvc.py
+- Remove conf.add_as_needed because it does not check for the flag usage
 
-NEW IN WAF 2.0.6
-----------------
-* Add Task.deep_inputs to enable further dependencies on input file tasks
-* Set unit tests to depend on input file tasks instead of timestamps
-
-NEW IN WAF 2.0.5
-----------------
-* Force unit tests to depend on the executable creation time besides file contents
-* Enhance the Eclipse project generator
-* Update the cuda examples
-
-NEW IN WAF 2.0.4
-----------------
-* Enable more advanced warnings of ant_glob on build folders in verbose mode
-* Defer node.ant_glob(..., generator=True) evaluation
-* Enable 'waf clean' to get the list of files to remove from bld.clean_files
-* Define the environment variable WAF_NO_PREFORK to skip pre-forking
-* Fix Can't pickle local object '_createenviron.<locals>.encode' exceptions (Python 3.6)
-* Improve the Erlang module #2095
-* Add task target to parallel_debug outputs #2091
-
-NEW IN WAF 2.0.3
-----------------
-* Enable install_path=None for Python targets #2087
-* Skip empty or duplicates in java user classpath #2084
-* Change the unit test summary color scheme to use green and red colors
-* Improve the deadlock error message
-* Report sys.path values from Context.load_tool to improve error messages
-* Cache qrc uic->h conversions to enable qrc re-use across targets
-* Output long-running tasks outputs immediately using bld(rule=..., stdout=None)
-
-NEW IN WAF 2.0.2
-----------------
-* Improve Intel Fortran compiler detection on Windows #2063
-* Ensure that the task count starts at 1 in the build outputs
-* Add a --pdb option to start pdb on unexpected exceptions #2052
-* Fix conflicting qm/qrc re-used output files for multiple targets #2065
-* Add java support in protobuf (extras) #2049
-* Add a java test example (extras) #2062
-* Enable symbol processing for empty targets (extras) #2053
-
-NEW IN WAF 2.0.1
-----------------
-* Improve the default preprocessor behaviour for gcc/msvc
-* Accept task objects in Build.add_to_group for compatibility reasons
-* Prevent xcode generator from overwriting existing features #2038
-* Fix self.includes data scope #2035
-* Fix Node.ant_glob case sensitivity regression #2034
-* Fix Logs.verbose options regression #2033
-
-NEW IN WAF 2.0.0
-----------------
+CHANGES IN WAF 2.0.0
+--------------------
 * Provide a new priority system to improve scalability on complex builds
 * Provide TaskGroup objects to improve scalability on complex builds
 * Force new files into the build directory by default (use Node objects to bypass)
@@ -71,12 +23,12 @@ NEW IN WAF 2.0.0
 * Accept nested lists and generators in bld(source=...)
 * Sort TaskGen methods in alphabetical order by reversing TaskGen.prec order
 
-* Remove 'ut_fun' from waf_unit_test.py
-* Remove Node.sig and Node.cache_sig
-* Remove the BuildContext.rule decorator
-* Remove Task.update_outputs, Task.always_run
-* Remove atleast-version, exact-version and max-version from conf.check_cfg
-* Remove c_preproc.trimquotes
-* Remove field_name, type_name, function_name from conf.check() tests
-* Remove extras/mem_reducer.py as a better solution has been merged
-* Remove Utils.ex_stack (use traceback.format_exc())
+- Remove 'ut_fun' from waf_unit_test.py
+- Remove Node.sig and Node.cache_sig
+- Remove the BuildContext.rule decorator
+- Remove Task.update_outputs, Task.always_run
+- Remove atleast-version, exact-version and max-version from conf.check_cfg
+- Remove c_preproc.trimquotes
+- Remove field_name, type_name, function_name from conf.check() tests
+- Remove extras/mem_reducer.py as a better solution has been merged
+- Remove Utils.ex_stack (use traceback.format_exc())

DEVEL

@@ -1,4 +1,4 @@
-Waf 2.0 is on https://github.com/waf-project/waf
+Waf 2.0 is on https://gitlab.com/ita1024/waf
 ------------------------------------------------
 
 waflib            the core library
@@ -30,7 +30,7 @@ General coding guidelines
 Pull requests
 -------------
 
-See https://github.com/waf-project/waf
+See https://gitlab.com/ita1024/waf
 
 When implementing complex features, please add examples in the showcase folder demos/
 for modules under waflib/Tools, under tests/ for platform-independent unit tests,
@@ -38,4 +38,3 @@ or in playground/ for modules under waflib/extras.
 
 The files under waflib/Tools/ are kept API-compatible for the duration
 of a middle version (currently 2.0).
-

LICENSE

@@ -0,0 +1,25 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,51 +1,50 @@
-## ABOUT WAF
+# ABOUT WAF
 
 Waf is a Python-based framework for configuring, compiling and installing applications. Here are perhaps the most important features of Waf:
 
-  * *Automatic build order*: the build order is computed from input and output files, among others
-  * *Automatic dependencies*: tasks to execute are detected by hashing files and commands
-  * *Performance*: tasks are executed in parallel automatically, the startup time is meant to be fast (separation between configuration and build)
-  * *Flexibility*: new commands and tasks can be added very easily through subclassing, bottlenecks for specific builds can be eliminated through dynamic method replacement
-  * *Extensibility*: though many programming languages and compilers are already supported by default, many others are available as extensions
-  * *IDE support*: Eclipse, Visual Studio and Xcode project generators (waflib/extras/)
-  * *Documentation*: the application is based on a robust model documented in [The Waf Book](https://waf.io/book/) and in the [API docs](https://waf.io/apidocs/)
-  * *Python compatibility*: cPython 2.5 to 3.4, Jython 2.5, IronPython, and Pypy
+* *Automatic build order*: the build order is computed from input and output files, among others
+* *Automatic dependencies*: tasks to execute are detected by hashing files and commands
+* *Performance*: tasks are executed in parallel automatically, the startup time is meant to be fast (separation between configuration and build)
+* *Flexibility*: new commands and tasks can be added very easily through subclassing, bottlenecks for specific builds can be eliminated through dynamic method replacement
+* *Extensibility*: though many programming languages and compilers are already supported by default, many others are available as extensions
+* *IDE support*: Eclipse, Visual Studio and Xcode project generators (`waflib/extras/`)
+* *Documentation*: the application is based on a robust model documented in [The Waf Book](https://waf.io/book/) and in the [API docs](https://waf.io/apidocs/)
+* *Python compatibility*: cPython 2.5 to 3.x, Jython 2.5, IronPython, and PyPy
 
-Waf is used in particular by innovative companies such as [Avalanche Studios](http://www.avalanchestudios.se) and by open-source projects such as [RTEMS](https://www.rtems.org/). Learn more about Waf by reading [The Waf Book](https://waf.io/book/).
+Learn more about Waf by reading [The Waf Book](https://waf.io/book/). For researchers and build system writers, Waf also provides a framework and examples for creating [custom build systems](https://gitlab.com/ita1024/waf/tree/master/build_system_kit) and [package distribution systems](https://gitlab.com/ita1024/waf/blob/master/playground/distnet/README.rst).
 
-For researchers and build system writers, Waf also provides a framework for creating [custom build systems](https://github.com/waf-project/waf/tree/master/build_system_kit) and [package distribution systems](https://github.com/waf-project/waf/tree/master/playground/distnet/README.rst).
-
-Download the project from our page on [waf.io](https://waf.io/) or from a mirror on [freehackers.org](http://www.freehackers.org/~tnagy/release/), consult the [manual](https://waf.io/book/), the [API documentation](https://waf.io/apidocs/) and the [showcases](https://github.com/waf-project/waf/tree/master/demos) and [experiments](https://github.com/waf-project/waf/tree/master/playground).
+Download the project from our page on [waf.io](https://waf.io/), consult the [manual](https://waf.io/book/), the [API documentation](https://waf.io/apidocs/) and the [showcases](https://gitlab.com/ita1024/waf/tree/master/demos) and [experiments](https://gitlab.com/ita1024/waf/tree/master/playground).
 
 ## HOW TO CREATE THE WAF SCRIPT
 
-Python >= 2.6 is required to generate the waf script, and the resulting file can then run on Python 2.5.
-Just run:
+Python >= 2.7 is required to generate the waf script:
+
 ```sh
-$ ./waf-light configure build
-```
-Or, if several python versions are installed:
-```sh
-$ python3 ./waf-light configure build
+python ./waf-light configure build
 ```
 
+## CUSTOMIZATION
+
 The Waf tools in waflib/extras are not added to the waf script. To add
 some of them, use the --tools switch. An absolute path can be passed
 if the module does not exist under the 'extras' folder:
+
 ```sh
-$ ./waf-light --tools=swig
+./waf-light --tools=swig
 ```
 
 To customize the initialization, pass the parameter 'prelude'. Here is for example
 how to create a waf file using the compat15 module:
+
 ```sh
-$ ./waf-light --tools=compat15 --prelude=$'\tfrom waflib.extras import compat15\n'
+./waf-light --tools=compat15 --prelude=$'\tfrom waflib.extras import compat15\n'
 ```
 
 Although any kind of initialization is possible, using the build system kit
 may be easier (folder build\_system\_kit):
+
 ```sh
-$ ./waf-light --make-waf --tools=compat15,/comp/waf/aba.py --prelude=$'\tfrom waflib.extras import compat15\n\tprint("ok")'
+./waf-light --make-waf --tools=compat15,/comp/waf/aba.py --prelude=$'\tfrom waflib.extras import compat15\n\tprint("ok")'
 ```
 
 To avoid regenerating the waf file all the time, just set the `WAFDIR` environment variable to the directory containing "waflib".
@@ -53,9 +52,9 @@ To avoid regenerating the waf file all the time, just set the `WAFDIR` environme
 ## HOW TO RUN THE EXAMPLES
 
 Try this:
+
 ```sh
 cp waf demos/c/
 cd demos/c/
 ./waf configure build
 ```
-

TODO

@@ -1,8 +0,0 @@
-Waf 2.1
--------
-
-- Remove Winphone/WinCE detection in msvc.py
-- Fix the circular imports ccroot<->c_config.py
-- Remove superfluous *k in ctx.load() and other unused parameters
-- Ensure conf.load() has the same interface as ctx.load()
-

build_system_kit/extpy/extpy.py

@@ -27,7 +27,7 @@ class Context(mod.Context):
 				cache[node] = True
 				self.pre_recurse(node)
 				try:
-					function_code = node.read('rU')
+					function_code = node.read('r')
 					exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
 				finally:
 					self.post_recurse(node)

demos/asm/test.S

@@ -1,23 +1,22 @@
 #include "header.h"
 
-.text
-.align 2
-
-.section .data
+.data
 
 val:
  .long SOME_VALUE
 
+.text
+.align 2
+
 // Multiply input value by 421...
 .global mult10
-.type mult10, function
+.type mult10, @function
 mult10:
 	pushq    %rbp
 	movq     %rsp,%rbp
 
-	movl val,%eax
+	movabs val,%eax
 	imull %edi,%eax
 
 	popq     %rbp
 	ret
-

demos/asm/wscript

@@ -18,10 +18,11 @@ def build(bld):
 		source   = 'main.c test.S',
 		target   = 'asmtest',
 		defines  = 'foo=12',
-		includes = '.')
+		asflags  = '-Os',
+		includes = '.',
+                linkflags = '-no-pie')
 
 	def disp(ctx):
 		node = ctx.bldnode.ant_glob('asmtest*', remove=False)[0]
 		ctx.exec_command('%s' % node.abspath(), shell=False)
 	bld.add_post_fun(disp)
-

demos/c/stlib-deps/libA/external_vars.c

@@ -0,0 +1,11 @@
+
+#include <stdio.h>
+#include "external_vars.h"
+
+int k = 5;
+
+void print_value_of_k() {
+
+    printf("K = %d\n", k);
+
+}

demos/c/stlib-deps/libA/external_vars.h

@@ -0,0 +1,14 @@
+/*
+   Export internal vars
+   */
+
+#ifndef _EXTERNAL_VARS_H
+#define _EXTERNAL_VARS_H
+
+extern int k; /* export k */
+
+void print_value_of_k();
+
+extern int r;
+
+#endif /*_EXTERNAL_VARS_H */

demos/c/stlib-deps/libA/wscript_build

@@ -0,0 +1,7 @@
+# This is a static library that provides a header to include reference to
+# internal variables.
+bld.stlib(
+	target='A',
+	source='external_vars.c',
+	includes='.',
+	export_includes='.')

demos/c/stlib-deps/libB/sum.c

@@ -0,0 +1,12 @@
+
+#include <stdio.h>
+
+#include "sum.h"
+
+#include "external_vars.h"
+
+void sum(int j) {
+    printf("Adding %d...\n", j);
+    // Add our new value
+    k += j;
+}

demos/c/stlib-deps/libB/sum.h

@@ -0,0 +1,10 @@
+/*
+   Export internal vars
+   */
+
+#ifndef _SUM_H
+#define _SUM_H
+
+void sum(int j);
+
+#endif /*_SUM_H */

demos/c/stlib-deps/libB/wscript_build

@@ -0,0 +1,9 @@
+# This script uses libA to do some internal logic. It uses the default
+# behavior so it will be re-archived every time libA changes, even if
+# changes in libA are only visible at runtime.
+bld.stlib(
+	target='B',
+	source='sum.c',
+	use='A',
+	includes='.',
+	export_includes='.')

demos/c/stlib-deps/libC/diff.c

@@ -0,0 +1,13 @@
+
+#include <stdio.h>
+
+#include "diff.h"
+
+#include "external_vars.h"
+
+void diff(int j) {
+
+    printf("Subtracting %d...\n", j);
+    // subtract our new value
+    k -= j;
+}

demos/c/stlib-deps/libC/diff.h

@@ -0,0 +1,10 @@
+/*
+   Export internal vars
+   */
+
+#ifndef _DIFF_H
+#define _DIFF_H
+
+void diff(int j);
+
+#endif /* _DIFF_H */

demos/c/stlib-deps/libC/wscript_build

@@ -0,0 +1,10 @@
+# This script uses the logic that prevents static libraries from depending on
+# eachother. This means that the only way libC is re-archived is if the source
+# code file diff.c or any of its depenencies change.
+bld.stlib(
+	target='C',
+	source='diff.c',
+	features='skip_stlib_link_deps',
+	use='A',
+	includes='.',
+	export_includes='.')

demos/c/stlib-deps/main.c

@@ -0,0 +1,22 @@
+
+#include <stdio.h>
+
+#include "external_vars.h"
+#include "sum.h"
+#include "diff.h"
+
+int main()
+{
+    /* This should return to whatever the default value is. */
+    print_value_of_k();
+    sum(6);
+    print_value_of_k();
+    diff(8);
+    print_value_of_k();
+    sum(8);
+    print_value_of_k();
+    diff(6);
+    print_value_of_k();
+
+    return 0;
+}

demos/c/stlib-deps/wscript_build

@@ -0,0 +1,11 @@
+#! /usr/bin/env python
+
+bld.recurse('libA')
+bld.recurse('libB')
+bld.recurse('libC')
+
+# Note that main has an implied dependency between our main program and libA
+bld.program(
+	source   = 'main.c',
+	target   = 'test_static_link_chain',
+	use      = 'B C')

demos/c/wscript

@@ -27,12 +27,15 @@ def configure(conf):
 	conf.check(fragment='int main() { return 0; }\n', features='c')
 
 	try:
-		conf.check(fragment="int main() { return 0; }\n", execute=True) # 1
+		conf.check(fragment="int main(int argc, char* argv[]) { return 0; }\n", execute=True) # 1
 	except conf.errors.WafError:
 		Logs.warn('You are probably using a cross-compiler (disabling specific configuration tests)')
 		conf.check_library(test_exec=False)
 	else:
-		conf.check(fragment="""#include<stdio.h>\nint main(){fprintf(stderr, "mu"); printf("%d", 22);return 0;}\n""", execute=True, define_name='HAVE_MU')
+		conf.check(fragment="""#include<stdio.h>\nint main(){fprintf(stderr, "mu"); printf("%d", 22);return 0;}\n""",
+			msg='Checking for exec results', execute=True, define_name='HAVE_MU')
+		conf.check(fragment='int main(int argc, char* argv[]) { return argc - 2;}',
+			msg='Checking for test arguments', test_args=['--foo=bar'], execute=True)
 		conf.check_library(test_exec=True)
 
 	conf.check(lib='m', cflags='-Wall', defines=['var=foo', 'x=y'], uselib_store='M', mandatory=False)
@@ -75,7 +78,7 @@ def configure(conf):
 def build(bld):
 	bld.env.DEFINES=['WAF=1']
 
-	bld.recurse('program stlib shlib')
+	bld.recurse('program stlib stlib-deps shlib')
 	#bld.install_files('/tmp/foo', 'wscript')
 	#bld.env.PREFIX='/tmp/foo'
 	bld.install_files('${PREFIX}/', 'program/a.h  program/main.c', relative_trick=False)

demos/fortran/submodules/container.f90

@@ -0,0 +1,27 @@
+submodule (parent) container
+  implicit none
+
+contains
+
+    module procedure init
+      p%mother = mother
+      p%father = father
+    end procedure init
+
+    module subroutine harmonize(p)
+      type(parent_type), intent(inout) :: p
+      real :: avg
+
+      avg = 0.5 * (p%father + p%mother)
+      p%father = avg
+      p%mother = avg
+    end subroutine harmonize
+
+    module function parent_weight(p) result(w)
+      type(parent_type), intent(in) :: p
+      real :: w
+
+      w = p%mother**2 + p%father**2
+    end function parent_weight
+
+end submodule container

demos/fortran/submodules/helper.f90

@@ -0,0 +1,13 @@
+submodule (parent:container) helper
+  implicit none
+
+contains
+
+  module function parent_distance(pa, pb) result(dist)
+    type(parent_type), intent(in) :: pa, pb
+    real :: dist
+
+    dist = sqrt(parent_weight(pa) + parent_weight(pb))
+  end function parent_distance
+
+end submodule helper

demos/fortran/submodules/parent.f90

@@ -0,0 +1,30 @@
+module parent
+  implicit none
+
+  type parent_type
+    real :: mother
+    real :: father
+  end type parent_type
+
+  interface
+    module subroutine init(p, mother, father)
+      type(parent_type), intent(out) :: p
+      real, intent(in) :: mother, father
+    end subroutine init
+
+    module subroutine harmonize(p)
+      type(parent_type), intent(inout) :: p
+    end subroutine harmonize
+
+    module function parent_weight(p) result(w)
+      type(parent_type), intent(in) :: p
+      real :: w
+    end function parent_weight
+
+    module function parent_distance(pa, pb) result(dist)
+      type(parent_type), intent(in) :: pa, pb
+      real :: dist
+    end function parent_distance
+  end interface
+
+end module parent

demos/fortran/submodules/submain.f90

@@ -0,0 +1,18 @@
+program submain
+  use parent
+
+  implicit none
+
+  type(parent_type) :: a,b
+  real :: dist, weight
+
+  call init(a, 1.0, 2.0)
+  call init(b, 10.0, 12.0)
+
+  call harmonize(a)
+  weight = parent_weight(b)
+  write(*,*) weight
+  dist = parent_distance(a, b)
+  write(*,*) dist
+
+end program submain

demos/fortran/submodules/wscript

@@ -0,0 +1,26 @@
+#! /usr/bin/env python
+
+top = '.'
+out = 'build'
+
+def options(opt):
+	opt.load('compiler_c')
+	opt.load('compiler_fc')
+
+def configure(conf):
+	conf.load('compiler_c')
+	conf.load('compiler_fc')
+
+def build(bld):
+
+	bld(
+		features = 'fc fcshlib',
+		source = 'parent.f90 container.f90 helper.f90',
+		target = 'fudge',
+	)
+	bld(
+		features = 'fc fcprogram',
+		source = 'submain.f90',
+		use = 'fudge',
+		target = 'submain',
+	)

demos/fortran/wscript

@@ -78,3 +78,5 @@ def build(bld):
 		target = 'mod/two_mods')
 
 	bld.recurse('typemap')
+	if bld.env.FC_NAME == 'GFORTRAN' and int(bld.env.FC_VERSION[0]) >= 6:
+		bld.recurse('submodules')

demos/java/bengala/src/org/example/Bengala.java

@@ -0,0 +1,14 @@
+
+package org.example;
+
+//import org.example.Animal;
+import org.example.Cat;
+
+class Bengala extends Cat {
+
+    public String sound() {
+            return "Bengala Meow!";
+    }
+
+}
+

demos/java/bengala/wscript

@@ -0,0 +1,12 @@
+#! /usr/bin/env python
+
+def build(bld):
+
+	bld(features  = 'javac',
+		srcdir      = 'src',
+		compat      = '1.7',
+		use         = 'cats-src',
+		name        = 'bengala-cat',
+		recurse_use = True,
+	)
+

demos/java/cats/src/org/example/Cat.java

@@ -6,9 +6,10 @@ import org.example.Animal;
 class Cat extends Animal {
 
     public String sound() {
+            // Use base class just to be able to trigger possible rebuilds based on base class change
+            String base = super.sound();
             return "Meow!";
     }
-           
 
 }
 

demos/java/wscript

@@ -39,7 +39,7 @@ def build(bld):
 		compat     = '1.6', # java compatibility version number
 		sourcepath = ['src', 'sup'],
 		classpath  = ['.', '..'],
-		#jaropts = '-C default/src/ .', # can be used to give files
+		#jaropts = ['-C', 'default/src/', '.'], # can be used to give files
 		basedir    = 'src', # folder containing the classes and other files to package (must match outdir)
 		destfile   = 'foo.jar', # do not put the destfile in the folder of the java classes!
 		use        = 'NNN',
@@ -49,5 +49,5 @@ def build(bld):
 		javadoc_output	= 'javadoc',
 	)
 
-	bld.recurse('animals cats')
+	bld.recurse('animals cats bengala')
 

demos/mac_app/sources/main.m

@@ -1,6 +1,7 @@
 // waf sample Mac application - main.m
 // Chris Pickel, 2011
 
+#import <Foundation/Foundation.h>
 #import <Cocoa/Cocoa.h>
 
 int main(int argc, const char* argv[]) {

demos/mac_app/wscript

@@ -21,7 +21,7 @@ def configure(conf):
 	if not conf.env.ARCH_ST:
 		conf.fatal('This example is for macs only')
 	conf.env.FRAMEWORK_COCOA = 'Cocoa'
-	conf.env.ARCH_COCOA = ['i386', 'x86_64']
+	conf.env.ARCH_COCOA = ['x86_64', 'arm64']
 
 def build(bld):
 	bld.program(

demos/python/nested_scripts/bar/nested_bar.py

@@ -0,0 +1,3 @@
+"""
+Nested file in bar/
+"""

demos/python/nested_scripts/foo/nested_foo.py

@@ -0,0 +1,3 @@
+"""
+Nested file in foo/
+"""

demos/python/wscript

@@ -50,3 +50,19 @@ def build(bld):
 		source   = 'test.c',
 		target   = 'test')
 
+	# Install files keeping their directory structure (default: relative_trick=True)
+	#
+	# This will create:
+	#   * lib/python2.7/site-packages/nested_scripts/foo/nested_foo.py
+	bld(features='py',
+		source=bld.path.ant_glob('nested_scripts/foo/*.py'),
+		install_from='.')
+
+	# Install files flatting the directory structure (relative_trick=False)
+	#
+	# This will create:
+	#   * lib/python2.7/site-packages/nested_bar.py
+	bld(features='py',
+		source=bld.path.ant_glob('nested_scripts/bar/*.py'),
+		relative_trick=False,
+		install_from='.')

demos/qt5/foo.cpp

@@ -3,7 +3,24 @@
 #include "foo.h"
 
 Foo::Foo() : QWidget(NULL) {
+	m_button = new QPushButton("Foo Button", this);
+	m_button->setGeometry(QRect(QPoint(50, 60),
+	QSize(120, 50)));
+	connect(m_button, SIGNAL (released()), this, SLOT (handleButton()));
+	myToggle = true;
+}
 
+void Foo::handleButton() {
+	if (myToggle) {
+		m_button->setText("Button Foo");
+	} else {
+		m_button->setText("Foo Button");
+	}
+	myToggle = !myToggle;
+}
+
+int Foo::FortyTwo() {
+	return 42;
 }
 
 class Bar_private : public QWidget {

demos/qt5/foo.h

@@ -4,13 +4,20 @@
 #define _FOO
 
 #include <QWidget>
+#include <QPushButton>
 
 class Foo : public QWidget {
 	Q_OBJECT
 	signals:
 		void test();
+	private slots:
+		void handleButton();
 	public:
 		Foo();
+		int FortyTwo();
+		QPushButton *m_button;
+	public:
+		bool myToggle;
 };
 
 #endif

demos/qt5/main.cpp

@@ -4,12 +4,13 @@
 //#include <QString>
 //#include "mainwindow.h"
 #include "ui_but.h"
+#include "foo.h"
 
 int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(res);
     QApplication app(argc, argv);
-    QWidget window;
+    Foo window;
     Ui::Form ui;
     ui.setupUi(&window);
     window.show();

demos/qt5/testqt5.cpp

@@ -0,0 +1,31 @@
+// Example of Qt5 Unit test with QtTest library
+// Federico Pellegrin, 2019 (fedepell)
+
+#include "foo.h"
+#include <QtTest/QtTest>
+
+class TestQt5Test: public QObject {
+	Q_OBJECT
+	private:
+		Foo myFoo;
+	private slots:
+		void testGui();
+		void testFunc();
+};
+
+// Test of the UI by simulating a button click and button label reading
+void TestQt5Test::testGui() {
+	QCOMPARE(myFoo.m_button->text(), QString("Foo Button"));
+	QTest::mouseClick(myFoo.m_button, Qt::LeftButton,Qt::NoModifier, QPoint(5,5), 0);
+	QCOMPARE(myFoo.m_button->text(), QString("Button Foo"));
+}
+
+// Test of a normal function
+void TestQt5Test::testFunc() {
+	QCOMPARE(myFoo.FortyTwo(), 44); // this fails! 42 != 44
+}
+
+QTEST_MAIN(TestQt5Test)
+
+#include "testqt5.moc"
+

demos/qt5/wscript

@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 # encoding: utf-8
 # Thomas Nagy, 2016 (ita)
+# Federico Pellegrin, 2019 (fedepell)
 
 VERSION='0.0.1'
 APPNAME='qt5_test'
@@ -9,12 +10,41 @@ top = '.'
 out = 'build'
 
 def options(opt):
-	opt.load('compiler_cxx qt5')
+	opt.load('compiler_cxx qt5 waf_unit_test')
 
 def configure(conf):
-	conf.load('compiler_cxx qt5')
+	conf.load('compiler_cxx qt5 waf_unit_test')
 	#conf.env.append_value('CXXFLAGS', ['-g']) # test
 
+	if not conf.env.QT_LRELEASE:
+		# While qt5 detects most Qt tools, most of them are optional
+		conf.fatal('lrelease was not found')
+
+	# These tests would run on Ubuntu but not on other platforms
+	conf.check(
+		define_name  = 'XYZ_QT5_TESTS',
+		mandatory    = False,
+		execute      = True,
+		features     = 'qt5 cxx cxxprogram',
+		includes     = '.',
+		defines      = 'QT_WIDGETS_LIB',
+		use          = 'QT5CORE QT5GUI QT5WIDGETS QT5TEST',
+		msg          = 'Checking whether Qt5 tests can run',
+		fragment     = '''
+#include <QtTest/QtTest>
+class TestQt5Test: public QObject {
+        Q_OBJECT
+        private:
+                void testGui() {
+			QWidget *widget = NULL;
+			QTest::mouseClick(widget, Qt::LeftButton, Qt::NoModifier, QPoint(5,5), 0);
+		}
+};
+
+QTEST_MAIN(TestQt5Test)
+#include "test.moc"
+''')
+
 def build(bld):
 	# According to the Qt5 documentation:
 	#   Qt classes in foo.h   -> declare foo.h as a header to be processed by moc
@@ -32,3 +62,27 @@ def build(bld):
 		langname = 'somefile', # include the .qm files from somefile.qrc
 	)
 
+	if bld.env.XYZ_QT5_TESTS:
+		# Example of integration of Qt5 Unit tests using Qt5Test using waf_unit_test
+		bld(
+			features = 'qt5 cxx cxxprogram test',
+			use      = 'QT5CORE QT5GUI QT5WIDGETS QT5TEST',
+			defines  = 'QT_WIDGETS_LIB',
+			source   = 'foo.cpp testqt5.cpp',
+			moc      = 'foo.h',
+			target   = 'footest',
+			includes = '.',
+			# ut_str   = './${SRC} -o test-report.xml,xunitxml', # put output to a xunit xml
+		)
+
+		bld.add_post_fun(print_test_results)	# print output of test runner to user
+
+
+def print_test_results(bld):
+	lst = getattr(bld, 'utest_results', [])
+	if not lst:
+		return
+	for result in lst:
+		print(result.out.decode('utf-8'))
+		print(result.err.decode('utf-8'))
+

demos/tex/src/document-glossaries.ltx

@@ -10,7 +10,8 @@
 \maketitle
 \tableofcontents
 
-\glossarystyle{altlist}
+% next line is broken after using a newer texlive version
+%\glossarystyle{altlist}
 
 %% The glossary entries
 \newglossaryentry{african}

demos/tex/src/wscript

@@ -17,7 +17,7 @@ def build(bld):
 
 	# optional parameters
 	obj.outs   = 'ps' # we want a postscript output too - 'ps pdf' works too
-	obj.prompt = 1 # put 0 for the batchmode (conceals the debug output)
+	obj.prompt = 1 # put 0 for the nonstopmode (conceals the debug output)
 	obj.deps   = 'wscript crossreferencing.ltx' # use this to give dependencies directly
 
 	# or more simply, for a pdf..

demos/unit_test/tests/test0/wscript_build

@@ -7,6 +7,7 @@ bld(
 	source   = 'HelloWorldTest.cpp',
 	target   = 'unit_test_program',
 	use      = 'unittestmain useless CPPUNIT',
-	ut_str   = '${SRC[0].abspath()} -flag1 ${NARG}'
+	ut_str   = '${SRC[0].abspath()} -flag1 ${NARG}',
+	name     = 'test0',
 )
 

demos/unit_test/tests/test1/wscript_build

@@ -7,5 +7,6 @@ bld(
 	target   = 'unit_test_program',
 	use      = 'unittestmain useless CPPUNIT',
 	ut_cwd   = bld.path,
+	name     = 'test1',
 )
 

demos/unit_test/tests/test2/wscript_build

@@ -5,7 +5,8 @@ if bld.env['PYTHON']:
 	bld(
 			features             = 'test_scripts',
 			test_scripts_source  = 'test.py',
-			test_scripts_template = '${PYTHON} ${SCRIPT}'
+			test_scripts_template = '${PYTHON} ${SCRIPT}',
+			name                 = 'test2',
 	)
 
 

demos/unit_test/tests/test3/wscript_build

@@ -23,7 +23,8 @@ if bld.env['PYTHON']:
 			features              = 'test_scripts',
 			test_scripts_source   = 'test.1.py test.2.py',
 			test_scripts_template = '${PYTHON} ${SCRIPT}',
-			test_scripts_paths    = paths
+			test_scripts_paths    = paths,
+			name                  = 'test3',
 	)
 
 

demos/unit_test/wscript

@@ -40,12 +40,16 @@ def summary(bld):
 		Logs.pprint('CYAN', 'test report %3.0f%% success' % val)
 
 		Logs.pprint('CYAN', '  tests that fail %d/%d' % (tfail, total))
-		for (f, code, out, err) in lst:
-			if code:
-				Logs.pprint('CYAN', '    %s' % f)
-				Logs.pprint('RED', 'status: %r' % code)
-				if out: Logs.pprint('RED', 'out: %r' % out)
-				if err: Logs.pprint('RED', 'err: %r' % err)
+		for result in lst:
+			if result.exit_code:
+				# In ut_task we have the task running the test and we can get any extra information
+				# from there (in this example just the generator name)
+				Logs.pprint('CYAN', '    %s (%s)' % (result.test_path, result.generator.name))
+				Logs.pprint('RED', 'status: %r' % result.exit_code)
+				if result.out:
+					Logs.pprint('RED', 'out: %r' % result.out)
+				if result.err:
+					Logs.pprint('RED', 'err: %r' % result.err)
 
 def build(bld):
 	bld.recurse('src tests')
@@ -57,7 +61,7 @@ def build(bld):
 
 	# to execute all tests:
 	# $ waf --alltests
-	# to set this behaviour permanenly:
+	# to set this behaviour permanently:
 	#bld.options.all_tests = True
 	bld.options.clear_failed_tests = True
 

demos/wscript

@@ -1,149 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-# J. Carretero, 2010 (zougloub)
-# Thomas Nagy, 2010 (ita)
-
-"""
-https://launchpad.net/subunit/
-"""
-
-
-
-import sys, os
-
-if "uname" in dir(os): machine = os.uname()[1]
-elif sys.platform == "win32": machine = os.environ["COMPUTERNAME"]
-else: raise Exception("Unknown platform, cannot get machine name")
-
-from waflib import Logs, Errors
-
-# python 2.3 tends to hang for whatever reason :-/
-PYTHONS = "2.5 2.6 2.7 3.0 3.1 3.2 3.3 3.4 3.5".split()
-
-DIRS = ['c', 'python']
-if os.environ.get('BUILDFARM'):
-	DIRS = [x for x in os.listdir('.') if os.path.isdir(x) and x not in ('variants', 'build', 'mac_app', 'precious') and x.find('waf-') < 0]
-
-def options(opt):
-	for d in opt.path.ant_glob(DIRS, excl=['build', 'variants'], src=False, dir=True):
-		if d.name[0] == '.' or d.name == 'variants' or d.name == 'build':
-			continue
-
-		try:
-			opt.recurse(d.name)
-		except Exception:
-			pass
-	# one sub-project uses autoconfig, but i do not want it here
-	from waflib import Configure
-	Configure.autoconfig = False
-
-def configure(conf):
-
-	#Logs.info('Running action configure') # build farm
-	try:
-		sub = conf.find_file('subprocess.py', ['/usr/lib64/python', '/usr/lib/python', '/usr/local/lib64/python', '/usr/local/lib/python'])
-	except:
-		sub = ''
-
-	curwaf = os.path.abspath(sys.argv[0])
-	conf.exec_command('%s %s configure build --zip-type=gz --tools=doxygen,fluid,ocaml,swig,compiler_fc,fc_config,fc,fc_scan,g95,ifort,gfortran,batched_cc,%s --prelude='' && /bin/cp waf demos/' % (sys.executable, curwaf, sub),
-		cwd=conf.path.parent.abspath())
-
-	node = conf.path.find_resource('waf')
-	if not node:
-		conf.fatal('Could not find Waf')
-	#if conf.exec_command([node.abspath(), '--help'], shell=False, env={}, cwd=node.parent.abspath()):
-	#	conf.fatal('the waf file cannot be executed')
-	conf.env.WAF = node.abspath()
-
-	conf.in_msg += 1
-	for d in conf.path.ant_glob(DIRS, excl=['build', 'variants', 'precious'], src=False, dir=True):
-		if d.name[0] == '.':
-			continue
-		conf.env.stash()
-		try:
-			conf.recurse(d.name)
-		except Exception:
-			conf.env.revert()
-			node = conf.path.find_node('%s/build/config.log' % d.name)
-			if node:
-				Logs.info('-- BEGIN %s config.log --\n%s-- END %s config.log --', d.name, node.read(), d.name)
-			try:
-				e = sys.exc_info()[1]
-				print(e)
-				print(e.stdout, e.stderr)
-			except Exception:
-				pass
-		else:
-			conf.env.revert()
-			conf.env.append_value('CFG', [d.name])
-
-	print("The configurations enabled are %r" % conf.env.CFG)
-
-	# now remove the cache folders and re-create them
-	#conf.cmd_and_log('rm -rf .waf*')
-	for x in PYTHONS:
-		try:
-			conf.find_program('python'+x, var=x)
-			# unpacking the waf directory concurrently can lead to a race condition, we'll need to take care of this (thanks, build farm!)
-			conf.cmd_and_log(conf.env[x] + ['./waf', '--version'], env={})
-		except Errors.WafError as e:
-			pass
-		else:
-			conf.env.append_value('PYTHONS', x)
-
-	Logs.info('executing the build for folders %r and with pythons %r', conf.env.CFG, conf.env.PYTHONS)
-	Logs.info("contents of config.log:")
-	Logs.info(conf.path.find_node('build/config.log').read())
-
-def build(bld):
-	print('Note: call "waf installcheck" (the default build does not do anything)')
-
-from waflib.Build import BuildContext
-class abc(BuildContext):
-	cmd = "installcheck"
-	fun = "installcheck"
-
-def installcheck(bld):
-	bld.jobs = 1
-	#if bld.cmd == 'build':
-	#	Logs.info('Running action build') # build farm
-
-	#print('testsuite: waflib')
-	def waf_cmd(self):
-		cmd = self.env[self.generator.python] + [self.env.WAF, 'distclean', 'configure', 'build', 'clean', 'build', '-o', 'build' + self.generator.python]
-		cwd = self.generator.cwd
-		env = dict(os.environ)
-		env['WAFDIR'] = ''
-		env['WAFLOCK'] = '.lock-wscript' + self.generator.python # use a different build directory for each build
-		try:
-			bld.cmd_and_log(cmd, cwd=cwd, env=env, quiet=0, )
-		except Errors.WafError as e:
-			e = sys.exc_info()[1]
-			s = "testsuite: %s\ntestsuite-xfail: %s [ %s \n %s ]\n" % (self.generator.name, self.generator.name, e.stderr, e.stdout)
-			Logs.info(s)
-		else:
-			s = "testsuite: %s\ntestsuite-success: %s\n" % (self.generator.name, self.generator.name)
-			Logs.info(s)
-
-	for x in bld.env.PYTHONS:
-		for dirname in bld.env.CFG:
-			bld(rule    = waf_cmd,
-				cwd     = dirname,
-				always  = 1,
-				python  = x,
-				name    = '%s_%s' % (dirname, x))
-
-	#if bld.cmd == 'build':
-	#	Logs.info('BUILD STATUS: 0\nACTION PASSED: build') # build farm
-	#	Logs.info('Running action test') # build farm
-	#Logs.info('testsuite: abc')
-	#def end(bld):
-	#	Logs.info('testsuite-success: abc')
-	#		Logs.info('TEST STATUS: 0\nACTION FAILED: test')
-	#bld.add_post_fun(end)
-	#elif bld.cmd == 'install':
-	#	Logs.info('Running action install') # build farm
-	#	Logs.info('INSTALL STATUS: 0\nACTION PASSED: install') # build farm
-
-

docs/sphinx/Build.rst

@@ -2,4 +2,5 @@ Build
 -----
 
 .. automodule:: waflib.Build
+   :members:
 

docs/sphinx/ConfigSet.rst

@@ -2,4 +2,5 @@ ConfigSet
 ---------
 
 .. automodule:: waflib.ConfigSet
+   :members:
 

docs/sphinx/Configure.rst

@@ -2,4 +2,5 @@ Configure
 ---------
 
 .. automodule:: waflib.Configure
+   :members:
 

docs/sphinx/Context.rst

@@ -2,4 +2,5 @@ Context
 ---------
 
 .. automodule:: waflib.Context
+   :members:
 

docs/sphinx/Errors.rst

@@ -2,4 +2,5 @@ Errors
 ------
 
 .. automodule:: waflib.Errors
+   :members:
 

docs/sphinx/Logs.rst

@@ -2,4 +2,5 @@ Logs
 ----
 
 .. automodule:: waflib.Logs
+   :members:
 

docs/sphinx/Node.rst

@@ -2,4 +2,5 @@ Node
 ----
 
 .. automodule:: waflib.Node
+   :members:
 

docs/sphinx/Options.rst

@@ -2,4 +2,5 @@ Options
 -------
 
 .. automodule:: waflib.Options
+   :members:
 

docs/sphinx/Runner.rst

@@ -2,4 +2,5 @@ Runner
 ------
 
 .. automodule:: waflib.Runner
+   :members:
 

docs/sphinx/Scripting.rst

@@ -2,4 +2,5 @@ Scripting
 ---------
 
 .. automodule:: waflib.Scripting
+   :members:
 

docs/sphinx/Task.rst

@@ -2,4 +2,5 @@ Task
 ----
 
 .. automodule:: waflib.Task
+   :members:
 

docs/sphinx/TaskGen.rst

@@ -2,4 +2,5 @@ TaskGen
 -------
 
 .. automodule:: waflib.TaskGen
+   :members:
 

docs/sphinx/Utils.rst

@@ -2,4 +2,5 @@ Utils
 -----
 
 .. automodule:: waflib.Utils
+   :members:
 

docs/sphinx/_templates/indexcontent.html

@@ -49,7 +49,7 @@
       <p class="biglink"><a class="biglink" href="{{ pathto("copyright") }}">Copyright</a><br/>
          <span class="linkdescr">Copyright notice</span></p>
 
-      <p class="biglink"><a class="biglink" href="https://github.com/waf-project/waf/issues">Reporting bugs</a><br/>
+      <p class="biglink"><a class="biglink" href="https://gitlab.com/ita1024/waf/issues">Reporting bugs</a><br/>
          <span class="linkdescr">Where to report bugs or request new features</span></p>
 
     </td>

docs/sphinx/about.rst

@@ -3,9 +3,5 @@
 About this documentation
 ------------------------
 
-These documents are generated from `reStructuredText`_ sources by `Sphinx`_, a
-document processor specifically written for the Python documentation.
-
-.. _reStructuredText: http://docutils.sf.net/rst.html
-.. _Sphinx: http://sphinx.pocoo.org/
+This is the automatically generated documentation for the Waf project.
 

docs/sphinx/conf.py

@@ -21,6 +21,14 @@ sys.path.append(os.path.abspath('.'))
 
 graphviz_output_format = 'svg'
 
+html_theme_options = {
+	"body_min_width": "none",
+	"body_max_width": "none",
+}
+
+
+inheritance_graph_attrs = dict(rankdir="LR", size='""', fontsize=14, ratio='compress')
+
 # monkey patch a few waf classes for documentation purposes!
 #-----------------------------------------------------------
 
@@ -170,8 +178,9 @@ Configure.ConfigurationContext.__doc__ = """
 			ctx.myhelper()
 """
 
-
-
+from waflib.Tools import asm
+del asm.__dict__['link_task']
+del asm.__dict__['stlink_task']
 
 # Import all tools and build tool->feature map
 tool_to_features = {}
@@ -207,7 +216,7 @@ for x in lst:
 				tool_to_features[x].append(feat)
 
 	txt = ""
-	txt += "%s\n%s\n\n.. automodule:: waflib.Tools.%s\n\n" % (x, "="*len(x), x)
+	txt += "%s\n%s\n\n.. automodule:: waflib.Tools.%s\n  :members:\n\n" % (x, "="*len(x), x)
 	if x in tool_to_features:
 		txt += "Features defined in this module:"
 		for feat in sorted(list(set(tool_to_features[x]))):
@@ -258,7 +267,8 @@ for z in lst:
 	for x, y in links:
 		ms.append('\t\t"%s" -> "%s" [arrowsize=0.5,style="setlinewidth(0.5)"];' % (x, y))
 
-	rs = '\tdigraph feature_%s {\n\t\tsize="8.0, 12.0";\n%s\n\t}\n' % (z == '*' and 'all' or z, '\n'.join(ms))
+	#rs = '\tdigraph feature_%s {\n\t\tsize="8.0, 12.0";\n%s\n\t}\n' % (z == '*' and 'all' or z, '\n'.join(ms))
+	rs = '\tdigraph feature_%s {\n\t\t\n%s\n\t}\n' % (z == '*' and 'all' or z, '\n'.join(ms))
 	title = "Feature %s" % (z == '*' and '\\*' or z)
 	title += "\n" + len(title) * '='
 
@@ -347,7 +357,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Waf'
-copyright = u'2005-2018, Thomas Nagy'
+copyright = u'2005-2023 waf.io'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -495,7 +505,7 @@ latex_elements = {
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'waf.tex', u'waf Documentation',
-   u'Thomas Nagy', 'manual'),
+   u'waf.io', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -528,7 +538,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'waf', u'waf Documentation',
-     [u'Thomas Nagy'], 1)
+     [u'waf.io'], 1)
 ]
 
 #autodoc_default_flags = ['members', 'no-undoc-members', 'show-inheritance']

docs/sphinx/tools.rst

@@ -132,7 +132,7 @@ The next tools provide support for code generators used in C and C++ projects.
 Other compilers and tools
 -------------------------
 
-.. _extras: https://github.com/waf-project/waf/tree/master/waflib/extras
+.. _extras: https://gitlab.com/ita1024/waf/tree/master/waflib/extras
 
 The following tools provide support for specific compilers or configurations. More tools are present in the extras_ folder, although they are not documented and as stable as the default tools.
 

docs/sphinx/tutorial.rst

@@ -24,7 +24,7 @@ In general, a project will consist of several phases:
 Each phase is modelled in the wscript file as a python function which takes as argument an instance of :py:class:`waflib.Context.Context`.
 Let's start with a new wscript file in the directory '/tmp/myproject'::
 
-	def configure(conf):
+	def configure(cnf):
 		print("configure!")
 
 	def build(bld):
@@ -62,7 +62,7 @@ by using the *${}* symbol, which reads the values from the attribute bld.env::
 		bld(rule='echo ${MESSAGE}', always=True)
 
 The bld object is an instance of :py:class:`waflib.Build.BuildContext`, its *env* attribute is an instance :py:class:`waflib.ConfigSet.ConfigSet`.
-The values are set in this object to be shared/stored/loaded easily. Here is how to do the same thing by sharing data between the configuration and build::
+This object is also accessible as an attribute on the `configure()` method's `cnf` parameter. Therefore, values can be shared/stored/loaded easily:
 
 	def configure(cnf):
 		cnf.env.MESSAGE = 'Hello, world!'
@@ -111,9 +111,9 @@ Here is a script for a more complicated project::
 The method :py:func:`waflib.Tools.c_config.check` executes a build internally to check if the library ``libm`` is present on the operating system.
 It will then define variables such as:
 
-* ``conf.env.LIB_M = ['m']``
-* ``conf.env.CFLAGS_M = ['-Wall']``
-* ``conf.env.DEFINES_M = ['var=foo']``
+* ``cnf.env.LIB_M = ['m']``
+* ``cnf.env.CFLAGS_M = ['-Wall']``
+* ``cnf.env.DEFINES_M = ['var=foo']``
 
 By stating ``use=['M', 'mylib']``, the program *app* is going to inherit all the *M* variables defined
 during the configuration. The program will also use the library *mylib* and both the build order and the dependencies
@@ -165,7 +165,7 @@ The declaration can be made more user-friendly by binding new methods to the con
 		bld.enterprise_program(source='main.c', target='app')
 
 The support code may be turned into a Waf tool by moving it to a separate file.
-To ease the deployment, the new Waf tool can even be added to the waf file (see https://github.com/waf-project/waf/blob/master/README#L10).
+To ease the deployment, the new Waf tool can even be added to the waf file (see https://gitlab.com/ita1024/waf/blob/master/README.md#L20).
 
 Conclusion
 ----------

playground/boo/hello.boo

@@ -1 +0,0 @@
-World.SayHello()

playground/boo/world.boo

@@ -1,3 +0,0 @@
-class World:
-	static def SayHello():
-		print "hello from boo"

playground/boo/world.cs

@@ -1,6 +0,0 @@
-public class World {
-	public static void SayHello()
-	{
-		System.Console.WriteLine("Hello from C#");
-	}
-}

playground/boo/wscript

@@ -1,49 +0,0 @@
-#! /usr/bin/env python
-
-##
-# This wscript shows the power of the CLI!
-# You have an hello.exe using a world.dll,
-# the world.dll can be generating using
-# world.cs (in C#) or world.boo.
-
-top = '.'
-out = 'build'
-
-def options(opt):
-	opt.load('cs')
-	opt.add_option("--use-cs", dest="use_cs", action="store_true",
-		help="use world.cs to generate world.dll")
-
-def configure(conf):
-	conf.env.USE_CS = conf.options.use_cs
-	if conf.env.USE_CS:
-		conf.load('cs')
-	conf.load('boo')
-
-def build(bld):
-	if bld.env.USE_CS:
-		# C# world library
-		bld(features = "cs",
-			source   = "world.cs",
-			type     = "library",
-			gen      = "world.dll",
-			name     = "world"
-		)
-
-	else:
-		# boo world library
-		bld(features = "boo",
-			source   = "world.boo",
-			type     = "library",
-			gen      = "world.dll",
-			name     = "world"
-		)
-
-	# executable that uses the world library
-	bld(features = "boo",
-		source   = "hello.boo",
-		type     = "exe",
-		gen      = "hello.exe",
-		use      = "world"
-	)
-

playground/clang_cl/ReadMe.md

@@ -0,0 +1,27 @@
+# Clang-CL
+
+Clang-CL is a drop-in MSVC compatible driver replacing CL.exe  
+The clang compiler offers high compatibility with MSVC, but also offers more up to date C++ support.  
+It features better code generation, but still adheres to the MSVC ABI, letting you link with link.exe, offering you superior performance but also PDB debug info.
+
+On Windows this waf module should just work, on Linux it tries to find the LLVM replacements and requires an environment containing the paths defined by the vsvars batch files (Visual Studio C++ Developer command prompt).
+
+# Cross compilation
+
+To cross compile for Windows from Linux, you will require the following:
+
+* A partition with Windows installed (NTFS).
+* Visual Studio (Tested with 2017).
+* The Windows SDK.
+* lowntfs-3g file system driver.
+
+Make sure the Windows partition is mounted with `-t lowntfs-3g -o defaults,ignore_case,windows_names`.  
+This will allow Clang to find all headers and libraries referenced by scripts and headers, otherwise you will run into case sensitivity errors.  
+You can run a script to make all filenames lowercase, but that edits your Visual Studio installation, and I don't know if that has an effect on upgradability.
+
+Clang uses the following environment variables to detect the Visual Studio install: `VCINSTALLDIR`, `VCToolsInstallDir`, `INCLUDE`, `LIB`, `LIBPATH`  
+I just copied these from the output of the `set` command in an MSVC command prompt on Windows and translated the paths to Linux paths.  
+Notice how the semicolon is still used as a path separator.  
+See `example_environment_linux.sh` for how my setup looks like. It expects the Windows partition to be mounted on `/mnt/windows`, with VS2017 installed and Windows 10 SDK 10.0.17763.0.
+
+To specify a custom LLVM installation, you can put the path in the `LLVM_PATH` environment variable, or put the path in `cfg.env.LLVM_PATH` in your wscript.

playground/clang_cl/example_environment_linux.sh

@@ -0,0 +1,5 @@
+export VCINSTALLDIR="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/"
+export VCToolsInstallDir="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/"
+export INCLUDE="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/atlmfc/include;/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/include;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/ucrt;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/shared;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/um;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/winrt;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/cppwinrt"
+export LIB="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/atlmfc/lib/x64;/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/lib/x64;/mnt/windows/program files (x86)/windows kits/10/lib/10.0.17763.0/ucrt/x64;/mnt/windows/program files (x86)/windows kits/10/lib/10.0.17763.0/um/x64"
+export LIBPATH="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/atlmfc/lib/x64;/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/lib/x64;/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/lib/x86/store/references;/mnt/windows/program files (x86)/windows kits/10/unionmetadata/10.0.17763.0;/mnt/windows/program files (x86)/windows kits/10/references/10.0.17763.0"

playground/clang_cl/test.c

@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+int main(int argc, char** argv)
+{
+	(void)argc;
+	(void)argv;
+
+	puts("This is a simple test program.\n");
+
+	return 0;
+}

playground/clang_cl/wscript

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# encoding: utf-8
+# vim: ts=4 sw=4 noexpandtab
+
+top = '.'
+out = 'build'
+
+def options(opt):
+	opt.load('clang_cl')
+
+def configure(cfg):
+	cfg.load('clang_cl')
+	cfg.env.append_value('CFLAGS','/Zi')
+	cfg.env.append_value('LDFLAGS','/DEBUG')
+
+def build(bld):
+	bld.program(
+		name='test',
+		source=['test.c'],
+		target='test',
+		use='CRT_MULTITHREADED_DLL')

playground/clang_compilation_database/wscript

@@ -0,0 +1,68 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# Alibek Omarov, 2019 (a1batross)
+
+import os
+from waflib import ConfigSet, Logs
+
+VERSION='0.0.1'
+APPNAME='clang_compilation_database_test'
+
+top = '.'
+out = 'build'
+
+INCLUDES_TO_TEST = ['common'] # check if include flag appeared in result json
+DEFINES_TO_TEST = ['TEST'] # check if definition flag will appear in result json
+SOURCE_FILES_TO_TEST = ['a.c', 'b.cpp'] # check if source files are persist in database
+
+def actual_test(bld):
+	db = bld.bldnode.find_node('compile_commands.json').read_json()
+
+	for entry in db:
+		env = ConfigSet.ConfigSet()
+		line = ' '.join(entry['arguments'][1:]) # ignore compiler exe, unneeded
+		directory = entry['directory']
+		srcname = entry['file'].split(os.sep)[-1] # file name only
+
+		bld.parse_flags(line, 'test', env) # ignore unhandled flag, it's harmless for test
+
+		if bld.bldnode.abspath() in directory:
+			Logs.info('Directory test passed')
+		else:
+			Logs.error('Directory test failed')
+
+		if srcname in SOURCE_FILES_TO_TEST:
+			Logs.info('Source file test passed')
+		else:
+			Logs.error('Source file test failed')
+
+		passed = True
+		for inc in INCLUDES_TO_TEST:
+			if inc not in env.INCLUDES_test:
+				passed = False
+
+		if passed: Logs.info('Includes test passed')
+		else: Logs.error('Includes test failed')
+
+		passed = True
+		for define in DEFINES_TO_TEST:
+			if define not in env.DEFINES_test:
+				passed = False
+		if passed: Logs.info('Defines test passed')
+		else: Logs.error('Defines test failed')
+
+def options(opt):
+	# check by ./waf clangdb
+	opt.load('compiler_c compiler_cxx clang_compilation_database')
+
+def configure(conf):
+	# check if database always generated before build
+	conf.load('compiler_c compiler_cxx clang_compilation_database')
+
+def build(bld):
+	bld.shlib(features = 'c cxx', source = SOURCE_FILES_TO_TEST,
+		defines = DEFINES_TO_TEST,
+		includes = INCLUDES_TO_TEST,
+		target = 'test')
+
+	bld.add_post_fun(actual_test)

playground/clang_cross/msvc/ReadMe.txt

@@ -0,0 +1,14 @@
+To cross compile for Windows in MSVC mode from Linux, you will require the following:
+* A partition with Windows installed (NTFS).
+* Visual Studio (Tested with 2017).
+* The Windows SDK.
+* lowntfs-3g file system driver.
+
+Make sure the Windows partition is mounted with "-t lowntfs-3g -o defaults,ignore_case,windows_names".
+This will allow Clang to find all headers and libraries referenced by scripts and headers, otherwise you will run into case sensitivity errors.
+
+Clang uses the following environment variables to detect the Visual Studio install: VCINSTALLDIR, VCToolsInstallDir, INCLUDE, LIB, LIBPATH
+I just copied these from the output of the "set" command in an MSVC command prompt on Windows and translated the paths to Linux paths.
+Notice how the semicolon is still used as a path separator.
+See "example_environment_linux.sh" for how my setup looks like.
+It expects the Windows partition to be mounted on /mnt/windows, with VS2017 installed and Windows 10 SDK 10.0.17763.0.

playground/clang_cross/msvc/example_environment_linux.sh

@@ -0,0 +1,5 @@
+export VCINSTALLDIR="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/"
+export VCToolsInstallDir="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/"
+export INCLUDE="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/atlmfc/include;/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/include;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/ucrt;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/shared;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/um;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/winrt;/mnt/windows/program files (x86)/windows kits/10/include/10.0.17763.0/cppwinrt"
+export LIB="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/atlmfc/lib/x64;/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/lib/x64;/mnt/windows/program files (x86)/windows kits/10/lib/10.0.17763.0/ucrt/x64;/mnt/windows/program files (x86)/windows kits/10/lib/10.0.17763.0/um/x64"
+export LIBPATH="/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/atlmfc/lib/x64;/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/lib/x64;/mnt/windows/program files (x86)/microsoft visual studio/2017/community/vc/tools/msvc/14.16.27023/lib/x86/store/references;/mnt/windows/program files (x86)/windows kits/10/unionmetadata/10.0.17763.0;/mnt/windows/program files (x86)/windows kits/10/references/10.0.17763.0"

playground/clang_cross/msvc/hello.c

@@ -0,0 +1,11 @@
+#include <Windows.h>
+
+int main(int argc, char* argv[])
+{
+	(void)argc;
+	(void)argv;
+
+	WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), "Hello world!\n", 13, NULL, NULL);
+
+	return 0;
+}

playground/clang_cross/msvc/wscript

@@ -0,0 +1,32 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# DragoonX6 2019
+
+# the following two variables are used by the target "waf dist"
+VERSION='0.0.1'
+APPNAME='hello_msvc'
+
+top = '.'
+
+from waflib.Configure import conf, ConfigurationContext
+from waflib.Options import OptionsContext
+
+def options(opt):
+	opt.load('clang_cross')
+
+def configure(conf):
+	conf.load('clang_cross')
+
+	if not conf.env.implib_PATTERN == '%s.lib':
+		conf.fatal('''clang is not configured to compile in msvc mode.
+Use flag '--clang-target-triple=x86_64-windows-msvc' to configure.
+On Windows you're likely to require running from an MSVC command prompt.
+On Linux you will need to have access to a Windows partition with VS installed, and the environment set up properly.
+See the ReadMe for more information.''')
+
+	conf.env.append_value('CFLAGS', conf.env.CFLAGS_CRT_MULTITHREADED_DLL)
+
+def build(bld):
+	bld.program(
+		source = 'hello.c',
+		target = 'hello_msvc')

playground/compress/optim.py

@@ -43,20 +43,20 @@ def gen(lst, options):
 	LEN = len(lst)
 
 	POP = 3*LEN + 1
-	popul = [range(LEN) for x in xrange(POP)]
-	fitn = [0 for x in xrange(POP)]
+	popul = [range(LEN) for x in range(POP)]
+	fitn = [0 for x in range(POP)]
 
 	def rnd():
 		return random.randint(0, LEN -1)
 
 	def mutate():
-		for x in xrange(LEN):
+		for x in range(LEN):
 			# rotate the previous element by one
 			v = popul[x+LEN] = popul[x+LEN - 1]
 			a = v.pop(0)
 			v.append(a)
 
-		for x in xrange(LEN):
+		for x in range(LEN):
 			# swap elements
 			a = rnd()
 			b = rnd()
@@ -66,7 +66,7 @@ def gen(lst, options):
 			v[a] = v[b]
 			v[b] = c
 
-		for x in xrange(LEN):
+		for x in range(LEN):
 			# get one element out, add at the end
 			v = popul[x+2*LEN]
 
@@ -79,7 +79,7 @@ def gen(lst, options):
 
 		best = opti_ref
 		pos = -1
-		for x in xrange(len(popul)):
+		for x in range(len(popul)):
 			v = popul[x]
 			arr = [lst[a] for a in v]
 			tmp = '%s %s' % (cmd, ' '.join(arr))
@@ -99,14 +99,14 @@ def gen(lst, options):
 			assert (sum(popul[x]) == sum(range(LEN)))
 
 		#print pos
-		for x in xrange(len(popul)):
+		for x in range(len(popul)):
 			if x == pos:
 				continue
 			popul[x] = popul[pos][:]
 			assert(len(popul[x]) == LEN)
 		return best
 
-	for i in xrange(10000):
+	for i in range(10000):
 		mutate()
 		print(evil())
 

playground/compress/wscript

@@ -25,7 +25,7 @@ import random, bz2, os, threading
 lock = threading.Lock()
 
 def options(opt):
-	opt.add_option('--num', action='store', type='int', default=200, help='amount of compressed files to create')
+	opt.add_option('--num', action='store', type=int, default=200, help='amount of compressed files to create')
 
 # values for storing the min and max
 gzip  = [10000000, 0]

playground/cuda/cuda.py

@@ -4,14 +4,13 @@
 
 "cuda"
 
-import os
 from waflib import Task
 from waflib.TaskGen import extension
 from waflib.Tools import ccroot, c_preproc
 from waflib.Configure import conf
 
 class cuda(Task.Task):
-	run_str = '${NVCC} ${CUDAFLAGS} ${CXXFLAGS} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${CPPPATH_ST:INCPATHS} ${DEFINES_ST:DEFINES} ${CXX_SRC_F}${SRC} ${CXX_TGT_F} ${TGT}'
+	run_str = '${NVCC} ${CUDAFLAGS} ${NVCCFLAGS_ST:CXXFLAGS} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${CPPPATH_ST:INCPATHS} ${DEFINES_ST:DEFINES} ${CXX_SRC_F}${SRC} ${CXX_TGT_F} ${TGT}'
 	color   = 'GREEN'
 	ext_in  = ['.h']
 	vars    = ['CCDEPS']
@@ -22,9 +21,18 @@ class cuda(Task.Task):
 def c_hook(self, node):
 	return self.create_compiled_task('cuda', node)
 
+@extension('.cpp')
+def cxx_hook(self, node):
+	# override processing for one particular type of file
+	if getattr(self, 'cuda', False):
+		return self.create_compiled_task('cuda', node)
+	else:
+		return self.create_compiled_task('cxx', node)
+
 def configure(conf):
 	conf.find_program('nvcc', var='NVCC')
 	conf.find_cuda_libs()
+	conf.env.NVCCFLAGS_ST = "--compiler-options=%s"
 
 @conf
 def find_cuda_libs(self):
@@ -43,7 +51,7 @@ def find_cuda_libs(self):
 	_includes = node and node.abspath() or ''
 
 	_libpath = []
-	for x in ('lib64', 'lib'):
+	for x in ('lib64', 'lib64/stubs', 'lib', 'lib/stubs'):
 		try:
 			_libpath.append(d.find_node(x).abspath())
 		except:

playground/cuda/test.cpp

@@ -0,0 +1,5 @@
+int main()
+{
+	return 0;
+}
+

playground/cuda/wscript

@@ -18,8 +18,12 @@ def configure(conf):
 
 	conf.load('cuda', tooldir='.')
 
+	# Add a few flags to test proper passing to nvcc
+	conf.env.CXXFLAGS=['-fPIC', '--std=c++11']
+
 def build(bld):
 
+	# cuda application
 	t = bld.program(
 		source = 'test.cu main.cpp',
 		target = 'app',
@@ -29,3 +33,18 @@ def build(bld):
 	# --ptxas-options="-v"
 	# --ptxas-options="-v -maxrregcount=10"
 
+	# -----------------------
+
+	# native application
+	bld.program(
+		source = 'test.cpp',
+		target = 'testapp-native')
+
+	# cuda application
+	bld.program(
+		source = 'test.cpp',
+		target = 'testapp',
+		cuda   = True,
+		use    = 'CUDA CUDART')
+
+

playground/cython/c_lib/extra_dep.h.in

@@ -0,0 +1,2 @@
+
+#define bindir "@BINDIR@"

playground/cython/cython_cache/src/cy_cxxtest.h

@@ -1,3 +1,5 @@
+/* Generated by Cython 0.29 */
+
 #ifndef __PYX_HAVE__cy_cxxtest
 #define __PYX_HAVE__cy_cxxtest
 
@@ -12,10 +14,17 @@
   #endif
 #endif
 
-__PYX_EXTERN_C DL_IMPORT(void) cy_hello(void);
+#ifndef DL_IMPORT
+  #define DL_IMPORT(_T) _T
+#endif
+
+__PYX_EXTERN_C void cy_hello(void);
 
 #endif /* !__PYX_HAVE_API__cy_cxxtest */
 
+/* WARNING: the interface of the module init function changed in CPython 3.5. */
+/* It now returns a PyModuleDef instance instead of a PyModule instance. */
+
 #if PY_MAJOR_VERSION < 3
 PyMODINIT_FUNC initcy_cxxtest(void);
 #else

playground/cython/cython_cache/src/cy_cxxtest_api.h

@@ -1,31 +1,18 @@
+/* Generated by Cython 0.29 */
+
 #ifndef __PYX_HAVE_API__cy_cxxtest
 #define __PYX_HAVE_API__cy_cxxtest
 #include "Python.h"
 #include "cy_cxxtest.h"
 
-static void (*__pyx_f_10cy_cxxtest_cy_hello)(void) = 0;
-#define cy_hello __pyx_f_10cy_cxxtest_cy_hello
-
-#ifndef __PYX_HAVE_RT_ImportModule
-#define __PYX_HAVE_RT_ImportModule
-static PyObject *__Pyx_ImportModule(const char *name) {
-    PyObject *py_name = 0;
-    PyObject *py_module = 0;
-
-    #if PY_MAJOR_VERSION < 3
-    py_name = PyString_FromString(name);
-    #else
-    py_name = PyUnicode_FromString(name);
-    #endif
-    if (!py_name)
-        goto bad;
-    py_module = PyImport_Import(py_name);
-    Py_DECREF(py_name);
-    return py_module;
-bad:
-    Py_XDECREF(py_name);
-    return 0;
-}
+static void (*__pyx_api_f_10cy_cxxtest_cy_hello)(void) = 0;
+#define cy_hello __pyx_api_f_10cy_cxxtest_cy_hello
+#if !defined(__Pyx_PyIdentifier_FromString)
+#if PY_MAJOR_VERSION < 3
+  #define __Pyx_PyIdentifier_FromString(s) PyString_FromString(s)
+#else
+  #define __Pyx_PyIdentifier_FromString(s) PyUnicode_FromString(s)
+#endif
 #endif
 
 #ifndef __PYX_HAVE_RT_ImportFunction
@@ -37,21 +24,20 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**
         void (*fp)(void);
         void *p;
     } tmp;
-
     d = PyObject_GetAttrString(module, (char *)"__pyx_capi__");
     if (!d)
         goto bad;
     cobj = PyDict_GetItemString(d, funcname);
     if (!cobj) {
         PyErr_Format(PyExc_ImportError,
-            "%s does not export expected C function %s",
+            "%.200s does not export expected C function %.200s",
                 PyModule_GetName(module), funcname);
         goto bad;
     }
-#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0)
+#if PY_VERSION_HEX >= 0x02070000
     if (!PyCapsule_IsValid(cobj, sig)) {
         PyErr_Format(PyExc_TypeError,
-            "C function %s.%s has wrong signature (expected %s, got %s)",
+            "C function %.200s.%.200s has wrong signature (expected %.500s, got %.500s)",
              PyModule_GetName(module), funcname, sig, PyCapsule_GetName(cobj));
         goto bad;
     }
@@ -65,7 +51,7 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**
     while (*s1 != '\0' && *s1 == *s2) { s1++; s2++; }
     if (*s1 != *s2) {
         PyErr_Format(PyExc_TypeError,
-            "C function %s.%s has wrong signature (expected %s, got %s)",
+            "C function %.200s.%.200s has wrong signature (expected %.500s, got %.500s)",
              PyModule_GetName(module), funcname, sig, desc);
         goto bad;
     }
@@ -82,11 +68,12 @@ bad:
 }
 #endif
 
+
 static int import_cy_cxxtest(void) {
   PyObject *module = 0;
-  module = __Pyx_ImportModule("cy_cxxtest");
+  module = PyImport_ImportModule("cy_cxxtest");
   if (!module) goto bad;
-  if (__Pyx_ImportFunction(module, "cy_hello", (void (**)(void))&__pyx_f_10cy_cxxtest_cy_hello, "void (void)") < 0) goto bad;
+  if (__Pyx_ImportFunction(module, "cy_hello", (void (**)(void))&__pyx_api_f_10cy_cxxtest_cy_hello, "void (void)") < 0) goto bad;
   Py_DECREF(module); module = 0;
   return 0;
   bad:

playground/cython/src/cy_ctest.pyx

@@ -1,4 +1,7 @@
+from cpython.version cimport PY_VERSION
 cimport cy_ctest
+#cimport commented_import
 
 def pyhello():
     cy_ctest.hello()
+    print("Compiled with python version %s" % PY_VERSION)

playground/cython/src/cy_cxxtest.pyx

@@ -1,8 +1,9 @@
+from cpython.version cimport PY_VERSION
 cimport cy_cxxtest
 
 def pyhello():
     cy_cxxtest.hello()
+    print("Compiled with python version %s" % PY_VERSION)
 
 cdef public api void cy_hello():
     print("hello cython-world!")
-    

playground/cython/wscript

@@ -40,13 +40,13 @@ def build(ctx):
 		target   = 'cxx_lib',
 		includes = 'cxx_lib')
 
-	# first try to build a C-based cython extension
+	# build a C-based cython extension
 	ctx(
 		features = 'c cshlib pyext',
 		source   = 'src/cy_ctest.pyx',
 		target   = 'cy_ctest',
 		includes = 'c_lib',
-		use	  = 'c_lib')
+		use	 = 'c_lib')
 
 	# then a C++-based one
 	ctx(
@@ -54,7 +54,7 @@ def build(ctx):
 		source   = 'src/cy_cxxtest.pyx',
 		target   = 'cy_cxxtest',
 		includes = 'cxx_lib',
-		use	  = 'cxx_lib')
+		use	 = 'cxx_lib')
 
 	# a C++ application which uses a C function from a cython module
 	ctx(
@@ -62,5 +62,25 @@ def build(ctx):
 		source   = 'cxx_lib/app.cxx',
 		target   = 'cy-app',
 		includes = 'cxx_lib src',
-		use	  = 'cxx_lib'
-		)
+		use	 = 'cxx_lib')
+
+	# ---------------------------------------------------------------
+	# Testcase for #2244 below
+
+	ctx.get_tgen_by_name('cy_ctest').features += ' subst_header_order'
+
+	# a generated header for cy_ctest
+	ctx(
+		features = 'subst',
+		source   = 'c_lib/extra_dep.h.in',
+		target   = 'c_lib/extra_dep.h',
+	)
+
+	from waflib import TaskGen
+	@TaskGen.feature('subst_header_order')
+	@TaskGen.after('process_source')
+	def set_subst_before_cython_tasks(self):
+		tg = self.bld.get_tgen_by_name('c_lib/extra_dep.h')
+		tg.post()
+		for tsk in self.tasks:
+			tsk.run_after.add(tg.tasks[-1])

playground/display/main.c

@@ -1,3 +0,0 @@
-int main() {
-	return 0;
-}

playground/display/wscript

@@ -1,14 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-# Thomas Nagy, 2016 (ita)
-
-def options(opt):
-	opt.load('compiler_c')
-
-def configure(conf):
-	conf.load('compiler_c')
-
-def build(bld):
-	bld.load('print_commands')
-	bld.program(source='main.c', target='app')
-

playground/eclipse/c/exLibC/src/exLibC.cpp

@@ -1,9 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <iostream>
 
 #include <pkg1/exLibC/exLibC.hpp>
 
 int check_smaller(int value) {
+	const char* foo = u8"bar";	// u8 is C++17 only
+	std::cout << __cplusplus << std::endl; // Check version of C++ standard
+
 	if (value < HELLO_LIMIT) {
 		return 0;
 	} else {