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

s4-waf: fixed finding of buildtools and srcdir

Browse Source
This commit is contained in:
Andrew Tridgell 2010-04-04 11:40:05 +10:00
parent a884008797
commit 8dc8d31f4a
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/replace/wscript
View File

@ -5,16 +5,16 @@ VERSION = '1.2.1'
blddir = 'bin'
import sys, os
import sys, os, Utils
# find the buildtools directory
buildtools = 'buildtools ../../buildtools'
for d in buildtools.split():
if os.path.exists(d):
srcdir = os.path.dirname(d) or '.'
break
buildtools = 'buildtools'
while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5:
buildtools = '../' + buildtools
srcdir = os.path.dirname(buildtools) or '.'
sys.path.insert(0, buildtools + "/wafsamba")
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
import wafsamba, samba_dist
import Options, os, preproc

16
lib/talloc/wscript
View File

@ -5,16 +5,18 @@ VERSION = '2.0.2'
blddir = 'bin'
import os, sys
# find the buildtools directory
import os
buildtools = 'buildtools ../../buildtools'
for d in buildtools.split():
if os.path.exists(d):
srcdir = os.path.dirname(d) or '.'
break
buildtools = 'buildtools'
while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5:
buildtools = '../' + buildtools
srcdir = os.path.dirname(buildtools) or '.'
sys.path.insert(0, buildtools + "/wafsamba")
LIBREPLACE_DIR= srcdir + '/lib/replace'
LIBREPLACE_DIR= '../replace'
import sys
sys.path.insert(0, srcdir+"/buildtools/wafsamba")

13
lib/tdb/wscript
View File

@ -8,19 +8,18 @@ blddir = 'bin'
import sys, os
# find the buildtools directory
buildtools = 'buildtools ../../buildtools'
for d in buildtools.split():
if os.path.exists(d):
srcdir = os.path.dirname(d) or '.'
break
buildtools = 'buildtools'
while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5:
buildtools = '../' + buildtools
srcdir = os.path.dirname(buildtools) or '.'
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
sys.path.insert(0, buildtools + "/wafsamba")
import wafsamba, samba_dist
samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
LIBREPLACE_DIR= srcdir + '/lib/replace'
LIBREPLACE_DIR= '../replace'
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')

16
lib/tevent/wscript
View File

@ -8,19 +8,19 @@ blddir = 'bin'
import sys, os
# find the buildtools directory
buildtools = 'buildtools ../../buildtools'
for d in buildtools.split():
if os.path.exists(d):
srcdir = os.path.dirname(d) or '.'
break
buildtools = 'buildtools'
while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5:
buildtools = '../' + buildtools
srcdir = os.path.dirname(buildtools) or '.'
sys.path.insert(0, buildtools + "/wafsamba")
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
import wafsamba, samba_dist
samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools')
LIBREPLACE_DIR= srcdir + '/lib/replace'
LIBTALLOC_DIR= srcdir + '/lib/talloc'
LIBREPLACE_DIR= '../replace'
LIBTALLOC_DIR= '../talloc'
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')

17
source4/lib/ldb/wscript
View File

@ -7,22 +7,21 @@ blddir = 'bin'
import sys, os
# find the buildtools directory
buildtools = 'buildtools ../../../buildtools'
for d in buildtools.split():
if os.path.exists(d):
srcdir = os.path.dirname(d) or '.'
break
buildtools = 'buildtools'
while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5:
buildtools = '../' + buildtools
srcdir = os.path.dirname(buildtools) or '.'
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
sys.path.insert(0, buildtools + "/wafsamba")
import wafsamba, samba_dist
samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tdb:lib/tdb lib/tevent:lib/tevent buildtools:buildtools''')
LIBTDB_DIR= srcdir + '/lib/tdb'
LIBTEVENT_DIR= srcdir + '/lib/tevent'
LIBPOPT_DIR= srcdir + '/lib/popt'
LIBTDB_DIR= '../../../lib/tdb'
LIBTEVENT_DIR= '../../../lib/tevent'
LIBPOPT_DIR= '../../../lib/popt'
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')