sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

s4:WAF buildsystem - support out of "source4" directory builds

Browse Source 
Bug: https://bugzilla.samba.org/show_bug.cgi?id=4081

With this patch we are able to invoke s4 builds from the outside of the
"source4" directory (but the target remains the "source4/bin" path).

One constraint: all commands: "autogen-waf.sh", "configure", "make" have to be
run from the same directory!
Regarding "make": you have to run it using "make -C <source4 path> [targets]" if
the invoke directory is not "source4" itself.
This commit is contained in:
Matthias Dieter Wallnöfer 2010-04-08 12:38:17 +02:00
parent bf4189eb80
commit f3f82496ac
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildtools/scripts/configure.waf
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
PREVPATH=`dirname $0`
WAF=BUILDTOOLS/bin/waf WAF=BUILDTOOLS/bin/waf
@ -8,4 +9,6 @@ WAF=BUILDTOOLS/bin/waf
JOBS=1 JOBS=1
export JOBS export JOBS
cd BUILDPATH
$WAF configure $* $WAF configure $*
cd $PREVPATH

22
source4/autogen-waf.sh
View File

@ -1,22 +1,28 @@
#!/bin/sh #!/bin/sh
p=`dirname $0`
echo "Setting up for waf build" echo "Setting up for waf build"
echo "Looking for the buildtools directory" echo "Looking for the buildtools directory"
d="buildtools" d="buildtools"
while test \! -d $d; do d="../$d"; done while test \! -d "$p/$d"; do d="../$d"; done
echo "Found buildtools in $d" echo "Found buildtools in $p/$d"
echo "Setting up configure" echo "Setting up configure"
rm -f configure rm -f $p/configure
sed "s|BUILDTOOLS|$d|g" < "$d/scripts/configure.waf" > configure sed "s|BUILDTOOLS|$d|g;s|BUILDPATH|$p|g" < "$p/$d/scripts/configure.waf" > $p/configure
chmod +x configure chmod +x $p/configure
echo "Setting up makefile" echo "Setting up makefile"
# this relies on the fact that make looks for 'makefile' before 'Makefile' # this relies on the fact that make looks for 'makefile' before 'Makefile'
rm -f makefile rm -f $p/makefile
sed "s|BUILDTOOLS|$d|g" < "$d/scripts/Makefile.waf" > makefile sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/makefile
echo "done. Now run ./configure or ./configure.developer then make" echo "done. Now run $p/configure or $p/configure.developer then make."
if [ $p != "." ]; then
echo "Notice: The build invoke path is not 'source4'! Use make with the parameter"
echo "-C <'source4' path>. Example: make -C source4 all"
fi