Permalink
Browse files

Merge branch 'master' into test-boost-asio-timer

  • Loading branch information...
petya2164 committed Apr 7, 2017
2 parents 44114a5 + 97dffb5 commit dd620244bc67276e1bcf00f8d441fa5e8b2c655f
Showing with 97 additions and 96 deletions.
  1. +13 −2 .gitignore
  2. +7 −0 NEWS.rst
  3. +4 −4 buildbot.py
  4. +31 −35 config.py
  5. +31 −0 resolve.json
  6. +10 −10 waf
  7. +1 −45 wscript
View
@@ -11,12 +11,21 @@
*.la
*.a
# For projects that use Waf for building: http://code.google.com/p/waf/
# Python
*.pyc
# Compiled Doxygen documentation
/doxygen/html
# Waf files
waf-*
waf3-*
.waf-*
.waf3-*
.lock-*
build
bundle_dependencies
resolve_symlinks
resolved_dependencies
# Gnu Global tag files
GPATH
@@ -26,6 +35,7 @@ GTAGS
# Emacs temp / auto save
\#*#
*.#*
*~
#Eclipse ignore
@@ -45,4 +55,5 @@ local.properties
*.sdf
*.opensdf
*.log
*.vcxproj*
VSProjects
View
@@ -8,6 +8,13 @@ Latest
------
* tbd
11.0.0
------
* Major: Upgrade to waf-tools 4
* Major: Upgrade to boost 3
* Major: Upgrade to tables 7
* Minor: Upgrade to gtest 4
10.0.0
------
* Major: Upgrade to waf-tools 3
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
@@ -1,43 +1,34 @@
#!/usr/bin/env python
#!/usr/bin/env python
# encoding: utf-8
import os, sys, urllib2, traceback
import traceback
import sys
try:
input = raw_input
except NameError:
pass
project_name = 'gauge'
project_dependencies = \
[
'waf-tools',
'gtest',
'boost',
]
# Importing a dynamically generated module
# Python recipe from http://code.activestate.com/recipes/82234
def importCode(code,name,add_to_sys_modules=0):
"""
Import dynamically generated code as a module. code is the
object containing the code (a string, a file handle or an
actual compiled code object, same types as accepted by an
exec statement). The name is the name to give to the module,
and the final argument says wheter to add it to sys.modules
or not. If it is added, a subsequent import statement using
name will return this module. If it is not added to sys.modules
import will try to load it in the normal fashion.
import foo
[
'waf-tools',
'gtest',
'boost',
'tables',
]
is equivalent to
foofile = open("/path/to/foo.py")
foo = importCode(foofile,"foo",1)
Returns a newly generated module.
def importCode(code, name, add_to_sys_modules=0):
"""
Import dynamically generated code as a module.
Python recipe from http://code.activestate.com/recipes/82234
"""
import sys,imp
import imp
module = imp.new_module(name)
exec code in module.__dict__
exec(code, module.__dict__)
if add_to_sys_modules:
sys.modules[name] = module
@@ -50,22 +41,27 @@ def importCode(code,name,add_to_sys_modules=0):
url = "https://raw.github.com/steinwurf/steinwurf-labs/" \
"master/config_helper/config-impl.py"
try:
from urllib.request import urlopen, Request
except ImportError:
from urllib2 import urlopen, Request
try:
# Fetch the code file from the given url
req = urllib2.Request(url)
response = urllib2.urlopen(req)
req = Request(url)
response = urlopen(req)
code = response.read()
print("Update complete. Code size: {}\n".format(len(code)))
try:
# Import the code string as a module
mod = importCode(code,"config_helper")
mod = importCode(code, "config_helper")
# Run the actual config tool from the dynamic module
mod.config_tool(project_dependencies)
mod.config_tool(project_dependencies, project_name)
except:
print("Unexpected error:")
print traceback.format_exc()
print(traceback.format_exc())
except Exception as e:
print("Could not fetch code file from:\n\t{}".format(url))
print(e)
raw_input('Press ENTER to exit...')
input('Press ENTER to exit...')
View
@@ -0,0 +1,31 @@
[
{
"name": "waf-tools",
"resolver": "git",
"method": "semver",
"major": 4,
"sources": ["github.com/steinwurf/waf-tools.git"]
},
{
"name": "boost",
"resolver": "git",
"method": "semver",
"major": 3,
"sources": ["github.com/steinwurf/boost.git"]
},
{
"name": "tables",
"resolver": "git",
"method": "semver",
"major": 7,
"sources": ["github.com/steinwurf/tables.git"]
},
{
"name": "gtest",
"internal": true,
"resolver": "git",
"method": "semver",
"major": 4,
"sources": ["github.com/steinwurf/gtest.git"]
}
]
View
20 waf

Large diffs are not rendered by default.

Oops, something went wrong.
View
46 wscript
@@ -2,55 +2,11 @@
# encoding: utf-8
APPNAME = 'gauge'
VERSION = '10.0.0'
import waflib.extras.wurf_options
def options(opt):
opt.load('wurf_common_tools')
def resolve(ctx):
import waflib.extras.wurf_dependency_resolve as resolve
ctx.load('wurf_common_tools')
ctx.add_dependency(resolve.ResolveVersion(
name='waf-tools',
git_repository='github.com/steinwurf/waf-tools.git',
major=3))
ctx.add_dependency(resolve.ResolveVersion(
name='boost',
git_repository='github.com/steinwurf/boost.git',
major=2))
ctx.add_dependency(resolve.ResolveVersion(
name='tables',
git_repository='github.com/steinwurf/tables.git',
major=6))
# Internal dependencies
if ctx.is_toplevel():
ctx.add_dependency(resolve.ResolveVersion(
name='gtest',
git_repository='github.com/steinwurf/gtest.git',
major=3))
def configure(conf):
conf.load("wurf_common_tools")
VERSION = '11.0.0'
def build(bld):
bld.load("wurf_common_tools")
bld.env.append_unique(
'DEFINES_STEINWURF_VERSION',
'STEINWURF_GAUGE_VERSION="{}"'.format(VERSION))

0 comments on commit dd62024

Please sign in to comment.