sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

s3-build: Do not write loadparm generated files into the build tree

Browse Source 
We need to keep these files away from where waf might see them.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Jun 15 11:10:14 CEST 2012 on sn-devel-104
This commit is contained in:
Andrew Bartlett
2012-06-15 12:34:28 +10:00
parent 8e31d97c8b
commit 9afd4be688
8 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -90,13 +90,13 @@ source3/script/installbin.sh
source3/script/uninstallbin.sh
source3/smbadduser
source3/smbd/build_options.c
source3/param/param_global.h
source3/param/param_local.h
source3/autoconf/source3/param/param_global.h
source3/autoconf/source3/param/param_local.h
source3/setup
lib/param/param_global.h
lib/param/param_local.h
lib/param/param_proto.h
lib/param/s3_param.h
source3/autoconf/lib/param/param_global.h
source3/autoconf/lib/param/param_local.h
source3/autoconf/lib/param/param_proto.h
source3/autoconf/lib/param/s3_param.h
pidl/blib
pidl/cover_db
pidl/Makefile

6
lib/param/loadparm.c
View File

@ -62,7 +62,7 @@
#include "lib/param/param.h"
#include "lib/param/loadparm.h"
#include "auth/gensec/gensec.h"
#include "s3_param.h"
#include "lib/param/s3_param.h"
#include "lib/util/bitmap.h"
#include "libcli/smb/smb_constants.h"
#include "source4/dns_server/dns_update.h"
@ -88,7 +88,7 @@ static bool defaults_saved = false;
int domain_logons; \
int bPreferredMaster;
#include "param_global.h"
#include "lib/param/param_global.h"
#define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
@ -105,7 +105,7 @@ static bool handle_debuglevel(struct loadparm_context *lp_ctx, int unused,
static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
#include "param_enums.c"
#include "lib/param/param_enums.c"
#define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
#define LOCAL_VAR(name) offsetof(struct loadparm_service, name)

2
lib/param/param.h
View File

@ -48,7 +48,7 @@ struct smbcli_session_options;
struct gensec_settings;
#ifdef CONFIG_H_IS_FROM_SAMBA
#include "param/param_proto.h"
#include "lib/param/param_proto.h"
#endif
const char **lpcfg_interfaces(struct loadparm_context *);

24
source3/Makefile.in
View File

@ -171,7 +171,7 @@ FLAGS = -I. \
-I$(srcdir)/lib \
-I.. \
-Iautoconf \
-Iautoconf/librpc \
-Iautoconf/source3 \
-I./../lib/ldb/include \
-D_SAMBA_BUILD_=3
@ -1679,18 +1679,18 @@ idl_full::
@PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full $(IDL_FILES)
mkparam: ../lib/param/param_local.h ../lib/param/param_global.h param/param_global.h ../lib/param/param_proto.h ../lib/param/s3_param.h
mkparam: autoconf/lib/param/param_local.h autoconf/lib/param/param_global.h autoconf/source3/param/param_global.h autoconf/lib/param/param_proto.h autoconf/lib/param/s3_param.h
../lib/param/param_local.h:
$(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file ../lib/param/param_local.h --generate-scope=LOCAL
../lib/param/param_global.h:
$(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file ../lib/param/param_global.h --generate-scope=GLOBAL
param/param_global.h:
$(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/param/loadparm.c --file param/param_global.h --generate-scope=GLOBAL
../lib/param/param_proto.h:
$(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --public ../lib/param/param_proto.h --private ../lib/param/param_proto.h
../lib/param/s3_param.h:
$(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file ../lib/param/s3_param.h
autoconf/lib/param/param_local.h:
$(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL
autoconf/lib/param/param_global.h:
$(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL
autoconf/source3/param/param_global.h:
$(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/param/loadparm.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL
autoconf/lib/param/param_proto.h:
$(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --public autoconf/lib/param/param_proto.h --private autoconf/lib/param/param_proto.h
autoconf/lib/param/s3_param.h:
$(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/s3_param.h
#####################################################################

3
source3/autoconf/lib/param/README Normal file
View File

@ -0,0 +1,3 @@
This file denoates the output location of perl-generated files that we need for loadparm.
To ensure no conflict between waf and autoconf, we generate the files here.

3
source3/autoconf/source3/param/README Normal file
View File

@ -0,0 +1,3 @@
This file denoates the output location of perl-generated files that we need for loadparm.
To ensure no conflict between waf and autoconf, we generate the files here.

10
source3/autogen.sh
View File

@ -95,11 +95,11 @@ else
echo "some autconf tests might not work properly"
fi
perl ../script/mkparamdefs.pl ../lib/param/param_functions.c --file ../lib/param/param_local.h --generate-scope=LOCAL
perl ../script/mkparamdefs.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file ../lib/param/param_global.h --generate-scope=GLOBAL
perl ../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c --file param/param_global.h --generate-scope=GLOBAL
perl ../source4/script/mkproto.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --public ../lib/param/param_proto.h --private ../lib/param/param_proto.h
perl ../script/mks3param.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file ../lib/param/s3_param.h
perl ../script/mkparamdefs.pl ../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL
perl ../script/mkparamdefs.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL
perl ../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL
perl ../source4/script/mkproto.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --public autoconf/lib/param/param_proto.h --private ../lib/param/param_proto.h
perl ../script/mks3param.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/s3_param.h
echo "Now run ./configure (or ./configure.developer) and then make."
exit 0

2
wscript_build
View File

@ -20,7 +20,7 @@ bld.env.build_public_headers = 'include/public'
# these are includes which appear in public headers, but with #ifdef conditional
# compilation, so they are safe
bld.env.public_headers_skip = ['param/param_proto.h']
bld.env.public_headers_skip = ['lib/param/param_proto.h']
samba_version.load_version(bld.env, is_install=bld.is_install)
bld.SAMBA_MKVERSION('version.h')