sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

waf: Put private libraries in a separate directory when building.

Browse Source 
Thanks to Tridge for pointing out what exactly I had to change. :-)
This commit is contained in:
Jelmer Vernooij 2010-11-05 02:30:01 +01:00
parent 21233bba96
commit c9756cac05
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildtools/wafsamba/samba_install.py
View File

@ -160,7 +160,11 @@ def symlink_lib(self):
link_target = getattr(self, 'link_name', '')
if link_target == '':
link_target = '%s/%s' % (LIB_PATH, self.bld.make_libname(self.target, version=soext))
basename = self.bld.make_libname(self.target, version=soext)
if getattr(self, "private_library", False):
link_target = '%s/private/%s' % (LIB_PATH, basename)
else:
link_target = '%s/%s' % (LIB_PATH, basename)
link_target = os.path.join(blddir, link_target)

7
buildtools/wafsamba/samba_utils.py
View File

@ -76,11 +76,12 @@ def install_rpath(bld):
def build_rpath(bld):
'''the rpath value for build'''
rpath = os.path.normpath('%s/%s' % (bld.env.BUILD_DIRECTORY, LIB_PATH))
rpaths = [os.path.normpath('%s/%s' % (bld.env.BUILD_DIRECTORY, d)) for d in ("shared", "shared/private")]
bld.env['RPATH'] = []
if bld.env.RPATH_ON_BUILD:
return [rpath]
ADD_LD_LIBRARY_PATH(rpath)
return rpaths
for rpath in rpaths:
ADD_LD_LIBRARY_PATH(rpath)
return []

1
buildtools/wafsamba/wafsamba.py
View File

@ -56,6 +56,7 @@ def SAMBA_BUILD_ENV(conf):
'''create the samba build environment'''
conf.env.BUILD_DIRECTORY = conf.blddir
mkdir_p(os.path.join(conf.blddir, LIB_PATH))
mkdir_p(os.path.join(conf.blddir, LIB_PATH, "private"))
mkdir_p(os.path.join(conf.blddir, "modules"))
mkdir_p(os.path.join(conf.blddir, 'python/samba/dcerpc'))
# this allows all of the bin/shared and bin/python targets

1
source4/selftest/wscript
View File

@ -140,6 +140,7 @@ def cmd_testonly(opt):
# this is needed for systems without rpath, or with rpath disabled
ADD_LD_LIBRARY_PATH('bin/shared')
ADD_LD_LIBRARY_PATH('bin/shared/private')
# if we are using a system version of ldb then we need to tell it to
# load modules from our modules path

4
source4/wscript
View File

@ -156,7 +156,7 @@ def build(bld):
def pydoctor(ctx):
'''build python apidocs'''
cmd='LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba'
cmd='PYTHONPATH=bin/python pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba'
print("Running: %s" % cmd)
os.system(cmd)
@ -166,7 +166,7 @@ def wafdocs(ctx):
os.system('pwd')
list = recursive_dirlist('../buildtools/wafsamba', '.', pattern='*.py')
cmd='LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=wafsamba --project-url=http://www.samba.org --make-html --docformat=restructuredtext'
cmd='PYTHONPATH=bin/python pydoctor --project-name=wafsamba --project-url=http://www.samba.org --make-html --docformat=restructuredtext'
print(list)
for f in list:
cmd += ' --add-module %s' % f