Argparse updates

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

.gitignore

@@ -8,4 +8,40 @@ build
 demos/*/build*
 playground/*/build*
 .waf-*
+waf-*
+.waf3-*
+waf3-*
 *.log
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# 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,309 +1,34 @@
-NEW IN WAF 1.7.4
-----------------
-* Fixed a regression in the Node,Task and Context classes
+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 1.7.3
------------------
-* Fixed the LD_LIBRARY_PATH race condition in waf_unit_test #1200
-* Library detection fixes in boost.py #1199
-* Various waf_unit_test enhancements #1194
-* Use the same function signature main(int, char**) in all configuration tests #1192
-* Fixed the Clang version number detection #1191
-* Let the feature 'includes' propagate INCLUDES and FRAMEWORKPATH variables
-* Fix for incorrect installation paths #1202
-* Cabal script (haskell)
-
-NEW IN WAF 1.7.2
-----------------
-* Install bld.subst() targets
-* New scanner for winrc processing #1186
-
-NEW IN WAF 1.7.1
-----------------
-* Updated the exclusion regexps for "waf dist"
-* Added an example in playground/nasm
-* Enabled compatibility with pkgconf
-* Response files for c# #1182
-* Minor docstring updates #1188
-* New tool for compiling .net resource files (waflib/extras/resx.py) #1183
-* New tool for compiling .midl files (waflib/extras/midl.py) #1185
-
-NEW IN WAF 1.7.0
-----------------
-* The compat15 tool is disabled by default (the README file explains how to enable it)
-* Python >= 2.4 is now required
-* Python >= 2.6 is required for creating the Waf file in the source tree
-* Added Utils.writef (similar to Utils.readf)
-* Added Node.evict() to provide more control over invalid references
-* Do not raise exception on --help when running on python 2.4
-* Node.search -> Node.search_node (consistent with make_node and find_node)
-* Errors are reported on configuration test failures with execute=True #1111
-* Added header prefixing (autoconf-like) #1117
-* Removed the warnings on "waf install" #1120
-* Extended bld.subst() to perform simple copies to the build directory
-* Removed the default DLL_EXPORT define on gcc/g++ shared libraries
-* Calling ctx.root.ant_glob(abspath) will now return results #1135
-* New case-insentive option for ant_glob #1148
-* Ported demos/asm to 64-bit, forcing gcc over as
-* Updated the gccdeps tool #1162
-* Improved the C# processing #1154, #1153
-* Removed the empty flags from LIB/INCLUDE in the msvc configuration #1159
-* Added an 'encoding' parameter to bld.subst()
-* Detect Visual Studio 2011 beta
-* Detect cython dependencies of the form "from module import x" #1044
-* Use the cython includes in the dependency scanner #1166
-* Improved the behaviour of Utils.readf/Utils.writef on Win32
-* Made Task.__repr__ more robust #1174
-* Fixed the gcc builds on hp-ux
-* Let gccdeps work with other compilers #1179
-
-NEW IN WAF 1.6.11
------------------
-* Enable custom variables for the boost detection #1089
-* Disable the config test execution when detecting boost #1090
-* Process moc classes in .cpp files by default #1095
-* Apply the chmod attribute to the versioned libraries (vnum) #1097
-* Fixed the python detection on OSX #1098
-* Changed the win32 color settings for Windows 7 #1099
-* Set the default fortran linker for ifort to xiar #1104
-
-NEW IN WAF 1.6.10
------------------
-* Fixed the 'remove' attribute propagation in ant_glob #1086
-* Fixed the behavior of recurse(name=xyz) when looking in existing folders
-* Fixed a problem with include paths in the relocation tool #1078
-* Improved the pgicc compiler detection #1080
-* Fixed the behavior of 'waf options' #1076
-* Process larger java projects #1074
-* Remove the ':' from the drives when dealing with foreign files and folders on Win32
-* Let the 'subst' feature process a chmod attribute
-* Added a hook for distutils variable query #1083
-
-NEW IN WAF 1.6.9
-----------------
-* Fixed the duplicate moc file creation in slow_qt4 #1047
-* Fixed the Visual Studio 2008 projects creation #1033
-* Added a workaround to avoid creating include folders not under the build directory #1049
-* Added a default virtual folder structure for out-of-tree build files #1053
-* Added a way to set variants containing /, for example linux/debug
-* Added a more intuitive behaviour for conf.setenv() #1062
-* Fixed the multiple bibliography processing for tex #1040
-* Windows CE detection improvements #1065
-* Fixed the library installation on OSX
-* Fixed the Powerpc/IPhone platform detection
-* Added an Xcode project generator
-
-NEW IN WAF 1.6.8
-----------------
-* Fixed a typo in Utils.py affecting Win32 platforms (copystat) #1029
-* Fixed a minor bug in the Eclipse project generator
-* Fixed a typo that prevented Waf from running on Pypy-trunk
-* Make the xlc/xlc++ compiler detection more accurate by looking at the version number #1022
-* Minor perl, python and ruby tool improvements
-* Better logs for the boost detection #1036
-* Fixed a performance issue in Runner.py #1039
-* Changed the position of the linker flags #1025
-
-NEW IN WAF 1.6.7
-----------------
-
-* Provide more diagnostic for invalid build groups #914
-* Various enhancements to msvs.py
-* Read MSVC_VERSIONS and MSVC_TARGETS from the command-line
-* Minor cross-compiler detection fix on msvc.py
-* Fix the redirections with pipes (waf configure > log)
-* Do not display runnable_status exceptions when running with -k
-* Let -k stop at the first runnable_status error and -kk run even further
-* Merge the add_object extension in the main line (source='file.o')
-* Make update_outputs more robust with changes in the task definition #1017
-* Qt4 detection on Win32
-
-NEW IN WAF 1.6.6
-----------------
-
-* Fix the performance regression related to #974
-
-NEW IN WAF 1.6.5
-----------------
-
-* More documentation
-* Re-enable the colors for msys
-* Add the .ui files for the qt4 translations
-* Fix the conf.check_large_file() test
-* Fix the conf.check_library() in C++ mode #955
-* Improve the latex scanner to avoid depending on generated files #943
-* Remove the @file processing from the winrc tasks
-* Fix the python detection using python-config
-* Add the missing default includes and defines to the moc command
-* Improve support for hierarchical go-lang packages #953
-* Fix the gfortran verbose flag detection on Windows
-* Fix the support of fortran import libraries #950
-* Added a fix for running with Python 2.4 on Windows #949
-* Limited support for IronPython
-* Support for older Visual Studio versions (VC6) #952
-* New waf.bat file #964
-* New method ConfigSet.keys
-* New Visual Studio and Eclipse CTD project generators (waflib/extras)
-* New lru_cache tool for use with WAFCACHE (waflib/extras)
-
-NEW IN WAF 1.6.4
-----------------
-
-* Fix the Python detection on win32 #883
-* Optimize the Python file installation #892
-* Force +x permissions on installed fortran programs #893
-* Qt library detection fixes #895
-* Ensure that unit tests are executed only after the symlinks are created
-* Fix the precedence constraints for classes ending in _task #896
-* Support the install_path attribute with add_pcfile #913
-* Make the goprograms executable when installed #928
-* Allow non-python data files in the waf executable #927
-* Enforce a build order based on the scanner results #777, #922
-* Multiple msvc detection fixes #907 #910 #923 #924 #926
-* Fix the -of flag append with dmd #917
-* Boost detection fixes #920
-* Support newer javac compilers #921
-* Fix the execution on python 2.3 for: "waf update", msvc.py, fc.py
-* Improve the support for mac applications (demos/mac_app)
-* Better default regexps in "waf step"
-* New error check for tasks creating the same nodes or having the same identifiers (waf -v)
-* New variables conf.env.NO_LOCK_IN_TOP/OUT/RUN for special projects (top='..')
-* New example on avoiding rebuilds when moving a project (playground/relocate)
-* Improve go-lang support for cgo-packages (fixes #932)
-* Fix the progress bar on cmd and msys
-
-NEW IN WAF 1.6.3
-----------------
-
-* Fixed the interaction of Fortran configuration tests and WAFCACHE #842
-* Various documentation fixes
-* Set the PYTHONARCHDIR variable for installing python extensions
-* Fixed the Waf file creation with --zip-type=gz (bunzip2 was not replaced by gzip -d)
-* Fixed multiple problems in the call to TaskGen.declare_chain(...) #850
-* Fixed the task attribute 'vars' which might cause unnecessary rebuilds #852
-* Return the value of post_check(...) in conf.check(...) #857
-* Rewrite the boost tool (waflib/extras/boost.py) #814, #454, #424
-* More fortran file extensions: .for, .FOR #867
-* Searching above the root nodes no longer raise exceptions #868
-* Msvc detection fixes for non-utf8 encodings #873
-* Fixed the destdir processing on Windows #874
-* Stop changing the flags on waf -v (make the errors more visible) #875
-* Fixed the resource file compilation on Windows #876
-* Fixed the vala file installation #881
-* New system of plugins for C/C++/Fortran compilers (files named c_* in waflib/extras/)
-* New examples of interaction between Waf and existing makefiles (playground/)
-* New names for @before/@after: @before_method/@after_method
-
-NEW IN WAF 1.6.2
-----------------
-
-* Support for C# debugging files #797
-* Add -relocation-model=pic for shared libraries on ldc
-* Fixed 'waf dist' for tar files on python 3 #799
-* Make the latex scanner recursive #798
-* Enable the packing of non-python files in the waf file #802
-* Improve the feature sniffing for hybrid programs/libraries #800
-* New apidocs + tutorial in Sphinx format
-* Add the CPPFLAGS from os.environ #803
-* Create the java output directory anywhere #806
-* Enable the .luac file installation
-* Process Qt translation files
-* Detect when the folders were copied and prompt for "waf configure"
-* Parse_flags for the *-config outputs on windows (backslashes) #811
-* Fix the doxygen task build order + improve the dependency scanner #821
-* Various msvc fixes #819, #826, #825
-* Ported the batch executor to waf 1.6 (batched_cc)
-* New tools: erlang, scala
-* Moved conf.multicheck(..) from playground to the library
-* New parameter to avoid reading the same scripts: bld.recurse(dir, once=True)
-* Detect invalid method calls in 'waf -v' such as env.append/env.add/env.prepend
-* New manifest option for jar targets #832
-
-NEW IN WAF 1.6.1
-----------------
-
-* Fixed the method check_waf_version  #764
-* Fixed the name in ctx.recurse(name) #769
-* Stop caching the install tasks and tasks that have no outputs #770
-* Fix the log in Context.cmd_and_log() when calling with "quiet" #778
-* c_preproc exception when a file has the same name as a directory #777
-* 'intltool_po' does not install the .mo files #782
-* 'intltool_in' was broken #792
-* Bind stderr and stdout to the exception in Context.cmd_and_log #779
-* Tasks not rebuilding properly when the 'run' method changes #786
-* Print the progress bar information as late as possible #787
-* Fix for the FRAMEWORK value processing
-* Verbose mode should not require the compat15 tools #790
-* Let static libraries use other static libraries as in 1.5 #768
-* Fix for the boost tool #776
-* boost tool update (in playground) #780
-* Updated the java tool and examples
-* New gcj tool in playground
-* Update the c# tool and examples (playground) #796
-* Read external c# libraries #774
-* Xelatex support #785
-* Rebuild fortran files when .mod files change #766
-* docs #781
-* Improve the ant_glob behaviour on ctx.root + absolute paths
-* Fix for glib_mkenums and dbus-binding-tool #795
-* New feature 'subst' (see demos/subst)
-
-NEW IN WAF 1.6.0
-----------------
-
-General:
-* Python 3 syntax by default (runs unmodified for 2.6, 2.7, 3.0 and 3.1)
-* Environment -> ConfigSet
-* only lists are allowed in ConfigSet
-* Better Node apis
-* Utils.load_tool -> Context.load_tool
-* set_options becomes options
-* only the build-related commands require a configured project
-* new variant system + build context commands
-* removed the pseudo glob in installation methods
-* eliminate find_sources_in_dirs
-* node.__class__.bld → node.ctx
-* bld.new_task_gen(...) disappears, use bld(...)
-* network updates for waf tools
-* accept node objects in the source and includes attributes
-* remove task_gen.allnodes: modify self.source directly
-* merge the include system for c, c++, d, gas and nasm
-* allow top == out (no build directory)
-* merge the Tool/wscript system (detect->configure, set_options->options)
-* new command "waf list" to list the x for "waf build --targets=x"
-* rename apply_core -> process_source
-* rename apply_rule -> process_rule
-* rename Task.TaskBase.classes -> Task.classes
-* the modules Utils.py and Logs.py are now independent from the rest of waf (imports)
-* remove Task.TaskManager and Build.BuildContext.all_task_gen to improve the build group handling
-* remove program_USELIB, shlib_USELIB staticlib_USELIB support
-* use tasks for target installation
-* improve the exception handling (WscriptError was removed, use WafError)
-* let the commands access node objects
-* infer the build directory from the lock filename
-* waf step --file=main.c
-* post task generators in a lazy manner
-
-preview 3:
-* remove the /W3 flag from msvc default flags
-* opt.tool_options -> opt.load (now all commands inherit the 'tool' method)
-* conf.check_tool -> conf.load
-* do not copy files when creating tar files in 'waf dist'
-* add zip files in 'waf dist'
-* fix the behaviour of 'waf distcheck'
-* preprocessor optimizations
-* python 2 fixes
-
-release candidate:
-* cache fixes
-* fortran fixes
-* python 2 and 3 fixes
-* docs and docstrings
-* support for custom waf files and preludes
-* fix in waflib.Context for overriding command classes
-* port the doxygen tool
-* Utils.to_hashtable -> Utils.str2dict
-* change the thread pool to enable thread pool sharing
-* fixed a regression on win32 + ansiterm.py + python 3 -> thanks to kesselhaus :-)
-* various msvc fixes (thanks to Nicolas Mercier)
+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)
+* Provide built-in support for building over UNC paths
+* Simplify the Task class hierarchy; TaskBase is removed
+* Display commands as string with "WAF_CMD_FORMAT=string waf build -v"
+* Have ant_glob(..., generator=True) return a Python generator
+* 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())

