update to waf-tools 2