Permalink
Browse files

Update waf + buildbot.py

  • Loading branch information...
petya2164 committed Mar 28, 2017
1 parent 8538e61 commit 543590e26dcb61a3c441dc52e90fab5b03b50897
Showing with 20 additions and 15 deletions.
  1. +7 −2 .gitignore
  2. +4 −4 buildbot.py
  3. +9 −9 waf
View
@@ -24,12 +24,15 @@
# Compiled Doxygen documentation
/doxygen/html
# For projects that use Waf for building: http://code.google.com/p/waf/
# Waf files
waf-*
waf3-*
.waf-*
.waf3-*
.lock-*
build
bundle_dependencies
resolve_symlinks
resolved_dependencies
# Gnu Global tag files
GPATH
@@ -39,6 +42,7 @@ GTAGS
# Emacs temp / auto save
\#*#
*.#*
*~
#Eclipse ignore
@@ -58,4 +62,5 @@ local.properties
*.sdf
*.opensdf
*.log
*.vcxproj*
VSProjects
View
@@ -34,13 +34,13 @@ def configure(properties):
if properties.get('build_distclean'):
command += ['distclean']
command += ['configure', '--git-protocol=git@']
command += ['configure', '--git_protocol=git@']
if 'waf_bundle_path' in properties:
command += ['--bundle-path=' + properties['waf_bundle_path']]
if 'waf_resolve_path' in properties:
command += ['--resolve_path=' + properties['waf_resolve_path']]
if 'dependency_project' in properties:
command += ['--{0}-use-checkout={1}'.format(
command += ['--{0}_checkout={1}'.format(
properties['dependency_project'],
properties['dependency_checkout'])]
View
18 waf

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit 543590e

Please sign in to comment.