DEVEL

@@ -1,46 +1,40 @@
-Main repository for waf 1.7 on http://waf.googlecode.com/git/
--------------------------------------------------------------
+Waf 2.0 is on https://gitlab.com/ita1024/waf
+------------------------------------------------
 
 waflib            the core library
 waflib/Tools      essential waf tools
-waflib/extras     contributed tools which are not included in the
-                  waf file by default (except "compat15")
-build_system_kit  examples of build systems that can be created from waf
+waflib/extras     contributed tools which are not included in the waf file by default
+build_system_kit  examples of build systems that can be created from Waf
 tests             various unit tests, most are unused anymore
-playground        experiments and integration tests for the tools in
-                  the folder waflib/extras
-demos             integration tests - the folder can be configured
-                  as a standalone project
+playground        experimental examples and test, most tools lie in the folder waflib/extras
+demos             integration tests - the folder can be configured as a standalone project
 demos/*           integration tests and examples used as documentation
 docs              documentation
-docs/sphinx       project extracting the docstrings from the source code to
-                  create the apidocs
+docs/sphinx       project extracting the docstrings from the source code to create the API documentation
 
-Documentation repository on http://docs.waf.googlecode.com/git/
----------------------------------------------------------------
+Documentation
+-------------------------------------------------
 
-Contains the documentation:
-API documentation                      http://docs.waf.googlecode.com/git/apidocs_17/index.html
-The Waf Book                           http://docs.waf.googlecode.com/git/book_17/single.html
-The Waf Book for Waf 1.6 (deprecated)  http://docs.waf.googlecode.com/git/book_16/single.html
-The Waf Book for Waf 1.5 (deprecated)  http://docs.waf.googlecode.com/git/book_15/single.html
+API documentation        https://waf.io/apidocs/
+The Waf Book             https://waf.io/book/
 
-Programming details
--------------------
+General coding guidelines
+-------------------------
 
-* Do not use x.split("\n") but x.splitlines()
-* Do not catch all exceptions unless you have a good reason to do so
-* File handles are too easy to get wrong, use Node.readf/Node.writef/Utils.readf/Utils.writef
+* The code must run in both Python 2.6 to Python 3
+* Use tabs for Python file indentation
+* Use x.splitlines() instead of x.split('\n')
+* Avoid "except:" and "except Exception:"
+* Use Node.readf/Node.writef/Utils.readf/Utils.writef
 
-Wiki documentation on http://wiki.waf.googlecode.com/git/
----------------------------------------------------------
+Pull requests
+-------------
 
-...
-
-Previous branches
------------------
-
-old svn repository http://waf.googlecode.com/svn/trunk/ (for waf 1.5, read-only and unused)
-old branch for waf 1.5 http://waf.googlecode.com/svn/branches/waf-1.5/ (again, read-only and unused)
+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,
+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

@@ -1,50 +0,0 @@
-WHAT YOU WILL FIND HERE
------------------------
-
-Waf (1.7)
-
-For the manual: http://docs.waf.googlecode.com/git/book_16/single.html
-For the api docs: http://docs.waf.googlecode.com/git/apidocs_16/index.html
-For the examples: see the folder demos/
-
-HOW TO CREATE THE WAF SCRIPT
-----------------------------
-
-Python 2.6, 2.7, 3.0, 3.1 or 3.2 is required to generate the waf script. Execute:
-$ ./waf-light configure build
-Or, if you have several python versions installed:
-$ python3 ./waf-light configure build
-
-The Waf tools in waflib/extras are not added to the waf script. To add
-some of them, use the --tools switch:
-$ ./waf-light --tools=compat15,swig
-
-To add a tool that does not exist in the folder extras, pass an absolute path, and
-to customize the initialization, pass the parameter 'prelude'. Here is for example
-how to create a waf file using the compat15 module:
-$ ./waf-light --tools=compat15 --prelude=$'\tfrom waflib.extras import compat15\n'
-
-Any kind of initialization is possible, though one may prefer the build system kit (folder build_system_kit):
-$ ./waf-light --make-waf --tools=compat15,/comp/waf/aba.py --prelude=$'\tfrom waflib.extras import compat15\n\tprint "ok"'
-
-HOW TO TRY THE EXAMPLES
------------------------
-
-Try this:
-$ cp waf demos/c/
-$ cd demos/c/
-$ ./waf configure build
-
-USING GIT
----------
-
-$ git clone https://code.google.com/p/waf/
-set $HOME/.netrc to read:
-machine code.google.com login user@gmail.com password pass
-$ git remote add code https://code.google.com/p/waf.docs/
-... make a few changes
-$ git push code
-
----------------------------
-Thomas Nagy, 2012 (ita)
-

README.md

@@ -0,0 +1,60 @@
+# 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.x, Jython 2.5, IronPython, and PyPy
+
+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).
+
+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.7 is required to generate the waf script:
+
+```sh
+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
+```
+
+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'
+```
+
+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")'
+```
+
+To avoid regenerating the waf file all the time, just set the `WAFDIR` environment variable to the directory containing "waflib".
+
+## HOW TO RUN THE EXAMPLES
+
+Try this:
+
+```sh
+cp waf demos/c/
+cd demos/c/
+./waf configure build
+```

TODO

@@ -1,22 +0,0 @@
-Waf 1.7.x
----------
-
-* fix the remaining bugs
-* provide more extensions
-
-
-Can be useful:
-
-def bld_command(*k):
-	fun = k[0]
-	name = fun.__name__
-	from waflib.Build import BuildContext
-	class tmp(BuildContext):
-		cmd = name
-		fun = name
-	return fun
-
-@bld_command
-def foo(ctx):
-	print ctx.env
-

build_system_kit/README.txt

@@ -30,4 +30,4 @@ A few examples are provided to illustrate the range of possibilities:
 * nostate:         use timestamps only, and no build directory (very make-like)
 * extpy:           a custom waf file able to read wscript files having the extension ".py"
 
-Thomas Nagy, 2010-2011
+Thomas Nagy, 2010-2016

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)

build_system_kit/makefile_dumper/wscript

@@ -39,16 +39,16 @@ def dump(bld):
 	bld.targets = []
 
 	# store the command executed
-	old_exec = Task.TaskBase.exec_command
+	old_exec = Task.Task.exec_command
 	def exec_command(self, *k, **kw):
 		ret = old_exec(self, *k, **kw)
 		self.command_executed = k[0]
 		self.path = kw['cwd'] or self.generator.bld.cwd
 		return ret
-	Task.TaskBase.exec_command = exec_command
+	Task.Task.exec_command = exec_command
 
 	# perform a fake build, and accumulate the makefile bits
-	old_process = Task.TaskBase.process
+	old_process = Task.Task.process
 	def process(self):
 		old_process(self)
 
@@ -67,13 +67,13 @@ def dump(bld):
 		else:
 			bld.commands.append(' '.join(lst))
 			bld.commands.append('\tcd %s && %s' % (self.path, self.command_executed))
-	Task.TaskBase.process = process
+	Task.Task.process = process
 
 	# write the makefile after the build is complete
 	def output_makefile(self):
 		self.commands.insert(0, "all: %s" % " ".join(self.targets))
 		node = self.bldnode.make_node('Makefile')
-		node.write("\n".join(self.commands))
-		Logs.warn('Wrote %s' % node.abspath())
+		node.write('\n'.join(self.commands))
+		Logs.warn('Wrote %r', node)
 	bld.add_post_fun(output_makefile)
 

build_system_kit/noscript/dbdlib.py

@@ -35,9 +35,8 @@ def build(bld):
 	elif tp == 'objects':
 		features = 'c'
 
-	source = Options.options.source
 	app = Options.options.app
-	bld(features=features, source=source, target=app)
+	bld(features=features, source=Options.options.source, target=app)
 
 def recurse_rep(x, y):
 	f = getattr(Context.g_module, x.cmd or x.fun, Utils.nada)
@@ -126,9 +125,3 @@ def c_hook(self, node):
 	# re-bind the extension to this new class
 	return self.create_compiled_task('c2', node)
 
-# modify the existing class to output the targets in the same directory as the original files
-Task.update_outputs(c2)
-Task.update_outputs(waflib.Tools.c.cprogram)
-Task.update_outputs(waflib.Tools.c.cshlib)
-Task.update_outputs(waflib.Tools.c.cstlib)
-

build_system_kit/parser/cbdlib.py

@@ -20,7 +20,7 @@ def build(bld):
 	for x in txt.splitlines():
 		if not x:
 			continue
-		elif x.startswith('\t') or x.startswith(' '):
+		elif x.startswith(('\t', ' ')):
 			tg.rule = x.lstrip()
 		else:
 			line = x.split(':')

configure

@@ -61,7 +61,7 @@ checkWAF()
 	# neither waf nor miniwaf could be found
 	if [ ! -x "$WAF" ] ; then
 	    printf "$RED""not found""$NORMAL""\n"
-	    echo "Go to http://code.google.com/p/waf/"
+	    echo "Go to https://waf.io/"
 	    echo "and download a waf version"
 	    exit $EXIT_FAILURE
 	else

demos/asm/test.S

@@ -1,21 +1,22 @@
 #include "header.h"
 
-.text
-.align 2
+.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

@@ -13,14 +13,16 @@ def configure(conf):
 		conf.fatal('this example is for 64-bit systems only')
 
 def build(bld):
-	# http://docs.waf.googlecode.com/git/apidocs_16/tools/asm.html
+	# https://waf.io/apidocs/tools/asm.html
 	bld.program(
 		source   = 'main.c test.S',
 		target   = 'asmtest',
-		includes = '.')
+		defines  = 'foo=12',
+		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++/wscript

@@ -19,6 +19,8 @@ def configure(conf):
 
 def build(bld):
 	bld.shlib(source='a.cpp', target='mylib', vnum='9.8.7')
+	bld.shlib(source='a.cpp', target='mylib2', vnum='9.8.7', cnum='9.8')
+	bld.shlib(source='a.cpp', target='mylib3')
 	bld.program(source='main.cpp', target='app', use='mylib')
 	bld.stlib(target='foo', source='b.cpp')
 

demos/c/program/msvc_resource.rc

@@ -0,0 +1 @@
+100	icon "gfx/semfavicon.ico"

demos/c/program/wscript_build

@@ -1,19 +1,19 @@
 #! /usr/bin/env python
 
 def write_header(tsk):
-	tsk.outputs[0].write('int abc = 423;')
-bld(rule=write_header, target='b.h', ext_out=['.h'])
+	tsk.outputs[0].write('int abc = 423;\n')
+bld(features='use', rule=write_header, target='b.h', ext_out=['.h'], name='XYZ')
 
-bld.program(
+tg = bld.program(
 	features = 'aaa',
 	source   = 'main.c',
 	includes = '. ..',
-	cflags   = ['-O3'],
+	#cflags   = ['-O3'], # for example
 	defines  = ['foo=bar'],
 	target   = 'myprogram',
-	use      = 'M')
+	use      = 'M XYZ')
 
-# make main.c depend on wscript_build, just for the fun of it
+# just for fun, make main.c depend on wscript_build
 bld.add_manual_dependency('main.c', bld.path.find_resource('wscript_build'))
 
 # ----------------------------------------
@@ -34,3 +34,6 @@ class foo(waflib.Task.Task):
 	def run(self):
 		self.outputs[0].write('int kik = 343;\n')
 
+
+if bld.env.CC_NAME == 'msvc':
+	tg.source += ' msvc_resource.rc'

demos/c/shlib/wscript_build

@@ -3,6 +3,7 @@
 bld.shlib(
 	source = 'test_shlib.c',
 	target = 'my_shared_lib',
+	name   = 'xyz',
 	vnum   = '1.2.3',
 	defs   = 'foo.def')
 
@@ -11,7 +12,7 @@ t = bld.program(
 	#features = 'my_precious',
 	source = 'main.c',
 	target = 'test_shared_link',
-	use    = 'my_shared_lib',
+	use    = 'xyz',
 	# 1. settings flags directly
 	#linkflags = ['-L/disk/comp/waf/demos/c/build/shlib', '-lmy_shared_lib']
 	)

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/stlib/wscript_build

@@ -13,7 +13,7 @@ bld.program(
 def r1(self):
 	import time
 	time.sleep(1)
-	self.outputs[0].write(' ')
+	self.outputs[0].write('\n')
 bld(rule=r1, target='foo.h', before=['c'])
 
 # the default scanner may enforce the build order on generated headers, but it is just

demos/c/wscript

@@ -11,40 +11,65 @@ APPNAME='cc_test'
 
 top = '.'
 
-from waflib import Configure, Logs
-#Configure.autoconfig = True
+from waflib import Configure, Logs, Utils
+#Configure.autoconfig = True # True/False/'clobber'
 
 def options(opt):
 	opt.load('compiler_c gnu_dirs')
 
 def configure(conf):
 	conf.load('compiler_c gnu_dirs')
-	conf.check_cc(fragment="int main() { return 0; }\n")
+
+	# compile and link in the default mode, which is c++ if present
+	conf.check(fragment='int main() { return 0; }\n')
+
+	# just compile in c mode, and do not link
+	conf.check(fragment='int main() { return 0; }\n', features='c')
 
 	try:
-		conf.check_cc(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_cc(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_cc(lib='m', cflags='-Wall', defines=['var=foo', 'x=y'], uselib_store='M', mandatory=False)
+	conf.check(lib='m', cflags='-Wall', defines=['var=foo', 'x=y'], uselib_store='M', mandatory=False)
 	conf.check_large_file(mandatory=False)
 	conf.check_inline()
-	conf.check_endianness()
+
+	endianness = conf.check_endianness()
+	conf.define_cond("BIG_ENDIAN", endianness == "big")
+
+	def test_build(ctx):
+		ctx(rule='echo hello', shell=True, always=True)
+		# Configuration tests may even be re-used:
+		#ctx.in_msg = True # suppress console outputs
+		#ctx.check_large_file(mandatory=False)
 
 	conf.multicheck(
-		{'header_name':'stdio.h'},
-		{'header_name':'unistd.h'},
-		{'header_name':'stdlib.h'},
-		msg       = 'Checking for standard headers',
-		mandatory = False
+		# list of conf.check() arguments
+		{'header_name':'stdio.h', 'msg':'... stdio', 'uselib_store': 'STDIO'},
+		{'header_name':'xyztabcd.h', 'msg':'... optional xyztabcd.h', 'mandatory': False},
+		{'header_name':'stdlib.h', 'msg':'... stdlib', 'okmsg': 'aye', 'errmsg': 'nope'},
+		{'func': test_build, 'msg':'... testing an arbitrary build function', 'okmsg':'ok'},
+
+		# parallelism control with after_tests/before_tests
+		{'header_name':'malloc.h', 'msg':'... malloc', 'uselib_store':'MALLOC', 'id':'malloc_t', 'mandatory':False},
+		{'header_name':'unistd.h', 'msg':'... unistd', 'uselib_store':'UNISTD', 'before_tests':['malloc_t'], 'mandatory':False},
+
+		msg       = 'Checking for headers in parallel',
+		#mandatory = False, # set to False to make all tests non-mandatory
+		#run_all_tests = False # set to False to stop at the first error
 	)
-	conf.check_cc(header_name='stdio.h', auto_add_header_name=True)
-	#conf.check_cc(header_name='unistd.h')
-	conf.check_cc(fragment='int main() {return 0;}\n')
+
+	conf.check(header_name='stdio.h', auto_add_header_name=True)
+	#conf.check(header_name='unistd.h')
+	conf.check(fragment='int main() {return 0;}\n')
 	conf.write_config_header('config.h')
 
 	# exclude system libraries, force a particular folder (see strictlib below)
@@ -53,16 +78,29 @@ 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)
 	bld.install_as('${PREFIX}/gnigni.txt', 'wscript')
 	bld.symlink_as('${PREFIX}/libfoo.so', 'wscript')
 
+	p = Utils.subst_vars('${PREFIX}/gnigni.txt', bld.env)
+	bld.symlink_as('${PREFIX}/share/gnigni-abs.txt', p, relative_trick=False)
+	bld.symlink_as('${PREFIX}/share/gnigni-rel.txt', p, relative_trick=True)
+
 	bld.env.FOO =['m', 'ncurses']
 	bld.env.ST = '-L%s'
-	bld(rule='echo ${ST:FOO}', always=True, shell=1)
+	bld.env.A = 'aye'
+	bld.env.B = 'doh'
+	bld.env.SRCA = ['aaa']
+	bld(rule='echo ${ST:FOO} ${ST:SRC} ${A}${B} ${ST:SRCA} ${ST:SRC[0].abspath()}',
+		always=True, source='wscript', shell=1, name='Shell')
+	if not Utils.is_win32:
+		bld(rule='echo ${ST:FOO} ${ST:SRC} ${A}${B} ${ST:SRCA} ${ST:SRC[0].abspath()}',
+			always=True, source='wscript', shell=0,
+			stdout=None, stderr=None,  # disable synchronized outputs on this rule
+			cls_keyword=lambda x:'Trying again', name='NoShell')
 
 	# illustrate how to add a command 'foo' and to execute things in it
 	if bld.cmd == 'foo':

demos/d/src/wscript_build

@@ -1,5 +1,5 @@
 obj = bld(features='d dprogram')
 obj.source      = 'main.d extra.d'
 obj.target      = 'test2'
-obj.importpaths = '.'
+obj.includes = '.'
 

demos/d/wscript

@@ -12,6 +12,8 @@ def options(opt):
 	opt.load('compiler_d')
 
 def configure(conf):
+	# why does dmd require -fPIC on everything?
+	conf.env.DFLAGS='-fPIC'
 	conf.load('compiler_d')
 	conf.env.LIB_PTHREAD = ['pthread']
 	conf.check_dlibrary()

demos/doxy/wscript

@@ -1,33 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-# Thomas Nagy, 2008-2010 (ita)
-
-VERSION='0.0.1'
-APPNAME='cc_test'
-
-top = '.'
-out = 'build'
-
-def options(opt):
-	opt.load('compiler_cxx')
-
-def configure(conf):
-	conf.load('compiler_cxx doxygen')
-
-def build(bld):
-	# Note: Doxgen parameters may be passed using pars attribute
-	#       e.g. pars={'EXCLUDE_PATTERNS':'*.babu'}
-
-	if bld.cmd == 'doxy':
-		bld(
-			features='doxygen',
-			doxyfile='test.conf',
-			doxy_tar='docs.tar.bz2')
-	else:
-		print('Call "waf doxy" for building the documentation')
-
-from waflib import Build
-class doxy(Build.BuildContext):
-	fun = 'build'
-	cmd = 'doxy'
-

demos/fortran/foo.def

@@ -0,0 +1,2 @@
+EXPORTS
+	FOO

demos/fortran/mod/fakecc.py

@@ -53,7 +53,7 @@ class fakecc(Task.Task):
 		bnodes = self.outputs
 		m = usemodule(self.inputs[0])
 		if m:
-			print "%s requires module %s" % (self.inputs[0].abspath(), m[0])
+			print("%s requires module %s" % (self.inputs[0].abspath(), m[0]))
 			#bnodes.append(self.generator.bld.bldnode.exclusive_build_node(m[0]))
 
 		compile(self)

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/typemap/fsrc.def

@@ -0,0 +1,2 @@
+EXPORTS
+	EXAMPLE_MOD_mp_SUB1

demos/fortran/typemap/wscript

@@ -11,14 +11,19 @@ def configure(conf):
 	conf.load('compiler_c')
 	conf.load('compiler_fc')
 	conf.check_fortran()
-	conf.check_fortran_verbose_flag()
-	conf.check_fortran_clib()
+	# configuration tests that may be totally irrelevant
+	conf.check_fortran_dummy_main()
+	if not conf.env.IFORT_WIN32:
+		conf.check_fortran_verbose_flag()
+		conf.check_fortran_clib()
+		conf.check_fortran_mangling()
 
 def build(bld):
 
 	bld(
 		features = 'fc typemap fcshlib',
 		source = 'fsrc.f90 basetypes.f90',
+		defs   = 'fsrc.def',
 		target = 'foo',
 		)
 
@@ -28,9 +33,9 @@ from waflib import Logs, Build, Utils
 from waflib import TaskGen, Task
 from waflib.ConfigSet import ConfigSet
 
-#@TaskGen.feature('typemap') <- python >= 2.4
-#@TaskGen.after('process_source')
-#@TaskGen.before('apply_link')
+@TaskGen.feature('typemap')
+@TaskGen.after('process_source')
+@TaskGen.before('apply_link')
 def process_typemaps(self):
 	"""
 	modmap: *.f90 + foo.in -> foo.h + foo.f90
@@ -54,11 +59,6 @@ def process_typemaps(self):
 	tsk = self.create_compiled_task('fc', f90out)
 	tsk.nomod = True # the fortran files won't compile unless all the .mod files are set, ick
 
-# for python 2.3
-TaskGen.feature('typemap')(process_typemaps)
-TaskGen.after('process_source')(process_typemaps)
-TaskGen.before('apply_link')(process_typemaps)
-
 class modmap(Task.Task):
 	"""
 	create .h and .f90 files, so this must run be executed before any c task
@@ -166,25 +166,26 @@ end subroutine outer
 	return res
 
 def write_type_map(bld, ctps, fort_file, c_header):
-	fort_file.write('''\
+	buf = ['''\
 module type_maps
 use, intrinsic :: iso_c_binding
 implicit none
-''', flags='w')
+''']
 	for ctp in ctps:
-		fort_file.write('integer, parameter :: %s = %s\n' % (ctp.name, ctp.fc_type),
-				flags='a')
-	fort_file.write('end module type_maps\n', flags='a')
+		buf.append('integer, parameter :: %s = %s' % (ctp.name, ctp.fc_type))
+	buf.append('end module type_maps\n')
+	fort_file.write('\n'.join(buf))
 
 	cap_name = '%s__' % c_header.name.upper().replace('.', '_')
-	c_header.write('''\
+	buf = ['''\
 #ifndef %s
 #define %s
-''' % (cap_name, cap_name), flags='w')
+''' % (cap_name, cap_name)]
 	for ctp in ctps:
 		# This is just an example, so this would be customized. The 'long long'
 		# would correspond to the actual C type...
-		c_header.write('typedef long long %s\n' % ctp.name, flags='a')
-	c_header.write('#endif\n', flags='a')
+		buf.append('typedef long long %s\n' % ctp.name)
+	buf.append('#endif\n')
+	c_header.write('\n'.join(buf))
 
 # vim:ft=python:noet

demos/fortran/wscript

@@ -12,19 +12,15 @@ def options(opt):
 	opt.recurse('typemap')
 
 def configure(conf):
-	conf.load('compiler_fc')
 	conf.load('compiler_c')
+	conf.load('compiler_fc')
+
 	if conf.env.FC_NAME == 'IFORT':
-		conf.env['FCFLAGS'] = ['-warn']
+		conf.env.append_unique('FCFLAGS', '-warn')
 	elif conf.env.FC_NAME == 'GFORTRAN':
-		conf.env['FCFLAGS'] = ['-Wall', '-W']
-	#conf.env['INCLUDES'] = ['hfloupi']
+		conf.env.append_unique('FCFLAGS', ['-Wall', '-W'])
 
 	conf.check_fortran()
-	conf.check_fortran_verbose_flag()
-	conf.check_fortran_clib()
-	conf.check_fortran_dummy_main()
-	conf.check_fortran_mangling()
 	conf.recurse('typemap')
 
 def build(bld):
@@ -43,6 +39,7 @@ def build(bld):
 		features = 'fc fcshlib',
 		source   = 'foo.f',
 		target   = 'shlib1',
+		defs     = 'foo.def',
 		vnum     = '2.3.9')
 
 	bld(
@@ -81,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/glib2/file.js

@@ -0,0 +1 @@
+print('This is a resource file!')

demos/glib2/org.glib2.test.gresource.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/glib2/test">
+    <file>file.js</file>
+  </gresource>
+</gresources>

demos/glib2/org.gsettings.simple.gschema.xml

@@ -0,0 +1,7 @@
+<schemalist>
+  <schema id="org.gsettings.simple">
+    <key name="greeting" type="s">
+      <default>"Hello, world"</default>
+    </key>
+  </schema>
+</schemalist>

demos/glib2/wscript

@@ -8,6 +8,8 @@ APPNAME='glib2_test'
 top = '.'
 out = 'build'
 
+import os
+
 def options(opt):
 	opt.load ('compiler_c glib2')
 
@@ -16,6 +18,8 @@ def configure(conf):
 
 	conf.check_cfg (package='glib-2.0', uselib_store='GLIB', atleast_version='2.25.0',
 	                args='--cflags --libs')
+	conf.check_cfg (package='gio-2.0', uselib_store='GIO', atleast_version='2.25.0',
+	                args='--cflags --libs')
 	conf.check_cfg (package='gobject-2.0', uselib_store='GOBJECT', atleast_version='2.25.0',
 	                args='--cflags --libs')
 
@@ -23,8 +27,8 @@ def configure(conf):
 def build(bld):
 	app = bld (
 		features = 'c cprogram glib2',
-		uselib   = 'GLIB GOBJECT',
-		source   = 'main.c',
+		use      = 'GLIB GIO GOBJECT',
+		source   = 'main.c org.glib2.test.gresource.xml',
 		target   = 'gsettings-test'
 
 		## An alternate way of doing this (no need to call add_ functions):
@@ -38,3 +42,16 @@ def build(bld):
 	                           'org.gsettings.test-2.gschema.xml'])
 
 	app.add_marshal_file('marshal.list', 'test_marshal')
+
+	bld(
+		features = 'gresource',
+		source   = 'org.glib2.test.gresource.xml',
+		install_path = 'lib/glib2_test'
+	)
+
+	# Install a schema to a different location.
+	# It will be compiled to a cache file besides it.
+	bld(
+		features = 'glib2',
+		settings_schema_files = ['org.gsettings.simple.gschema.xml']
+	).env.GSETTINGSSCHEMADIR = os.path.join('etc', 'glib-2.0', 'schemas')

demos/go/LICENSE

@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * 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.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"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 COPYRIGHT
-OWNER OR CONTRIBUTORS 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.

demos/go/gmp.go

@@ -1,278 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gmp
-
-// #include <gmp.h>
-// #include <stdlib.h>
-// #cgo LDFLAGS: -lgmp
-import "C"
-
-import (
-	"os"
-	"unsafe"
-)
-
-/*
- * one of a kind
- */
-
-// An Int represents a signed multi-precision integer.
-// The zero value for an Int represents the value 0.
-type Int struct {
-	i    C.mpz_t
-	init bool
-}
-
-// NewInt returns a new Int initialized to x.
-func NewInt(x int64) *Int { return new(Int).SetInt64(x) }
-
-// Int promises that the zero value is a 0, but in gmp
-// the zero value is a crash.  To bridge the gap, the
-// init bool says whether this is a valid gmp value.
-// doinit initializes z.i if it needs it.  This is not inherent
-// to FFI, just a mismatch between Go's convention of
-// making zero values useful and gmp's decision not to.
-func (z *Int) doinit() {
-	if z.init {
-		return
-	}
-	z.init = true
-	C.mpz_init(&z.i[0])
-}
-
-// Bytes returns z's representation as a big-endian byte array.
-func (z *Int) Bytes() []byte {
-	b := make([]byte, (z.Len()+7)/8)
-	n := C.size_t(len(b))
-	C.mpz_export(unsafe.Pointer(&b[0]), &n, 1, 1, 1, 0, &z.i[0])
-	return b[0:n]
-}
-
-// Len returns the length of z in bits.  0 is considered to have length 1.
-func (z *Int) Len() int {
-	z.doinit()
-	return int(C.mpz_sizeinbase(&z.i[0], 2))
-}
-
-// Set sets z = x and returns z.
-func (z *Int) Set(x *Int) *Int {
-	z.doinit()
-	C.mpz_set(&z.i[0], &x.i[0])
-	return z
-}
-
-// SetBytes interprets b as the bytes of a big-endian integer
-// and sets z to that value.
-func (z *Int) SetBytes(b []byte) *Int {
-	z.doinit()
-	if len(b) == 0 {
-		z.SetInt64(0)
-	} else {
-		C.mpz_import(&z.i[0], C.size_t(len(b)), 1, 1, 1, 0, unsafe.Pointer(&b[0]))
-	}
-	return z
-}
-
-// SetInt64 sets z = x and returns z.
-func (z *Int) SetInt64(x int64) *Int {
-	z.doinit()
-	// TODO(rsc): more work on 32-bit platforms
-	C.mpz_set_si(&z.i[0], C.long(x))
-	return z
-}
-
-// SetString interprets s as a number in the given base
-// and sets z to that value.  The base must be in the range [2,36].
-// SetString returns an error if s cannot be parsed or the base is invalid.
-func (z *Int) SetString(s string, base int) os.Error {
-	z.doinit()
-	if base < 2 || base > 36 {
-		return os.EINVAL
-	}
-	p := C.CString(s)
-	defer C.free(unsafe.Pointer(p))
-	if C.mpz_set_str(&z.i[0], p, C.int(base)) < 0 {
-		return os.EINVAL
-	}
-	return nil
-}
-
-// String returns the decimal representation of z.
-func (z *Int) String() string {
-	if z == nil {
-		return "nil"
-	}
-	z.doinit()
-	p := C.mpz_get_str(nil, 10, &z.i[0])
-	s := C.GoString(p)
-	C.free(unsafe.Pointer(p))
-	return s
-}
-
-func (z *Int) destroy() {
-	if z.init {
-		C.mpz_clear(&z.i[0])
-	}
-	z.init = false
-}
-
-
-/*
- * arithmetic
- */
-
-// Add sets z = x + y and returns z.
-func (z *Int) Add(x, y *Int) *Int {
-	x.doinit()
-	y.doinit()
-	z.doinit()
-	C.mpz_add(&z.i[0], &x.i[0], &y.i[0])
-	return z
-}
-
-// Sub sets z = x - y and returns z.
-func (z *Int) Sub(x, y *Int) *Int {
-	x.doinit()
-	y.doinit()
-	z.doinit()
-	C.mpz_sub(&z.i[0], &x.i[0], &y.i[0])
-	return z
-}
-
-// Mul sets z = x * y and returns z.
-func (z *Int) Mul(x, y *Int) *Int {
-	x.doinit()
-	y.doinit()
-	z.doinit()
-	C.mpz_mul(&z.i[0], &x.i[0], &y.i[0])
-	return z
-}
-
-// Div sets z = x / y, rounding toward zero, and returns z.
-func (z *Int) Div(x, y *Int) *Int {
-	x.doinit()
-	y.doinit()
-	z.doinit()
-	C.mpz_tdiv_q(&z.i[0], &x.i[0], &y.i[0])
-	return z
-}
-
-// Mod sets z = x % y and returns z.
-// Like the result of the Go % operator, z has the same sign as x.
-func (z *Int) Mod(x, y *Int) *Int {
-	x.doinit()
-	y.doinit()
-	z.doinit()
-	C.mpz_tdiv_r(&z.i[0], &x.i[0], &y.i[0])
-	return z
-}
-
-// Lsh sets z = x << s and returns z.
-func (z *Int) Lsh(x *Int, s uint) *Int {
-	x.doinit()
-	z.doinit()
-	C.mpz_mul_2exp(&z.i[0], &x.i[0], C.mp_bitcnt_t(s))
-	return z
-}
-
-// Rsh sets z = x >> s and returns z.
-func (z *Int) Rsh(x *Int, s uint) *Int {
-	x.doinit()
-	z.doinit()
-	C.mpz_div_2exp(&z.i[0], &x.i[0], C.mp_bitcnt_t(s))
-	return z
-}
-
-// Exp sets z = x^y % m and returns z.
-// If m == nil, Exp sets z = x^y.
-func (z *Int) Exp(x, y, m *Int) *Int {
-	m.doinit()
-	x.doinit()
-	y.doinit()
-	z.doinit()
-	if m == nil {
-		C.mpz_pow_ui(&z.i[0], &x.i[0], C.mpz_get_ui(&y.i[0]))
-	} else {
-		C.mpz_powm(&z.i[0], &x.i[0], &y.i[0], &m.i[0])
-	}
-	return z
-}
-
-func (z *Int) Int64() int64 {
-	if !z.init {
-		return 0
-	}
-	return int64(C.mpz_get_si(&z.i[0]))
-}
-
-
-// Neg sets z = -x and returns z.
-func (z *Int) Neg(x *Int) *Int {
-	x.doinit()
-	z.doinit()
-	C.mpz_neg(&z.i[0], &x.i[0])
-	return z
-}
-
-// Abs sets z to the absolute value of x and returns z.
-func (z *Int) Abs(x *Int) *Int {
-	x.doinit()
-	z.doinit()
-	C.mpz_abs(&z.i[0], &x.i[0])
-	return z
-}
-
-
-/*
- * functions without a clear receiver
- */
-
-// CmpInt compares x and y. The result is
-//
-//   -1 if x <  y
-//    0 if x == y
-//   +1 if x >  y
-//
-func CmpInt(x, y *Int) int {
-	x.doinit()
-	y.doinit()
-	switch cmp := C.mpz_cmp(&x.i[0], &y.i[0]); {
-	case cmp < 0:
-		return -1
-	case cmp == 0:
-		return 0
-	}
-	return +1
-}
-
-// DivModInt sets q = x / y and r = x % y.
-func DivModInt(q, r, x, y *Int) {
-	q.doinit()
-	r.doinit()
-	x.doinit()
-	y.doinit()
-	C.mpz_tdiv_qr(&q.i[0], &r.i[0], &x.i[0], &y.i[0])
-}
-
-// GcdInt sets d to the greatest common divisor of a and b,
-// which must be positive numbers.
-// If x and y are not nil, GcdInt sets x and y such that d = a*x + b*y.
-// If either a or b is not positive, GcdInt sets d = x = y = 0.
-func GcdInt(d, x, y, a, b *Int) {
-	d.doinit()
-	x.doinit()
-	y.doinit()
-	a.doinit()
-	b.doinit()
-	C.mpz_gcdext(&d.i[0], &x.i[0], &y.i[0], &a.i[0], &b.i[0])
-}
-
-// ProbablyPrime performs n Miller-Rabin tests to check whether z is prime.
-// If it returns true, z is prime with probability 1 - 1/4^n.
-// If it returns false, z is not prime.
-func (z *Int) ProbablyPrime(n int) bool {
-	z.doinit()
-	return int(C.mpz_probab_prime_p(&z.i[0], C.int(n))) > 0
-}

