The branch, master has been updated
via e196e526 s4-build: remove a bunch of unused build scripts
via 1867a60 s4-charset: use dyn_CODEPAGEDIR for location of
upcase.dat/lowcase.dat
via 1f533bf s4-provision: added setup_path() import in two more places
via d0f5470 autobuild: fixed clone source for build trees
via 03027ad autobuild: add a bit more debug info in autobuild
via df069e4 autobuild: decouple build directories from target names
via 2d72f68 s4-wintest Use top level build for wintest
via edd8c9e s4-python: get ordering right on python paths
via 15d0166 s4-python Don't force "bin" into the python sys.path
via 19c3546 s4-waf Add PYTHONDIR and PYTHONARCHDIR to the 'different on
install' list
via d1e5a73 s4-provision Remove setup_path, setup_dir and find_setup_dir
via 4ae013c s4-waf Don't include ../librpc in paths
via 5364548 s4-build: fixed install of version.h from source4 build
via 5d15f28 s4-upgradeprovision: renames need a relax to avoid
subtree_rename checks
via f4a1b71 s4-dsdb: make subtree_rename errors clearer
via 9ccb868 build: fixed make install for top level build
via 9eaca88 s4-provision: removed spurious os.chdir() from
upgradehelpers.py
via 7f8b40f build: fixed top level etags and ctags target
via ceb4b06 s4-test: fixed samba4.policy.python test for top level build
via b84c0a9 s4-test: fixed ndrdump test for top level build
via bee64c5 build: added placeholder to ensure include/ is available in
build dir
via 205dcd8 build: added configure.developer for top level build
via be5a709 s4-test: fixed hard coded test paths for top level build
via 677f28d s4-test: fixed setup/ assumption for top level build
via 3bcb693 s4-test: fixed test_samba4.pl for top level build
via 479a423 s4-dynconfig: fixed dyn_SETUPDIR to point to the right
directory
via b038aca s4-loadparm: removed "setup directory" option
via b2a080f s4-test: fixed more assumptions of ./setup for setup
directory
via b499734 blackbox: removed assumption of build directory
via 6484da4 s4-test: allow make test to work from top level directory
via e7b2e06 s4-provision: cope with top level directory for provision
via 72e1a39 waf: added top level build rules
via 9f9b363 s4-idl: make the source4 idl build independent of build
directory
via baf629d s4-heimdal: allow heimdal build scripts to work from top
level
via 431b25e pidl: support using pidl from top level directory
via 3f3696c waf: samba deps generation depends on EXTRA_INCLUDES
from a61b17c s3: Make "endpoint_table" static
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e196e526408d478cac895f04917503706c469cf6
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Feb 7 13:18:43 2011 +1100
s4-build: remove a bunch of unused build scripts
these were leftover from the autoconf build
Autobuild-User: Andrew Tridgell <tri...@samba.org>
Autobuild-Date: Mon Feb 7 04:09:40 CET 2011 on sn-devel-104
commit 1867a6033ca22da715017df005a5ad61c66e1597
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Feb 7 13:13:44 2011 +1100
s4-charset: use dyn_CODEPAGEDIR for location of upcase.dat/lowcase.dat
this matches samba3 behaviour
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 1f533bff17ade8c625a87504787dee6207f272e2
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Feb 7 11:54:31 2011 +1100
s4-provision: added setup_path() import in two more places
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit d0f54702c5210e910f29e7067409495c8c186752
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Feb 7 11:43:03 2011 +1100
autobuild: fixed clone source for build trees
this fixes a bug where autobuild would test the tree that the user
pushed, not the tree that has been rebased on master. That could cause
broken trees to get into master. Andrew Bartlett noticed this with a
tree from Jan 19th.
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 03027ad8f1b698cbba0b78b68cf58b8505ad45d5
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Feb 7 11:41:21 2011 +1100
autobuild: add a bit more debug info in autobuild
this may help to track down rebase problems in future
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit df069e40285eb38a68482a6fa460cf6e1898945c
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Feb 7 10:05:32 2011 +1100
autobuild: decouple build directories from target names
this allows us to use 'samba4' as the tag, but build in '.'
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 2d72f68ed09f148537313ea5c50d6671867a5c41
Author: Andrew Bartlett <abart...@samba.org>
Date: Sat Feb 5 19:14:38 2011 +1100
s4-wintest Use top level build for wintest
commit edd8c9ea2ab1e51d116135411df120ec1167e0e6
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Feb 7 09:45:26 2011 +1100
s4-python: get ordering right on python paths
we need to have PYTHONARCHDIR first, as that is where we currently
install. That will minimise problems with upgrades from old installs.
We also don't need to add the path twice if PYTHONDIR is the same as
PYTHONARCHDIR (as happens on debian based systems)
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 15d0166340baea91f117ea977539894e7444ee6b
Author: Andrew Bartlett <abart...@samba.org>
Date: Sat Feb 5 18:00:45 2011 +1100
s4-python Don't force "bin" into the python sys.path
This patch uses the fact that dyn_PYTHONDIR and dyn_PYTHONARCHDIR is
now set properly at all times, incluidng for installed and
build-directory binaries. So we don't need to make assumptions about
bin being magic any more.
Andrew Bartlett
commit 19c3546872216980ff49e5b3dbffb01433c07552
Author: Andrew Bartlett <abart...@samba.org>
Date: Sat Feb 5 18:27:33 2011 +1100
s4-waf Add PYTHONDIR and PYTHONARCHDIR to the 'different on install' list
This allows the C code to rely on PYTHONDIR and PYTHONARCHDIR to
always be correct, and so not to cause problems when forcing these
into sys.path.
Andrew Bartlett
commit d1e5a7380619043a351ba8a25ebb8031163e70b7
Author: Andrew Bartlett <abart...@samba.org>
Date: Sat Feb 5 10:34:51 2011 +1100
s4-provision Remove setup_path, setup_dir and find_setup_dir
We now have a reliable way to know the current location of the
templates: dyn_SETUPDIR, which is updated for both the in-build and
installed binaries.
This replaces the function arguments and the distributed resolution of
the setup directory with one 'global' function (imported as required).
This also removes the ability to specify an alternate setup directory
on the command line, as this was rarely if ever used and never tested.
Andrew Bartlett
commit 4ae013c01b2936e7fd80e674a617f10b54179010
Author: Andrew Bartlett <abart...@samba.org>
Date: Fri Feb 4 15:28:32 2011 +1100
s4-waf Don't include ../librpc in paths
The paths here are relative to the librpc directory the wscript_build
file is in, and so these don't actually change anything.
Andrew Bartlett
commit 5364548e44cbe0726a4308e7ed346796ba17ffcb
Author: Andrew Tridgell <tri...@samba.org>
Date: Sat Feb 5 13:26:44 2011 +1100
s4-build: fixed install of version.h from source4 build
commit 5d15f28fc11412ef736ff30c401fe034c7b34115
Author: Andrew Tridgell <tri...@samba.org>
Date: Fri Feb 4 11:05:40 2011 +1100
s4-upgradeprovision: renames need a relax to avoid subtree_rename checks
commit f4a1b71b2b6f2fa87581832a6638b88829b539b1
Author: Andrew Tridgell <tri...@samba.org>
Date: Fri Feb 4 11:05:17 2011 +1100
s4-dsdb: make subtree_rename errors clearer
commit 9ccb868591b2e4757c9d24fb25899810ebab6285
Author: Andrew Tridgell <tri...@samba.org>
Date: Fri Feb 4 10:22:45 2011 +1100
build: fixed make install for top level build
commit 9eaca88a354e622bbef0d79b4996831494f02ff1
Author: Andrew Tridgell <tri...@samba.org>
Date: Fri Feb 4 09:51:38 2011 +1100
s4-provision: removed spurious os.chdir() from upgradehelpers.py
this breaks make test with a top level build, and is not needed
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 7f8b40f012f616a69909fd620820fe90f4ffb067
Author: Andrew Tridgell <tri...@samba.org>
Date: Fri Feb 4 09:49:39 2011 +1100
build: fixed top level etags and ctags target
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit ceb4b06c4337a64496d5ff6f87d5698b10509793
Author: Andrew Tridgell <tri...@samba.org>
Date: Fri Feb 4 09:49:17 2011 +1100
s4-test: fixed samba4.policy.python test for top level build
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit b84c0a9ed6d556eb2d3797d606edcd03f9766606
Author: Andrew Tridgell <tri...@samba.org>
Date: Fri Feb 4 09:48:35 2011 +1100
s4-test: fixed ndrdump test for top level build
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit bee64c545f357ffa3277436d779855bb8f541043
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:44:41 2011 +1100
build: added placeholder to ensure include/ is available in build dir
commit 205dcd81c8a006e9067885544b6a076cacf5b544
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:42:37 2011 +1100
build: added configure.developer for top level build
commit be5a709341df751df85f216bf026bb576eb92298
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:36:36 2011 +1100
s4-test: fixed hard coded test paths for top level build
this fixes the various test plans that hard coded incorrect paths for
a top level build
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 677f28d8b2d7324817ced7eb5e03343208b6ac86
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:35:54 2011 +1100
s4-test: fixed setup/ assumption for top level build
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 3bcb693e27559d8b4f15be05ef2e921f1bf8cdb2
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:35:13 2011 +1100
s4-test: fixed test_samba4.pl for top level build
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 479a4235e370325167d1085c11698f768f6b51fc
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:34:51 2011 +1100
s4-dynconfig: fixed dyn_SETUPDIR to point to the right directory
this make dyn_SETUPDIR correct for both source4/ build and a top level
build
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit b038aca5c869ba98f123f7107c3a6906c5f6bbdd
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:32:55 2011 +1100
s4-loadparm: removed "setup directory" option
the correct setup directory is known at both build time and install
time using dyn_SETUPDIR, so we no longer have any need to override it
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit b2a080fb1d9a726ad30ff7b745e7b77615ba1002
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:31:37 2011 +1100
s4-test: fixed more assumptions of ./setup for setup directory
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit b49973404c4afb6e3f04a37f002655a3157542e3
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 17:30:53 2011 +1100
blackbox: removed assumption of build directory
this fixes the blackbox tests for a top level build
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 6484da4859fe9b00a7129d89e185bb7947621243
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 15:14:31 2011 +1100
s4-test: allow make test to work from top level directory
this fixes the path assumptions in Samba4 make test to allow it to
work from the top level directory.
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit e7b2e06130fd74a539c58a48c870c9fa1961f699
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 13:49:29 2011 +1100
s4-provision: cope with top level directory for provision
to allow for top level 'make test' we need to cope with two in-tree
directory layouts
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 72e1a39effba7dca8d437c8cad009be6fb2c4506
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 13:08:37 2011 +1100
waf: added top level build rules
This adds build rules for the top level directory based on the ones
from source4.
This is an intermediate step towards a combined top level build which
will build both the Samba3 (bin/smbd, bin/nmbd etc) and Samba4
(bin/samba) binaries from a single build
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 9f9b363447f0f357ea610b7ac23cb3a9b53da96d
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 13:06:55 2011 +1100
s4-idl: make the source4 idl build independent of build directory
this allows the source4 idl to be built from any top level directory
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit baf629d98f93536d92f4609e79f939d47bd3090f
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 13:06:16 2011 +1100
s4-heimdal: allow heimdal build scripts to work from top level
the version_script handling relied on the directory layout. This makes
it independent of the directory structure
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 431b25e8953794079ff52155929f0263a833da69
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 13:05:18 2011 +1100
pidl: support using pidl from top level directory
pidl needs to know if it is being used within the samba tree or not,
to get the names of some include files right. This adds support for
using pidl in the top level directory of a Samba build
This change also makes it clear that is_intree() is a boolean
function. Previously it returned different values for Samba3 and
Samba4, but there is nothing that depends on that
Pair-Programmed-With: Andrew Bartlett <abart...@samba.org>
commit 3f3696ce07957456e366507b43ff562277803b98
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Feb 3 13:03:18 2011 +1100
waf: samba deps generation depends on EXTRA_INCLUDES
-----------------------------------------------------------------------
Summary of changes:
source4/Makefile => Makefile | 2 +-
source4/VERSION => VERSION | 0
buildtools/wafsamba/samba_deps.py | 2 +-
codepages/wscript_build | 2 +-
source4/configure => configure | 2 +-
source3/configure.developer => configure.developer | 0
include/README.txt | 3 +
lib/util/charset/codepoints.c | 16 +--
librpc/wscript_build | 200 ++++++++++----------
pidl/lib/Parse/Pidl/Samba4.pm | 9 +-
script/autobuild.py | 134 ++++++++------
selftest/selftest.pl | 5 +-
selftest/target/Samba4.pm | 18 +-
selftest/test_samba4.pl | 4 +-
source4/dsdb/samdb/ldb_modules/subtree_rename.c | 20 +-
source4/dynconfig/wscript | 9 +-
source4/heimdal_build/wscript_build | 9 +-
source4/librpc/idl/wscript_build | 6 +-
source4/param/loadparm.c | 6 -
source4/param/provision.c | 17 +--
source4/param/pyparam.c | 8 +
source4/samba_tool/samba_tool.c | 2 +-
source4/script/installdat.sh | 23 ---
source4/script/installdirs.sh | 17 --
source4/script/installheader.pl | 109 -----------
source4/script/installlib.sh | 32 ---
source4/script/installman.sh | 30 ---
source4/script/installpc.sh | 16 --
source4/script/mkinstalldirs | 38 ----
source4/script/revert.sh | 18 --
source4/script/uninstalllib.sh | 35 ----
source4/script/uninstallman.sh | 27 ---
source4/scripting/bin/upgradeprovision | 15 +-
source4/scripting/python/modules.c | 26 +--
source4/scripting/python/modules.h | 2 +-
source4/scripting/python/samba/__init__.py | 30 ++--
source4/scripting/python/samba/join.py | 9 +-
.../scripting/python/samba/provision/__init__.py | 124 +++++--------
.../scripting/python/samba/provision/backend.py | 95 +++++-----
source4/scripting/python/samba/schema.py | 18 +-
.../python/samba/tests/blackbox/ndrdump.py | 7 +-
source4/scripting/python/samba/tests/provision.py | 9 +-
source4/scripting/python/samba/tests/samba3.py | 7 +-
source4/scripting/python/samba/tests/samba3sam.py | 8 +-
source4/scripting/python/samba/tests/samdb.py | 13 +-
source4/scripting/python/samba/upgrade.py | 4 +-
source4/scripting/python/samba/upgradehelpers.py | 11 +-
source4/selftest/tests.py | 22 ++-
source4/selftest/wscript | 27 ++-
source4/setup/provision | 10 +-
source4/setup/provision.smb.conf.dc | 1 -
source4/setup/provision.smb.conf.member | 1 -
source4/setup/provision.smb.conf.standalone | 1 -
source4/setup/tests/blackbox_group.sh | 2 +-
source4/setup/tests/blackbox_newuser.sh | 2 +-
source4/setup/tests/blackbox_provision-backend.sh | 10 +-
source4/setup/tests/blackbox_provision.sh | 18 +-
source4/setup/tests/blackbox_setpassword.sh | 2 +-
source4/setup/tests/blackbox_upgradeprovision.sh | 8 +-
source4/setup/upgrade_from_s3 | 10 +-
source4/smbd/server.c | 1 +
source4/web_server/wsgi.c | 3 +-
testprogs/blackbox/subunit.sh | 8 +
testprogs/blackbox/test_chgdcpass.sh | 6 +-
testprogs/blackbox/test_kinit.sh | 3 +-
testprogs/blackbox/test_ktpass.sh | 3 +-
testprogs/blackbox/test_pkinit.sh | 3 +-
wintest/test-s4-howto.py | 2 +-
source4/wscript => wscript | 64 +++---
wscript_build | 106 +++++++++++
70 files changed, 619 insertions(+), 891 deletions(-)
copy source4/Makefile => Makefile (96%)
copy source4/VERSION => VERSION (100%)
copy source4/configure => configure (89%)
copy source3/configure.developer => configure.developer (100%)
create mode 100644 include/README.txt
delete mode 100755 source4/script/installdat.sh
delete mode 100755 source4/script/installdirs.sh
delete mode 100755 source4/script/installheader.pl
delete mode 100755 source4/script/installlib.sh
delete mode 100755 source4/script/installman.sh
delete mode 100755 source4/script/installpc.sh
delete mode 100755 source4/script/mkinstalldirs
delete mode 100755 source4/script/revert.sh
delete mode 100755 source4/script/uninstalllib.sh
delete mode 100755 source4/script/uninstallman.sh
copy source4/wscript => wscript (82%)
create mode 100644 wscript_build
Changeset truncated at 500 lines:
diff --git a/source4/Makefile b/Makefile
similarity index 96%
copy from source4/Makefile
copy to Makefile
index bc77be9..cbbf045 100644
--- a/source4/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# simple makefile wrapper to run waf
-WAF_BINARY=../buildtools/bin/waf
+WAF_BINARY=./buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)
all:
diff --git a/source4/VERSION b/VERSION
similarity index 100%
copy from source4/VERSION
copy to VERSION
diff --git a/buildtools/wafsamba/samba_deps.py
b/buildtools/wafsamba/samba_deps.py
index c4a871e..8f002c8 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -956,7 +956,7 @@ savedeps_inputs = ['samba_deps', 'samba_includes',
'local_include', 'local_incl
'source', 'grouping_library', 'samba_ldflags']
savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes',
'ccflags', 'ldflags', 'samba_deps_extended']
savedeps_outenv = ['INC_PATHS']
-savedeps_envvars = ['NONSHARED_BINARIES', 'GLOBAL_DEPENDENCIES',
'EXTRA_CFLAGS', 'EXTRA_LDFLAGS' ]
+savedeps_envvars = ['NONSHARED_BINARIES', 'GLOBAL_DEPENDENCIES',
'EXTRA_CFLAGS', 'EXTRA_LDFLAGS', 'EXTRA_INCLUDES' ]
savedeps_caches = ['GLOBAL_DEPENDENCIES', 'TARGET_TYPE', 'INIT_FUNCTIONS',
'SYSLIB_DEPS']
savedeps_files = ['buildtools/wafsamba/samba_deps.py']
diff --git a/codepages/wscript_build b/codepages/wscript_build
index 695070f..1225529 100644
--- a/codepages/wscript_build
+++ b/codepages/wscript_build
@@ -1,3 +1,3 @@
#!/usr/bin/env python
-bld.INSTALL_WILDCARD('${DATADIR}', '*.dat')
+bld.INSTALL_WILDCARD('${CODEPAGEDIR}', '*.dat')
diff --git a/source4/configure b/configure
similarity index 89%
copy from source4/configure
copy to configure
index fbd81fe..72f758e 100755
--- a/source4/configure
+++ b/configure
@@ -2,7 +2,7 @@
PREVPATH=`dirname $0`
-WAF=../buildtools/bin/waf
+WAF=./buildtools/bin/waf
# using JOBS=1 gives maximum compatibility with
# systems like AIX which have broken threading in python
diff --git a/source3/configure.developer b/configure.developer
similarity index 100%
copy from source3/configure.developer
copy to configure.developer
diff --git a/include/README.txt b/include/README.txt
new file mode 100644
index 0000000..70d5722
--- /dev/null
+++ b/include/README.txt
@@ -0,0 +1,3 @@
+this README is needed to ensure that the directory exists in the
+source tree. It is needed as a placeholder for the top level build
+config.h
diff --git a/lib/util/charset/codepoints.c b/lib/util/charset/codepoints.c
index 8be2051..bc39f1b 100644
--- a/lib/util/charset/codepoints.c
+++ b/lib/util/charset/codepoints.c
@@ -44,22 +44,14 @@ void load_case_tables(void)
if (!mem_ctx) {
smb_panic("No memory for case_tables");
}
- upcase_table = map_file(talloc_asprintf(mem_ctx, "%s/upcase.dat",
dyn_DATADIR), 0x20000);
- lowcase_table = map_file(talloc_asprintf(mem_ctx, "%s/lowcase.dat",
dyn_DATADIR), 0x20000);
+ upcase_table = map_file(talloc_asprintf(mem_ctx, "%s/upcase.dat",
dyn_CODEPAGEDIR), 0x20000);
+ lowcase_table = map_file(talloc_asprintf(mem_ctx, "%s/lowcase.dat",
dyn_CODEPAGEDIR), 0x20000);
talloc_free(mem_ctx);
if (upcase_table == NULL) {
- /* try also under codepages for testing purposes */
- upcase_table = map_file("../codepages/upcase.dat", 0x20000);
- if (upcase_table == NULL) {
- upcase_table = (void *)-1;
- }
+ upcase_table = (void *)-1;
}
if (lowcase_table == NULL) {
- /* try also under codepages for testing purposes */
- lowcase_table = map_file("../codepages/lowcase.dat", 0x20000);
- if (lowcase_table == NULL) {
- lowcase_table = (void *)-1;
- }
+ lowcase_table = (void *)-1;
}
}
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 89d0980..34be18a 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -3,483 +3,483 @@
bld.RECURSE('idl')
bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV',
- source='../librpc/gen_ndr/ndr_audiosrv.c',
+ source='gen_ndr/ndr_audiosrv.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
- source='../librpc/gen_ndr/ndr_named_pipe_auth.c',
+ source='gen_ndr/ndr_named_pipe_auth.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER',
- source='../librpc/gen_ndr/ndr_dnsserver.c',
+ source='gen_ndr/ndr_dnsserver.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_DNS',
- source='../librpc/gen_ndr/ndr_dns.c ../librpc/ndr/ndr_dns.c',
+ source='gen_ndr/ndr_dns.c ndr/ndr_dns.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP',
- source='../librpc/gen_ndr/ndr_dsbackup.c',
+ source='gen_ndr/ndr_dsbackup.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_DFS',
- source='../librpc/gen_ndr/ndr_dfs.c',
+ source='gen_ndr/ndr_dfs.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_WINREG',
- source='../librpc/gen_ndr/ndr_winreg.c',
+ source='gen_ndr/ndr_winreg.c',
public_deps='ndr NDR_SECURITY NDR_LSA'
)
bld.SAMBA_SUBSYSTEM('NDR_EFS',
- source='../librpc/gen_ndr/ndr_efs.c',
+ source='gen_ndr/ndr_efs.c',
public_deps='ndr NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_ROT',
- source='../librpc/gen_ndr/ndr_rot.c',
+ source='gen_ndr/ndr_rot.c',
public_deps='ndr NDR_ORPC'
)
bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
- source='../librpc/ndr/ndr_frsrpc.c ../librpc/gen_ndr/ndr_frsrpc.c',
+ source='ndr/ndr_frsrpc.c gen_ndr/ndr_frsrpc.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
- source='../librpc/gen_ndr/ndr_frsapi.c',
+ source='gen_ndr/ndr_frsapi.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_FRSTRANS',
- source='../librpc/gen_ndr/ndr_frstrans.c',
+ source='gen_ndr/ndr_frstrans.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
- source='../librpc/gen_ndr/ndr_dfsblobs.c',
+ source='gen_ndr/ndr_dfsblobs.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
- source='../librpc/gen_ndr/ndr_policyagent.c',
+ source='gen_ndr/ndr_policyagent.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_UNIXINFO',
- source='../librpc/gen_ndr/ndr_unixinfo.c',
+ source='gen_ndr/ndr_unixinfo.c',
public_deps='ndr NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS',
- source='../librpc/gen_ndr/ndr_spoolss.c',
+ source='gen_ndr/ndr_spoolss.c',
public_deps='ndr NDR_SPOOLSS_BUF NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
- source='../librpc/ndr/ndr_spoolss_buf.c',
+ source='ndr/ndr_spoolss_buf.c',
deps='talloc'
)
bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER',
- source='../librpc/gen_ndr/ndr_epmapper.c',
+ source='gen_ndr/ndr_epmapper.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_DBGIDL',
- source='../librpc/gen_ndr/ndr_dbgidl.c',
+ source='gen_ndr/ndr_dbgidl.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_DSSETUP',
- source='../librpc/gen_ndr/ndr_dssetup.c',
+ source='gen_ndr/ndr_dssetup.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_MSGSVC',
- source='../librpc/gen_ndr/ndr_msgsvc.c',
+ source='gen_ndr/ndr_msgsvc.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_MGMT',
- source='../librpc/gen_ndr/ndr_mgmt.c',
+ source='gen_ndr/ndr_mgmt.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_ORPC',
- source='../librpc/ndr/ndr_orpc.c ../librpc/gen_ndr/ndr_orpc.c',
+ source='ndr/ndr_orpc.c gen_ndr/ndr_orpc.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_OXIDRESOLVER',
- source='../librpc/gen_ndr/ndr_oxidresolver.c',
+ source='gen_ndr/ndr_oxidresolver.c',
public_deps='ndr NDR_ORPC'
)
bld.SAMBA_SUBSYSTEM('NDR_REMACT',
- source='../librpc/gen_ndr/ndr_remact.c',
+ source='gen_ndr/ndr_remact.c',
public_deps='ndr NDR_ORPC'
)
bld.SAMBA_SUBSYSTEM('NDR_DCOM',
- source='../librpc/gen_ndr/ndr_dcom.c',
+ source='gen_ndr/ndr_dcom.c',
public_deps='ndr NDR_SECURITY NDR_ORPC'
)
bld.SAMBA_SUBSYSTEM('NDR_WMI',
- source='../librpc/ndr/ndr_wmi.c ../librpc/gen_ndr/ndr_wmi.c',
+ source='ndr/ndr_wmi.c gen_ndr/ndr_wmi.c',
public_deps='ndr NDR_SECURITY NDR_DCOM'
)
bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
- source='../librpc/gen_ndr/ndr_wzcsvc.c',
+ source='gen_ndr/ndr_wzcsvc.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_BROWSER',
- source='../librpc/gen_ndr/ndr_browser.c',
+ source='gen_ndr/ndr_browser.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_W32TIME',
- source='../librpc/gen_ndr/ndr_w32time.c',
+ source='gen_ndr/ndr_w32time.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
- source='../librpc/gen_ndr/ndr_scerpc.c',
+ source='gen_ndr/ndr_scerpc.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
- source='../librpc/gen_ndr/ndr_trkwks.c',
+ source='gen_ndr/ndr_trkwks.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_KEYSVC',
- source='../librpc/gen_ndr/ndr_keysvc.c',
+ source='gen_ndr/ndr_keysvc.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_RAP',
- source='../librpc/gen_ndr/ndr_rap.c ../librpc/ndr/ndr_rap.c',
+ source='gen_ndr/ndr_rap.c ndr/ndr_rap.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_IDMAP',
- source='../librpc/gen_ndr/ndr_idmap.c',
+ source='gen_ndr/ndr_idmap.c',
public_deps='ndr ndr-standard'
)
bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP',
- source='../librpc/ndr/ndr_ntlmssp.c ../librpc/gen_ndr/ndr_ntlmssp.c',
+ source='ndr/ndr_ntlmssp.c gen_ndr/ndr_ntlmssp.c',
public_deps='ndr ndr-standard'
)
bld.SAMBA_SUBSYSTEM('NDR_DNSP',
- source='../librpc/gen_ndr/ndr_dnsp.c ../librpc/ndr/ndr_dnsp.c',
+ source='gen_ndr/ndr_dnsp.c ndr/ndr_dnsp.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING',
- source='../librpc/gen_ndr/ndr_ntprinting.c
../librpc/ndr/ndr_ntprinting.c',
+ source='gen_ndr/ndr_ntprinting.c ndr/ndr_ntprinting.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_SAMR',
- source='../librpc/gen_ndr/ndr_samr.c',
+ source='gen_ndr/ndr_samr.c',
public_deps='ndr NDR_SECURITY NDR_LSA'
)
bld.SAMBA_SUBSYSTEM('NDR_LSA',
- source='../librpc/gen_ndr/ndr_lsa.c',
+ source='gen_ndr/ndr_lsa.c',
public_deps='ndr NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_SVCCTL',
- source='../librpc/gen_ndr/ndr_svcctl.c ../librpc/ndr/ndr_svcctl.c',
+ source='gen_ndr/ndr_svcctl.c ndr/ndr_svcctl.c',
public_deps='ndr NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
- source='../librpc/gen_ndr/ndr_srvsvc.c',
+ source='gen_ndr/ndr_srvsvc.c',
public_deps='ndr NDR_SECURITY NDR_SVCCTL'
)
bld.SAMBA_SUBSYSTEM('NDR_NETLOGON',
- source='../librpc/gen_ndr/ndr_netlogon.c ../librpc/ndr/ndr_netlogon.c',
+ source='gen_ndr/ndr_netlogon.c ndr/ndr_netlogon.c',
public_deps='ndr NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT'
)
bld.SAMBA_SUBSYSTEM('NDR_EVENTLOG',
- source='../librpc/gen_ndr/ndr_eventlog.c',
+ source='gen_ndr/ndr_eventlog.c',
public_deps='ndr NDR_SECURITY NDR_LSA'
)
bld.SAMBA_SUBSYSTEM('NDR_NTSVCS',
- source='../librpc/gen_ndr/ndr_ntsvcs.c',
+ source='gen_ndr/ndr_ntsvcs.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_WKSSVC',
- source='../librpc/gen_ndr/ndr_wkssvc.c',
+ source='gen_ndr/ndr_wkssvc.c',
public_deps='ndr NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_ECHO',
- source='../librpc/gen_ndr/ndr_echo.c',
+ source='gen_ndr/ndr_echo.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_INITSHUTDOWN',
- source='../librpc/gen_ndr/ndr_initshutdown.c',
+ source='gen_ndr/ndr_initshutdown.c',
public_deps='ndr NDR_LSA'
)
bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
- source='../librpc/ndr/ndr_compression.c',
+ source='ndr/ndr_compression.c',
public_deps='errors ndr',
deps='z LZXPRESS'
)
bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
- source='../librpc/ndr/ndr_drsuapi.c ../librpc/gen_ndr/ndr_drsuapi.c',
+ source='ndr/ndr_drsuapi.c gen_ndr/ndr_drsuapi.c',
public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard ASN1_UTIL'
)
bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
- source='../librpc/ndr/ndr_drsblobs.c ../librpc/gen_ndr/ndr_drsblobs.c',
+ source='ndr/ndr_drsblobs.c gen_ndr/ndr_drsblobs.c',
public_deps='ndr NDR_DRSUAPI'
)
bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC',
- source='../librpc/ndr/ndr_krb5pac.c ../librpc/gen_ndr/ndr_krb5pac.c',
+ source='ndr/ndr_krb5pac.c gen_ndr/ndr_krb5pac.c',
public_deps='ndr ndr-standard NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_XATTR',
- source='../librpc/ndr/ndr_xattr.c ../librpc/gen_ndr/ndr_xattr.c',
+ source='ndr/ndr_xattr.c gen_ndr/ndr_xattr.c',
public_deps='ndr NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
- source='../librpc/ndr/ndr_schannel.c ../librpc/gen_ndr/ndr_schannel.c',
+ source='ndr/ndr_schannel.c gen_ndr/ndr_schannel.c',
public_deps='ndr NDR_NBT'
)
bld.SAMBA_SUBSYSTEM('NDR_NBT',
- source='../librpc/gen_ndr/ndr_nbt.c',
+ source='gen_ndr/ndr_nbt.c',
public_deps='ndr NDR_NBT_BUF NDR_SECURITY ndr-standard
LIBCLI_NDR_NETLOGON',
- public_headers='../librpc/gen_ndr/nbt.h',
+ public_headers='gen_ndr/nbt.h',
header_path='gen_ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_BACKUPKEY',
- source='../librpc/ndr/ndr_backupkey.c
../librpc/gen_ndr/ndr_backupkey.c',
+ source='ndr/ndr_backupkey.c gen_ndr/ndr_backupkey.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
- source='../librpc/gen_ndr/ndr_file_id.c',
+ source='gen_ndr/ndr_file_id.c',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
- source='../librpc/gen_ndr/ndr_xattr_c.c',
+ source='gen_ndr/ndr_xattr_c.c',
public_deps='NDR_XATTR dcerpc'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
- source='../librpc/gen_ndr/ndr_rot_c.c',
+ source='gen_ndr/ndr_rot_c.c',
public_deps='NDR_ROT dcerpc'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
- source='../librpc/gen_ndr/ndr_audiosrv_c.c',
+ source='gen_ndr/ndr_audiosrv_c.c',
public_deps='NDR_AUDIOSRV dcerpc'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
- source='../librpc/gen_ndr/ndr_echo_c.c',
+ source='gen_ndr/ndr_echo_c.c',
public_deps='dcerpc NDR_ECHO'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
- source='../librpc/gen_ndr/ndr_dsbackup_c.c',
+ source='gen_ndr/ndr_dsbackup_c.c',
public_deps='dcerpc NDR_DSBACKUP'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
- source='../librpc/gen_ndr/ndr_efs_c.c',
+ source='gen_ndr/ndr_efs_c.c',
public_deps='dcerpc NDR_EFS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
- source='../librpc/gen_ndr/ndr_lsa_c.c',
+ source='gen_ndr/ndr_lsa_c.c',
public_deps='dcerpc ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
- source='../librpc/gen_ndr/ndr_samr_c.c',
+ source='gen_ndr/ndr_samr_c.c',
--
Samba Shared Repository
