mirror of https://gitlab.com/ita1024/waf.git
docs and cosmetic changes
This commit is contained in:
parent
fb815d0c8a
commit
5de226d7ac
|
@ -1,39 +1,33 @@
|
||||||
#! /usr/bin/env python
|
#! /usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
# Thomas Nagy, 2006-2011 (ita)
|
# Thomas Nagy, 2006-2012 (ita)
|
||||||
|
|
||||||
|
# A test script for the network cache
|
||||||
|
|
||||||
# the following two variables are used by the target "waf dist"
|
|
||||||
APPNAME='cc_test'
|
APPNAME='cc_test'
|
||||||
|
|
||||||
srcdir = '.'
|
top = '.'
|
||||||
blddir = 'build'
|
out = 'build'
|
||||||
|
|
||||||
def set_options(opt):
|
def options(opt):
|
||||||
#opt.tool_options('compiler_cc')
|
#opt.tool_options('compiler_c')
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def configure(conf):
|
def configure(conf):
|
||||||
#conf.check_tool('compiler_cc')
|
#conf.check_tool('compiler_c')
|
||||||
conf.check_tool('gcc')
|
conf.check_tool('gcc')
|
||||||
conf.check_tool('netcache_client')
|
conf.check_tool('netcache_client')
|
||||||
|
|
||||||
def build(bld):
|
def build(bld):
|
||||||
|
bld(
|
||||||
# 1. A simple program
|
features = 'c cprogram',
|
||||||
bld.new_task_gen(
|
|
||||||
features = 'cc cprogram',
|
|
||||||
source = 'main.c',
|
source = 'main.c',
|
||||||
target = 'test_c_app',
|
target = 'test_c_app',
|
||||||
uselib_local = 'my_static_lib',
|
uselib_local = 'my_static_lib',
|
||||||
includes = '. /usr/include')
|
includes = '. /usr/include')
|
||||||
|
|
||||||
# 2. A simple static lib
|
bld(
|
||||||
bld.new_task_gen(
|
features = 'c cstlib',
|
||||||
features = 'cc cstaticlib',
|
|
||||||
source = 'test_staticlib.c',
|
source = 'test_staticlib.c',
|
||||||
target='my_static_lib')
|
target='my_static_lib')
|
||||||
|
|
||||||
# if we had subfolder we would do the following
|
|
||||||
#bld.add_subdirs('src')
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -578,9 +578,12 @@ def load_tool(tool, tooldir=None):
|
||||||
:type tooldir: list
|
:type tooldir: list
|
||||||
:param tooldir: List of directories to search for the tool module
|
:param tooldir: List of directories to search for the tool module
|
||||||
"""
|
"""
|
||||||
tool = tool.replace('++', 'xx')
|
if tool == 'java':
|
||||||
tool = tool.replace('java', 'javaw')
|
tool = 'javaw' # jython
|
||||||
tool = tool.replace('compiler_cc', 'compiler_c')
|
elif tool == 'compiler_cc':
|
||||||
|
tool = 'compiler_c' # TODO remove in waf 1.8
|
||||||
|
else:
|
||||||
|
tool.replace('++', 'xx')
|
||||||
|
|
||||||
if tooldir:
|
if tooldir:
|
||||||
assert isinstance(tooldir, list)
|
assert isinstance(tooldir, list)
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
# Thomas Nagy, 2010 (ita)
|
# Thomas Nagy, 2010 (ita)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
This file is provided to enable compatibility with waf 1.5, it will be removed in waf 1.7
|
This file is provided to enable compatibility with waf 1.5
|
||||||
|
It was enabled by default in waf 1.6, but it is not used in waf 1.7
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
|
@ -69,7 +69,7 @@ def process_valadoc(self):
|
||||||
"""
|
"""
|
||||||
Generate API documentation from Vala source code with valadoc
|
Generate API documentation from Vala source code with valadoc
|
||||||
|
|
||||||
doc = bld.new_task_gen (
|
doc = bld(
|
||||||
features = 'valadoc',
|
features = 'valadoc',
|
||||||
output_dir = '../doc/html',
|
output_dir = '../doc/html',
|
||||||
package_name = 'vala-gtk-example',
|
package_name = 'vala-gtk-example',
|
||||||
|
|
Loading…
Reference in New Issue