demos/go/gmp/impl.go

@@ -1,7 +0,0 @@
-package gmp
-
-/*
- #include <stdio.h>
-*/
-import "C"
-// EOF

demos/go/main.go

@@ -1,10 +0,0 @@
-// By: Tom Wambold <tom5760@gmail.com>
-package main
-
-import "other"
-
-func main() {
-    a := other.Vector3 {1, 2, 3};
-    a.Size();
-    return;
-}

demos/go/my-c-lib-2.go

@@ -1,16 +0,0 @@
-package foo
-
-/*
- #cgo LDFLAGS: -lmy-c-lib
-
- #include "my-c-lib.h"
- #include <stdlib.h>
-*/
-import "C"
-import "unsafe"
-
-func MyBye(msg string) {
-	c_msg := C.CString(msg)
-	defer C.free(unsafe.Pointer(c_msg))
-	C.my_c_bye(c_msg)
-}

demos/go/my-c-lib.go

@@ -1,16 +0,0 @@
-package foo
-
-/*
- #cgo LDFLAGS: -lmy-c-lib
-
- #include "my-c-lib.h"
- #include <stdlib.h>
-*/
-import "C"
-import "unsafe"
-
-func MyHello(msg string) {
-	c_msg := C.CString(msg)
-	defer C.free(unsafe.Pointer(c_msg))
-	C.my_c_hello(c_msg)
-}

