F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More pc file fixes

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2011-09-20 14:09:37 +01:00
parent b150bebd81
commit 654372b4dd
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config-store/wscript
View File

@@ -43,14 +43,14 @@ def build(bld):
'model/model-typeid-creator.cc',
'model/display-functions.cc',
])
module.uselib = 'GTK_CONFIG_STORE'
module.use = 'GTK_CONFIG_STORE'
if bld.env['ENABLE_LIBXML2']:
module.source.append ('model/xml-config.cc')
if bld.env['ENABLE_GTK_CONFIG_STORE']:
module.uselib = module.uselib + ' LIBXML2'
module.use = module.use + ' LIBXML2'
else:
module.uselib = 'LIBXML2'
module.use = 'LIBXML2'
if bld.env['ENABLE_EXAMPLES']:
bld.add_subdirs('examples')

31
src/wscript
View File

@@ -313,12 +313,15 @@ def build(bld):
class ns3pcfile_task(Task.Task):
after = 'cc cxx'
def __str__(self):
"string to display to the user"
tgt_str = ' '.join([a.nice_path(self.env) for a in self.outputs])
return 'pcfile: %s\n' % (tgt_str)
def runnable_status(self):
return super(ns3pcfile_task, self).runnable_status()
def _self_libs(self, env, name, libdir):
if env['ENABLE_STATIC_NS3']:
path_st = 'STATICLIBPATH_ST'
@@ -332,6 +335,7 @@ class ns3pcfile_task(Task.Task):
env[lib_marker],
env[lib_st] % name]
return retval
def _lib(self, env, dep):
libpath = env['LIBPATH_%s' % dep]
linkflags = env['LINKFLAGS_%s' % dep]
@@ -343,34 +347,37 @@ class ns3pcfile_task(Task.Task):
for lib in libs:
retval.append(env['LIB_ST'] % lib)
return retval
def _listify(self, v):
if isinstance(v, list):
return v
else:
return [v]
def _cflags(self, dep):
flags = self.env['CFLAGS_%s' % dep]
return self._listify(flags)
def _cxxflags(self, dep):
return self._listify(self.env['CXXFLAGS_%s' % dep])
def _defines(self, dep):
defines = self.env['CCDEFINES_%s' % dep] + self.env['CXXDEFINES_%s' % dep]
return [self.env['CCDEFINES_ST'] % define for define in self.env['CCDEFINES_%s' % dep]] + \
[self.env['CXXDEFINES_ST'] % define for define in self.env['CXXDEFINES_%s' % dep]]
return [self.env['DEFINES_ST'] % define for define in self.env['DEFINES_%s' % dep]]
def _includes(self, dep):
includes = self.env['CPPPATH_%s' % dep]
includes = self.env['INCLUDES_%s' % dep]
return [self.env['CPPPATH_ST'] % include for include in includes]
def _generate_pcfile(self, name, uselib, use, env, outfilename):
outfile = open(outfilename, 'w')
def _generate_pcfile(self, name, use, env, outfilename):
outfile = open(outfilename, 'wt')
prefix = env.PREFIX
includedir = env.INCLUDEDIR
libdir = env.LIBDIR
libs = self._self_libs(self.env, name, '${libdir}')
libs = self._self_libs(env, name, '${libdir}')
for dep in use:
libs = libs + self._lib(self.env, dep)
for dep in uselib:
libs = libs + [self.env['LIB_ST'] % dep]
libs += self._lib(env, dep)
for dep in env.LIBS:
libs += self.env['LIB_ST'] % dep
cflags = [self.env['CPPPATH_ST'] % '${includedir}']
for dep in use:
cflags = cflags + self._cflags(dep) + self._cxxflags(dep) + \
@@ -391,8 +398,8 @@ Cflags: %s
def run(self):
output_filename = self.outputs[0].abspath()
self._generate_pcfile(self.module.name, self.module.uselib,
self.module.use,
self._generate_pcfile(self.module.name,
self.module.to_list(self.module.use),
self.env, output_filename)