2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 09:57:15 +01:00

removed the macro DLL_EXPORT for gcc/g++ on windows and cleaned up a few TODO entries

This commit is contained in:
Thomas Nagy 2012-04-07 10:54:40 +02:00
parent 19f6fb2595
commit 898872699d
9 changed files with 9 additions and 22 deletions

View File

@ -11,6 +11,7 @@ NEW IN WAF 1.7.0
* 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
NEW IN WAF 1.6.11
-----------------

View File

@ -729,11 +729,10 @@ class BuildContext(Context.Context):
"""
tasks = []
for tg in self.groups[idx]:
# TODO a try-except might be more efficient
if isinstance(tg, Task.TaskBase):
tasks.append(tg)
else:
try:
tasks.extend(tg.tasks)
except AttributeError: # not a task generator, can be the case for installation tasks
tasks.append(tg)
return tasks
def get_build_iterator(self):
@ -1171,7 +1170,7 @@ class CleanContext(BuildContext):
self.store()
def clean(self):
"""clean the data and some files in the build dir .. well, TODO"""
"""Remove files from the build directory if possible, and reset the caches"""
Logs.debug('build: clean called')
if self.bldnode != self.srcnode:

View File

@ -58,8 +58,6 @@ Ant patterns for files and folders to exclude while doing the
recursive traversal in :py:meth:`waflib.Node.Node.ant_glob`
"""
# TODO optimize split_path by performing a replacement when unpacking?
def split_path(path):
"""
Split a path by os.sep (This is not os.path.split)
@ -760,8 +758,8 @@ class Node(object):
def nice_path(self, env=None):
"""
Return the path seen from the launch directory. It is often used for printing nodes in the console to open
files easily.
Return the path seen from the launch directory.
Can be used for opening files easily (copy-paste in the console).
"""
return self.path_from(self.ctx.launch_node())

View File

@ -494,11 +494,11 @@ class Task(TaskBase):
def set_run_after(self, task):
"""
Run this task only after *task*. Affect :py:meth:`waflib.Task.runnable_status`
You probably want to use tsk.run_after.add(task) directly
:param task: task
:type task: :py:class:`waflib.Task.Task`
"""
# TODO: handle lists too?
assert isinstance(task, TaskBase)
self.run_after.add(task)

View File

@ -39,7 +39,6 @@ def configure(conf):
if conf.env.D:
conf.end_msg(conf.env.get_flat('D'))
conf.env['COMPILER_D'] = compiler
conf.env.D_COMPILER = conf.env.D # TODO remove this, left for compatibility
break
conf.end_msg(False)
else:

View File

@ -63,7 +63,7 @@ def d_hook(self, node):
return tsk
@taskgen_method
def generate_header(self, filename, install_path=None):
def generate_header(self, filename):
"""
See feature request #104::
@ -75,7 +75,6 @@ def generate_header(self, filename, install_path=None):
:param filename: header to create
:type filename: string
:param install_path: unused (TODO)
"""
try:
self.header_lst.append([filename, install_path])

View File

@ -13,11 +13,6 @@ INC_REGEX = """(?:^|['">]\s*;)\s*INCLUDE\s+(?:\w+_)?[<"'](.+?)(?=["'>])"""
USE_REGEX = """(?:^|;)\s*USE(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""
MOD_REGEX = """(?:^|;)\s*MODULE(?!\s*PROCEDURE)(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""
# TODO (DC)
# - handle pre-processed files (FORTRANPPCOM in scons)
# - handle multiple dialects
# TODO (ita) understand what the above is supposed to mean ^^
re_inc = re.compile(INC_REGEX, re.I)
re_use = re.compile(USE_REGEX, re.I)
re_mod = re.compile(MOD_REGEX, re.I)

View File

@ -80,8 +80,6 @@ def gcc_modifier_win32(conf):
v['CFLAGS_cshlib'] = []
v.append_value('CFLAGS_cshlib', ['-DDLL_EXPORT']) # TODO adding nonstandard defines like this DLL_EXPORT is not a good idea
# Auto-import is enabled by default even without this option,
# but enabling it explicitly has the nice effect of suppressing the rather boring, debug-level messages
# that the linker emits otherwise.

View File

@ -80,8 +80,6 @@ def gxx_modifier_win32(conf):
v['CXXFLAGS_cxxshlib'] = []
v.append_value('CXXFLAGS_cxxshlib', ['-DDLL_EXPORT']) # TODO adding nonstandard defines like this DLL_EXPORT is not a good idea
# Auto-import is enabled by default even without this option,
# but enabling it explicitly has the nice effect of suppressing the rather boring, debug-level messages
# that the linker emits otherwise.