demos/go/my-c-lib/includes/my-c-lib.h

@@ -1,7 +0,0 @@
-#ifndef MY_C_LIB_H
-#define MY_C_LIB_H 1
-
-void my_c_hello(const char *msg);
-void my_c_bye(const char *msg);
-
-#endif

demos/go/my-c-lib/src/foo.c

@@ -1,15 +0,0 @@
-/* simple C library to exercize CGO */
-
-#include <stdio.h>
-#include "my-c-lib.h"
-
-void my_c_hello(const char *msg)
-{
-  fprintf(stdout, msg);
-}
-
-void my_c_bye(const char *msg)
-{
-  fprintf(stdout, msg);
-}
-

demos/go/my-cgo-test.go

@@ -1,10 +0,0 @@
-package main
-
-import "foo"
-
-func main() {
-	foo.MyHello("hello from my-c-lib\n")
-	foo.MyBye("bye from my-c-lib\n")
-}
-
-// EOF

demos/go/other/a.go

@@ -1,11 +0,0 @@
-// By: Tom Wambold <tom5760@gmail.com>
-package other
-
-import "math"
-
-// A three-value vector (i, j, k)
-type Vector3 [3]float64
-
-func (a *Vector3) Size() float64 {
-    return math.Sqrt(float64(a[0] * a[0] + a[1] * a[1] + a[2] * a[2]));
-}

