import Build, os, Options, Task, Utils, cc, TaskGen
from Configure import conf
from Logs import debug
+from samba_utils import SUBST_VARS_RECURSIVE
# bring in the other samba modules
from samba_optimisation import *
from samba_autoproto import *
from samba_python import *
from samba_deps import *
+import samba_conftests
LIB_PATH="shared"
-
+os.putenv('PYTHONUNBUFFERED', '1')
#################################################################
# create the samba build environment
group='main',
depends_on='',
local_include=True,
+ vars=None,
install_path=None,
install=True,
enabled=True):
SET_TARGET_TYPE(bld, libname, 'DISABLED')
return
+ source = bld.EXPAND_VARIABLES(source, vars=vars)
+
# remember empty libraries, so we can strip the dependencies
if (source == '') or (source == []):
SET_TARGET_TYPE(bld, libname, 'EMPTY')
return
- if not SET_TARGET_TYPE(bld, libname, 'LIBRARY'):
- return
-
- obj_target = libname + '.objlist'
+ if bld.env.DISABLE_SHARED:
+ obj_target = libname
+ else:
+ obj_target = libname + '.objlist'
# first create a target for building the object files for this library
# by separating in this way, we avoid recompiling the C files
depends_on = depends_on,
local_include = local_include)
+ if bld.env.DISABLE_SHARED:
+ return
+
+ if not SET_TARGET_TYPE(bld, libname, 'LIBRARY'):
+ return
+
# the library itself will depend on that object target
deps += ' ' + public_deps
deps = TO_LIST(deps)
samba_includes = includes,
local_include = local_include,
vnum = vnum,
- install_path = None
+ install_path = None,
+ ldflags = build_rpath(bld)
)
if install_path is None:
- install_path = '${PREFIX}/lib'
+ install_path = '${LIBDIR}'
+ install_path = SUBST_VARS_RECURSIVE(install_path, bld.env)
- if install:
+ # we don't need the double libraries if rpath is off
+ if (bld.env.RPATH_ON_INSTALL == False and
+ bld.env.RPATH_ON_BUILD == False):
+ install_target = libname
+ else:
+ install_target = libname + '.inst'
+
+ if install and install_target != libname:
# create a separate install library, which may have
# different rpath settings
- SET_TARGET_TYPE(bld, libname + '.inst', 'LIBRARY')
+ SET_TARGET_TYPE(bld, install_target, 'LIBRARY')
t = bld(
features = 'cc cshlib',
source = [],
- target = libname + '.inst',
+ target = install_target,
samba_cflags = CURRENT_CFLAGS(bld, libname, cflags),
depends_on = depends_on,
samba_deps = deps,
vnum = vnum,
install_as = libname,
install_path = None,
+ ldflags = install_rpath(bld)
)
- t.env['RPATH'] = install_rpath(bld)
+ if install:
if vnum:
vnum_base = vnum.split('.')[0]
install_name = 'lib%s.so.%s' % (libname, vnum)
if install_link:
bld.symlink_as(os.path.join(install_path, install_link), install_name)
-
if autoproto is not None:
bld.SAMBA_AUTOPROTO(autoproto, source)
local_include=True,
subsystem_name=None,
needs_python=False,
+ vars=None,
install=True,
install_path=None):
obj_target = binname + '.objlist'
+ source = bld.EXPAND_VARIABLES(source, vars=vars)
+
# first create a target for building the object files for this binary
# by separating in this way, we avoid recompiling the C files
# separately for the install binary and the build binary
samba_modules = modules,
top = True,
samba_subsystem= subsystem_name,
- install_path = None
+ install_path = None,
+ ldflags = build_rpath(bld)
)
if install_path is None:
- install_path = '${PREFIX}/bin'
+ install_path = '${BINDIR}'
+ install_path = SUBST_VARS_RECURSIVE(install_path, bld.env)
- if install:
+ # we don't need the double binaries if rpath is off
+ if (bld.env.RPATH_ON_INSTALL == False and
+ bld.env.RPATH_ON_BUILD == False):
+ install_target = binname
+ else:
+ install_target = binname + '.inst'
+
+ if install and install_target != binname:
# we create a separate 'install' binary, which
# will have different rpath settings
- SET_TARGET_TYPE(bld, binname + '.inst', 'BINARY')
+ SET_TARGET_TYPE(bld, install_target, 'BINARY')
t = bld(
features = features,
source = [],
- target = binname + '.inst',
+ target = install_target,
samba_cflags = CURRENT_CFLAGS(bld, binname, cflags),
samba_deps = deps,
samba_includes = includes,
samba_modules = modules,
top = True,
samba_subsystem= subsystem_name,
- install_path = None
+ install_path = None,
+ ldflags = install_rpath(bld)
)
- t.env['RPATH'] = install_rpath(bld)
+ if install:
bld.install_as(os.path.join(install_path, binname),
- binname + '.inst',
+ install_target,
chmod=0755)
# setup the subsystem_name as an alias for the real
cflags='',
internal_module=True,
local_include=True,
+ vars=None,
enabled=True):
- if internal_module:
+ # we add the init function regardless of whether the module
+ # is enabled or not, as we need to generate a null list if
+ # all disabled
+ bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
+
+ if internal_module or bld.env.DISABLE_SHARED:
# treat internal modules as subsystems for now
SAMBA_SUBSYSTEM(bld, modname, source,
deps=deps,
cflags=cflags,
local_include=local_include,
enabled=enabled)
- # even though we're treating it as a subsystem, we need to
- # add it to the init_function list
- # TODO: we should also create an implicit dependency
- # between the subsystem target and this target
- if enabled:
- bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
return
if not enabled:
SET_TARGET_TYPE(bld, modname, 'DISABLED')
return
+ source = bld.EXPAND_VARIABLES(source, vars=vars)
+
# remember empty modules, so we can strip the dependencies
if (source == '') or (source == []):
SET_TARGET_TYPE(bld, modname, 'EMPTY')
if not SET_TARGET_TYPE(bld, modname, 'MODULE'):
return
-
- bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
-
if subsystem is not None:
deps += ' ' + subsystem
local_include_first=True,
subsystem_name=None,
enabled=True,
+ vars=None,
needs_python=False):
if not enabled:
if not SET_TARGET_TYPE(bld, modname, 'SUBSYSTEM'):
return
+ source = bld.EXPAND_VARIABLES(source, vars=vars)
+
deps += ' ' + public_deps
bld.SET_BUILD_GROUP(group)
def SAMBA_GENERATOR(bld, name, rule, source, target,
- group='build_source'):
+ group='build_source', enabled=True,
+ vars=None):
'''A generic source generator target'''
if not SET_TARGET_TYPE(bld, name, 'GENERATOR'):
return
+ if not enabled:
+ return
+
bld.SET_BUILD_GROUP(group)
bld(
rule=rule,
- source=source,
+ source=bld.EXPAND_VARIABLES(source, vars=vars),
target=target,
+ shell=True,
+ on_results=True,
before='cc',
- ext_out='.c')
+ ext_out='.c',
+ name=name)
Build.BuildContext.SAMBA_GENERATOR = SAMBA_GENERATOR
bld.p_ln = bld.srcnode # we do want to see all targets!
bld.env['USING_BUILD_GROUPS'] = True
bld.add_group('setup')
+ bld.add_group('build_compiler_source')
bld.add_group('base_libraries')
bld.add_group('build_compilers')
bld.add_group('build_source')
# handle the creation of links for libraries and binaries
# note that we use a relative symlink path to allow the whole tree
# to me moved/copied elsewhere without breaking the links
-t = Task.simple_task_type('symlink_lib', 'ln -sf ${LINK_SOURCE} ${LINK_TARGET}',
- color='PINK', ext_in='.bin')
+t = Task.simple_task_type('symlink_lib', 'rm -f ${LINK_TARGET} && ln -s ${LINK_SOURCE} ${LINK_TARGET}',
+ shell=True, color='PINK', ext_in='.bin')
t.quiet = True
@feature('symlink_lib')
self.name, tsk.env.LINK_SOURCE, tsk.env.LINK_TARGET)
-t = Task.simple_task_type('symlink_bin', 'ln -sf ${SRC} ${BIN_TARGET}',
- color='PINK', ext_in='.bin')
+t = Task.simple_task_type('symlink_bin', 'rm -f ${BIN_TARGET} && ln -s ${SRC} ${BIN_TARGET}',
+ shell=True, color='PINK', ext_in='.bin')
t.quiet = True
@feature('symlink_bin')
-t = Task.simple_task_type('copy_script', 'ln -sf ${SRC[0].abspath(env)} ${LINK_TARGET}',
- color='PINK', ext_in='.bin', shell=True)
+t = Task.simple_task_type('copy_script', 'rm -f ${LINK_TARGET} && ln -s ${SRC[0].abspath(env)} ${LINK_TARGET}',
+ shell=True, color='PINK', ext_in='.bin')
t.quiet = True
@feature('copy_script')
git.samba.org / nivanova / samba-autobuild / .git / blobdiff