demos/go/other/b.go

@@ -1,6 +0,0 @@
-package other
-
-type Foo interface {
-    Get(i int, j int) float64;
-    Set(i int, j int, v float64);
-}

demos/go/pi.go

@@ -1,104 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    * 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.
-
-    * Neither the name of "The Computer Language Benchmarks Game" nor the
-    name of "The Computer Language Shootout Benchmarks" nor the names of
-    its contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-*/
-
-/* The Computer Language Benchmarks Game
- * http://shootout.alioth.debian.org/
- *
- * contributed by The Go Authors.
- * based on pidigits.c (by Paolo Bonzini & Sean Bartlett,
- *                      modified by Michael Mellor)
- */
-
-package main
-
-import (
-	big "gmp"
-	"fmt"
-	"runtime"
-)
-
-var (
-	tmp1  = big.NewInt(0)
-	tmp2  = big.NewInt(0)
-	numer = big.NewInt(1)
-	accum = big.NewInt(0)
-	denom = big.NewInt(1)
-	ten   = big.NewInt(10)
-)
-
-func extractDigit() int64 {
-	if big.CmpInt(numer, accum) > 0 {
-		return -1
-	}
-	tmp1.Lsh(numer, 1).Add(tmp1, numer).Add(tmp1, accum)
-	big.DivModInt(tmp1, tmp2, tmp1, denom)
-	tmp2.Add(tmp2, numer)
-	if big.CmpInt(tmp2, denom) >= 0 {
-		return -1
-	}
-	return tmp1.Int64()
-}
-
-func nextTerm(k int64) {
-	y2 := k*2 + 1
-	accum.Add(accum, tmp1.Lsh(numer, 1))
-	accum.Mul(accum, tmp1.SetInt64(y2))
-	numer.Mul(numer, tmp1.SetInt64(k))
-	denom.Mul(denom, tmp1.SetInt64(y2))
-}
-
-func eliminateDigit(d int64) {
-	accum.Sub(accum, tmp1.Mul(denom, tmp1.SetInt64(d)))
-	accum.Mul(accum, ten)
-	numer.Mul(numer, ten)
-}
-
-func main() {
-	i := 0
-	k := int64(0)
-	for {
-		d := int64(-1)
-		for d < 0 {
-			k++
-			nextTerm(k)
-			d = extractDigit()
-		}
-		eliminateDigit(d)
-		fmt.Printf("%c", d+'0')
-
-		if i++; i%50 == 0 {
-			fmt.Printf("\n")
-			if i >= 1000 {
-				break
-			}
-		}
-	}
-
-	fmt.Printf("\n%d calls; bit sizes: %d %d %d\n", runtime.Cgocalls(), numer.Len(), accum.Len(), denom.Len())
-}

demos/go/stdio/chain.go

@@ -1,43 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Pass numbers along a chain of threads.
-
-package main
-
-import (
-	"runtime"
-	"cgo/stdio"
-	"strconv"
-)
-
-const N = 10
-const R = 5
-
-func link(left chan<- int, right <-chan int) {
-	// Keep the links in dedicated operating system
-	// threads, so that this program tests coordination
-	// between pthreads and not just goroutines.
-	runtime.LockOSThread()
-	for {
-		v := <-right
-		stdio.Stdout.WriteString(strconv.Itoa(v) + "\n")
-		left <- 1 + v
-	}
-}
-
-func main() {
-	leftmost := make(chan int)
-	var left chan int
-	right := leftmost
-	for i := 0; i < N; i++ {
-		left, right = right, make(chan int)
-		go link(left, right)
-	}
-	for i := 0; i < R; i++ {
-		right <- 0
-		x := <-leftmost
-		stdio.Stdout.WriteString(strconv.Itoa(x) + "\n")
-	}
-}

demos/go/stdio/fib.go

@@ -1,47 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Compute Fibonacci numbers with two goroutines
-// that pass integers back and forth.  No actual
-// concurrency, just threads and synchronization
-// and foreign code on multiple pthreads.
-
-package main
-
-import (
-	"runtime"
-	"cgo/stdio"
-	"strconv"
-)
-
-func fibber(c, out chan int64, i int64) {
-	// Keep the fibbers in dedicated operating system
-	// threads, so that this program tests coordination
-	// between pthreads and not just goroutines.
-	runtime.LockOSThread()
-
-	if i == 0 {
-		c <- i
-	}
-	for {
-		j := <-c
-		stdio.Stdout.WriteString(strconv.Itoa64(j) + "\n")
-		out <- j
-		<-out
-		i += j
-		c <- i
-	}
-}
-
-func main() {
-	c := make(chan int64)
-	out := make(chan int64)
-	go fibber(c, out, 0)
-	go fibber(c, out, 1)
-	<-out
-	for i := 0; i < 90; i++ {
-		out <- 1
-		<-out
-	}
-}

demos/go/stdio/file.go

@@ -1,44 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-A trivial example of wrapping a C library in Go.
-For a more complex example and explanation,
-see ../gmp/gmp.go.
-*/
-
-package stdio
-
-/*
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-char* greeting = "hello, world";
-*/
-import "C"
-import "unsafe"
-
-type File C.FILE
-
-var Stdout = (*File)(C.stdout)
-var Stderr = (*File)(C.stderr)
-
-// Test reference to library symbol.
-// Stdout and stderr are too special to be a reliable test.
-var myerr = C.sys_errlist
-
-func (f *File) WriteString(s string) {
-	p := C.CString(s)
-	C.fputs(p, (*C.FILE)(f))
-	C.free(unsafe.Pointer(p))
-	f.Flush()
-}
-
-func (f *File) Flush() {
-	C.fflush((*C.FILE)(f))
-}
-
-var Greeting = C.GoString(C.greeting)

demos/go/stdio/hello.go

@@ -1,11 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import "cgo/stdio"
-
-func main() {
-	stdio.Stdout.WriteString(stdio.Greeting + "\n")
-}

demos/go/wscript

@@ -1,147 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-# Tom Wambold tom5760 gmail
-# Thomas Nagy, 2010 (ita)
-
-"""
-if libgmp is present, try building with 'waf --exe'
-"""
-
-top = '.'
-out = 'build'
-
-def options(opt):
-	opt.add_option('--exe', action='store_true', default=False, help='Execute the program after it is compiled')
-
-def configure(ctx):
-	ctx.load('go')
-
-	# the compiler keeps changing, think twice before trying it for a serious project
-	ctx.env.TRY_CGO = False
-
-	return
-	try:
-		ctx.load('gcc')
-		ctx.check_cc(fragment='#include <gmp.h>\nint main() {return 0;}\n', uselib_store='GMP', lib='gmp')
-	except ctx.errors.ConfigurationError:
-		ctx.env.TRY_CGO = False
-	else:
-		ctx.env.TRY_CGO = True
-
-def build(ctx):
-
-	ctx(
-		features = 'go gopackage',
-		target   = 'other',
-		source   = [
-			'other/a.go',
-			'other/b.go', # gopack sux
-		],
-	)
-
-	ctx(
-		features = 'go goprogram',
-		target   = 'test',
-		use      = 'other',
-		source   = 'main.go',
-		includes = '.',
-	)
-
-	# NOTE: if you use ant_glob, use it like this:     bld.path.ant_glob('*.go', excl='*_test.go')
-
-	if ctx.env.TRY_CGO:
-		ctx.read_shlib('gmp')
-		ctx(
-			features = 'c cshlib',
-			source   = 'my-c-lib/src/foo.c',
-			target   = 'my-c-lib',
-			includes = 'my-c-lib/includes',
-			export_includes=['my-c-lib/includes'],
-			)
-		ctx(
-			features = 'cgopackage',
-			name     = 'go-gmp',
-			target   = 'gmp',
-			source   = 'gmp.go gmp/impl.go',
-			use      = 'gmp',
-			)
-
-		# testing multiple cgopackage targets...
-		ctx(
-			features = 'cgopackage',
-			name     = 'go-stdio',
-			target   = 'cgo/stdio',
-			source   = 'stdio/file.go',
-			)
-
-		ctx(
-			features = 'cgopackage',
-			name     = 'go-my-c-lib',
-			target   = 'foo',
-			source   = 'my-c-lib.go my-c-lib-2.go',
-			use      = ['my-c-lib',],
-			)
-
-		#ctx.add_group()
-		ctx(features='go goprogram uselib',
-			source='pi.go',
-			target='pi',
-			use='go-gmp',
-			#gocflags=['-I.', '-I..'],
-			)
-
-		ctx(
-			features='go goprogram uselib',
-			source='stdio/hello.go',
-			target='go-stdio-hello',
-			use='go-stdio',
-			)
-
-		ctx(
-			features='go goprogram uselib',
-			source='stdio/fib.go',
-			target='go-stdio-fib',
-			use='go-stdio',
-			)
-
-		ctx(
-			features='go goprogram uselib',
-			source='stdio/chain.go',
-			target='go-stdio-chain',
-			use='go-stdio',
-			)
-
-		ctx(
-			features='go goprogram uselib',
-			source='my-cgo-test.go',
-			target='my-cgo-test',
-			use='go-my-c-lib',
-			)
-
-	from waflib import Options, Utils
-	if ctx.env.TRY_CGO and Options.options.exe:
-		def exe_pi(bld):
-			p = Utils.subprocess.Popen('LD_LIBRARY_PATH=build ./build/pi', shell=True)
-			p.wait()
-		ctx.add_post_fun(exe_pi)
-
-		def exe_hello(bld):
-			p = Utils.subprocess.Popen('LD_LIBRARY_PATH=build ./build/go-stdio-hello', shell=True)
-			p.wait()
-		ctx.add_post_fun(exe_hello)
-
-		def exe_fib(bld):
-			p = Utils.subprocess.Popen('LD_LIBRARY_PATH=build ./build/go-stdio-fib', shell=True)
-			p.wait()
-		ctx.add_post_fun(exe_fib)
-
-		def exe_chain(bld):
-			p = Utils.subprocess.Popen('LD_LIBRARY_PATH=build ./build/go-stdio-chain', shell=True)
-			p.wait()
-		ctx.add_post_fun(exe_chain)
-
-		def exe_mycgolib(bld):
-			p = Utils.subprocess.Popen('LD_LIBRARY_PATH=build ./build/my-cgo-test', shell=True)
-			p.wait()
-		ctx.add_post_fun(exe_mycgolib)
-

demos/intltool/data/wscript

@@ -4,17 +4,20 @@ from waflib import Utils
 
 def build(bld):
 
-	if bld.cmd == 'install':
+	def post_update(bld):
 		try:
 			bld.exec_command(["update-mime-database", Utils.subst_vars("${DATADIR}/mime", bld.env)])
 			bld.exec_command(["update-desktop-database", Utils.subst_vars("${DATADIR}/applications", bld.env)])
-		except:
+		except Exception:
 			pass
 
+	if bld.cmd == 'install':
+		bld.add_post_fun(post_update)
+
 	bld(
 		features  = "intltool_in",
 		podir     = "../po",
-		flags     = ["-d", "-q", "-u", "-c"],
+		style     = "desktop",
 		source    = 'kupfer.desktop.in',
 		target    = 'kupfer.desktop',
 		install_path = "${DATADIR}/applications",
@@ -23,7 +26,7 @@ def build(bld):
 	bld(
 		features  = "intltool_in",
 		podir     = "../po",
-		flags     = ["-x", "-q", "-u", "-c"],
+		style     = "xml",
 		source    = 'kupfer-mimetypes.xml.in',
 		target    = 'kupfer-mimetypes.xml',
 		install_path = "${DATADIR}/mime/packages/",

demos/java/animals/wscript

@@ -8,7 +8,7 @@ def build(bld):
 
 		# javac
 		srcdir    = 'src',
-		compat    = '1.5',
+		compat    = '1.7',
 
 		# jar
 		basedir   = '.',

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/cats/wscript

@@ -4,7 +4,7 @@ def build(bld):
 
 	bld(features  = 'javac',
 		srcdir    = 'src',
-		compat    = '1.5',
+		compat    = '1.7',
 		use       = 'animals',
 		name      = 'cats-src',
 	)

demos/java/wscript

@@ -36,10 +36,10 @@ def build(bld):
 	bld(features   = 'javac jar javadoc',
 		srcdir     = 'src/', # folder containing the sources to compile
 		outdir     = 'src', # folder where to output the classes (in the build directory)
-		compat     = '1.3', # java compatibility version number
+		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,18 +21,19 @@ 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(
-		features      = 'c cprogram',
-		target        = 'MacApp',
-		source        = 'sources/main.m',
-		mac_app       = True,
-		mac_plist     = 'Info.plist',
-		mac_resources = 'resources/MainMenu.nib resources/MacApp.icns',
-		use           = 'COCOA',
-		install_path  = '${PREFIX}',
+		features       = 'c cprogram',
+		target         = 'MacApp',
+		source         = 'sources/main.m',
+		mac_app        = True,
+		mac_plist      = 'Info.plist',
+		mac_files      = bld.path.ant_glob('resources/**'),
+		mac_files_root = 'resources',
+		use            = 'COCOA',
+		install_path   = '${PREFIX}',
 	)
 
 	return

demos/pch/subdir/all.h

@@ -1 +0,0 @@
-#include "w.h"

demos/pch/w.h

@@ -1 +0,0 @@
-#warning testpch

demos/pch/wscript

@@ -1,53 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-# Thomas Nagy, 2006 (ita)
-
-"""
-for some obscure reason, the precompiled header will not be taken if
-all.h is in the same directory as main.cpp
-we recommend to add the header to compile in a separate directory without any sources
-
-Note: the #warning will come once when the .h is compiled, it will not come when the .cpp is compiled
-Note: do not forget to set the include paths (include=...)
-"""
-
-from waflib.TaskGen import feature, after
-from waflib.Task import Task
-from waflib.Tools import c_preproc
-
-@feature('cxx')
-@after('apply_link')
-def process_pch(self):
-	if getattr(self, 'pch', ''):
-		nodes = self.to_nodes(self.pch)
-		for x in nodes:
-			self.create_task('gchx', x, x.change_ext('.h.gch'))
-
-class gchx(Task):
-	run_str = '${CXX} ${CXXFLAGS} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${CPPPATH_ST:INCPATHS} ${DEFINES_ST:DEFINES} ${CXX_SRC_F}${SRC} ${CXX_TGT_F}${TGT}'
-	scan    = c_preproc.scan
-	ext_out = ['.h']
-	color   = 'BLUE'
-from waflib.Task import update_outputs
-update_outputs(gchx)
-
-#################################################
-# example below
-
-VERSION='0.0.1'
-APPNAME='pch_test'
-
-top = '.'
-out = 'build'
-
-def configure(conf):
-	conf.load('g++')
-
-def build(bld):
-	bld.program(
-		source   = 'main.cpp',
-		includes = '. subdir',
-		target   = 'test',
-		pch      = 'subdir/all.h')
-
-

demos/precious/wscript

@@ -23,8 +23,7 @@ def build(bld):
 		#rule = '''echo -e "#include <stdio.h>\\nint main(){ printf(\\"%%d\\", $$RANDOM); return 0;}" > ${TGT}''',
 		rule = fun,
 		target = node,
-		always = True,
-		update_outputs = True)
+		always = True)
 
 	bld.program(
 		source = 'precious.c',

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

@@ -29,9 +29,15 @@ def configure(conf):
 
 def build(bld):
 
-	# first compile a few pyc and pyo files (set install_path=None to disable the installation...)
+	# first compile a few pyc and pyo files (set install_path=None to disable the installation,
+	# by default install_path is set to ${PYTHONDIR})
 	bld(features='py', source=bld.path.ant_glob('*.py'), install_from='.')
 
+	# example for generated python files
+	target = bld.path.find_or_declare('abc.py')
+	bld(rule='touch ${TGT}', source='wscript', target=target)
+	bld(features='py', source=[target], install_from=target.parent)
+
 	# then a c extension module
 	bld(
 		features = 'c cshlib pyext',
@@ -44,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

@@ -0,0 +1,38 @@
+// Thomas Nagy, 2011-2016
+
+#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 {
+        Q_OBJECT
+        signals:
+                void test();
+        public:
+                Bar_private();
+};
+
+Bar_private::Bar_private() : QWidget(NULL) {
+}
+
+#include "foo.moc"
+

demos/qt5/foo.h

@@ -0,0 +1,23 @@
+// Thomas Nagy, 2011-2016
+
+#ifndef _FOO
+#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

@@ -0,0 +1,27 @@
+// Thomas Nagy, 2016 (ita)
+
+#include <QApplication>
+//#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);
+    Foo window;
+    Ui::Form ui;
+    ui.setupUi(&window);
+    window.show();
+    return app.exec();
+/*
+    MainWindow window;
+    if (argc == 2)
+        window.openFile(argv[1]);
+    else
+        window.openFile(":/files/bubbles.svg");
+    window.show();
+    return app.exec();
+*/
+}

demos/qt5/res.qrc

@@ -0,0 +1,7 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+<qresource>
+    <file alias="logo.svg">../../docs/slides/presentation/gfx/waflogo.svg</file>
+</qresource>
+</RCC>
+

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

@@ -0,0 +1,88 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# Thomas Nagy, 2016 (ita)
+# Federico Pellegrin, 2019 (fedepell)
+
+VERSION='0.0.1'
+APPNAME='qt5_test'
+
+top = '.'
+out = 'build'
+
+def options(opt):
+	opt.load('compiler_cxx qt5 waf_unit_test')
+
+def configure(conf):
+	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
+	#			    add the resulting moc_foo.cpp to the source files
+	#   Qt classes in foo.cpp -> include foo.moc at the end of foo.cpp
+	#
+	bld(
+		features = 'qt5 cxx cxxprogram',
+		use      = 'QT5CORE QT5GUI QT5SVG QT5WIDGETS',
+		source   = 'main.cpp res.qrc but.ui foo.cpp',
+		moc      = 'foo.h',
+		target   = 'window',
+		includes = '.',
+		lang     = bld.path.ant_glob('linguist/*.ts'),
+		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/subst/foo.in

@@ -1,2 +1,2 @@
-prefix: @PREFIX@
+prefix: %PREFIX%
 bindir: @BINDIR@

demos/subst/test.pc.in

@@ -3,3 +3,4 @@ Description: ПРИЛОЖЕНИЕ
 Version: @VERSION@
 Libs: -L${libdir} -lgnaa @LIBS@ @XPM_LIBS@ @LIBICONV@
 Cflags: -I${includedir} @XPM_CFLAGS@
+extra: @INTVAR@

demos/subst/wscript

@@ -4,6 +4,7 @@
 top = '.'
 out = 'bin'
 
+import os, re
 from waflib import Utils
 
 def configure(conf):
@@ -12,16 +13,17 @@ def configure(conf):
 def build(bld):
 
 	# the test.pc.in is a special case which is always handled
-	bld(source='test.pc.in', VERSION='1.1', LIBS='moo', XPM_LIBS='-lxpm', LIBICONV='-liconv', XPM_CFLAGS='-O3')
+	bld(source='test.pc.in', VERSION='1.1', LIBS='moo', XPM_LIBS='-lxpm', LIBICONV='-liconv', XPM_CFLAGS='-O3', INTVAR=12)
 
 	tg = bld(
 		features     = 'subst', # the feature 'subst' overrides the source/target processing
 		source       = 'foo.in', # list of string or nodes
 		target       = 'foo.txt', # list of strings or nodes
-		encoding     = 'ascii', # file encoding for python3, default is ISO8859-1
+		encoding     = 'ascii', # file encoding for python3, default is latin-1
 		install_path = '/tmp/uff/', # installation path, optional
 		chmod        = Utils.O755, # installation mode, optional
 		PREFIX       = bld.env.PREFIX, # variables to use in the substitution
+		re_m4        = re.compile('%%(\w+)%%', re.M), # custom substitution
 		BINDIR       = bld.env.BINDIR)
 
 	# if you are using an external dict, here is to merge the key/values:
@@ -31,8 +33,27 @@ def build(bld):
 	# if you want a file copy, pass "is_copy=True"
 	bld(features='subst', source='wscript', target='wscript', is_copy=True)
 
+	# same thing with a simple function
+	def fun(task, text):
+		return text
+	bld(features='subst', subst_fun=fun, source='wscript', target='wscript2')
+
+	def hlink(task):
+		try:
+			link = os.link
+		except AttributeError:
+			task.outputs[0].write(task.inputs[0].read('rb'), 'wb')
+		else:
+			for x, y in zip(task.inputs, task.outputs):
+				try:
+					os.remove(y.abspath())
+				except OSError:
+					pass
+				os.link(x.abspath(), y.abspath())
+	bld(features='subst', fun=hlink, source='wscript', target='wscript3')
+
 	# this one is just a reminder that simple files can be created (and a test too)
-	#bld(rule='echo "การไฟ่" > ${TGT}', target='foo.txt')
+	bld(rule='echo "การไฟ่" > ${TGT}', target='uni.txt')
 
 	# and this is an alternate syntax
 	#@bld.rule(source='wscript', target='wscript2')

demos/tex/src/conclusions.ltx

@@ -1,6 +1,6 @@
 \section{Conclusions}
 
 Hopefully, the text will create a sensible PostScript or \acronym{PDF} document.  That choice is
-made in the wscript file in this directory.  It perhas needs making into a command line option.
-Also there should be the possiblity of making both PostScript and \acronym{PDF} on the same run
+made in the wscript file in this directory.  It perhaps needs making into a command line option.
+Also there should be the possibility of making both PostScript and \acronym{PDF} on the same run
 -- at least if generating \acronym{PDF} from \acronym{DVI}.

demos/tex/src/document-glossaries.ltx

@@ -0,0 +1,41 @@
+\documentclass[a4paper,12pt]{article}
+\usepackage[toc,nonumberlist,numberedsection=autolabel]{glossaries}
+
+\title{A Test Document Using Glossaries For Waf Construction}
+\author{Joe Steeve}
+
+\makeglossaries
+\begin{document}
+
+\maketitle
+\tableofcontents
+
+% next line is broken after using a newer texlive version
+%\glossarystyle{altlist}
+
+%% The glossary entries
+\newglossaryentry{african}
+{
+  name={african},
+  description={The West African Swallow, Hirundo domicella}
+}
+
+\newglossaryentry{european}
+{
+  name={european},
+  description={The Barn or European Swallow, Hirundo rustica}
+}
+
+\section{The story}
+
+\begin{description}
+\item[Bridgekeeper:] What... is the air-speed velocity of an unladen
+  swallow?
+\item[King Arthur:] What do you mean? An \gls{african} or \gls{european} swallow?
+\end{description}
+
+%% This is the Glossary section
+\glsaddall
+\printglossaries
+
+\end{document}

demos/tex/src/wscript

@@ -11,12 +11,15 @@ def build(bld):
 	# now create your tex object for compiling the files
 	obj = bld(
 		features = 'tex',
-		type='latex', # default is pdflatex
+		type = 'latex', # default is pdflatex
 		source = 'document.ltx' # mandatory, the source
 	)
 
 	# 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.deps   = 'crossreferencing.ltx' # use this to give dependencies directly
+	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..
+	bld(features='tex', source='document-glossaries.ltx')
 

demos/tex/wscript

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 # encoding: utf-8
-# Thomas Nagy, 2005, 2010 (ita)
+# Thomas Nagy, 2005-2015 (ita)
 
 VERSION='1.0.0'
 APPNAME='tex_test'
@@ -12,6 +12,17 @@ def configure(conf):
 	conf.load('tex')
 	if not conf.env.PDFLATEX:
 		conf.fatal('could not find the program pdflatex')
+	if not conf.env.MAKEGLOSSARIES:
+		conf.fatal('could not find the program makeglossaries which is absolutely required for this example')
+
+
+	# and example of a complex configuration test
+	def build_latex_test(bld):
+		def write_tex(tsk):
+			tsk.outputs[0].write(r'''\documentclass[a4paper,12pt]{article}  \usepackage{ucs}  \begin{document} test \end{document} ''')
+		bld(rule=write_tex, target='main.tex')
+		bld(features='tex', type='pdflatex', source='main.tex', prompt=0)
+	conf.test(build_fun=build_latex_test, msg='Checking for UCS', okmsg='ok', errmsg='ucs.sty is missing install latex-extras')
 
 def build(bld):
 	bld.recurse('src')