param: use generate_param.py to generate param_global.h

Pair-programmed-with: Andrew Bartlett <[email protected]> Signed-off-by: Garming Sam <[email protected]> Reviewed-by: Andrew Bartlett <[email protected]> Reviewed-by: Michael Adam <[email protected]>
thoke · Feb 12, 2014 · b1de1ab · b1de1ab
1 parent 0c7ed5a
commit b1de1ab
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 218 deletions.
diff --git a/lib/param/wscript_build b/lib/param/wscript_build
@@ -25,12 +25,11 @@ bld.SAMBA_GENERATOR('s3_param_h',
                     group='build_source',
                     rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT}')
 
-
-bld.SAMBA_GENERATOR('param_global_h',
-                    source= '../../script/mkparamdefs.pl loadparm.c param_functions.c',
+bld.SAMBA_GENERATOR('param_global.h',
+                    source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml',
                     target='param_global.h',
                     group='build_source',
-                    rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)}  ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
+                    rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=PARAMDEFS --scope=GLOBAL')
 
 bld.SAMBA_LIBRARY('server-role',
                   source='loadparm_server_role.c',

diff --git a/script/mkparamdefs.pl b/script/mkparamdefs.pl
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
@@ -130,7 +130,7 @@ static bool defaults_saved = false;
 	char *tls_crlfile;						\
 	char *tls_dhpfile;
 
-#include "param/param_global.h"
+#include "lib/param/param_global.h"
 
 static struct loadparm_global Globals;
 

diff --git a/source3/param/wscript_build b/source3/param/wscript_build
@@ -8,12 +8,6 @@ bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
                      source='loadparm_ctx.c',
                      deps='''talloc s3_param_h param''')
 
-bld.SAMBA_GENERATOR('s3_param_global_h',
-                    source= '../../script/mkparamdefs.pl loadparm.c ../../lib/param/param_functions.c',
-                    target='param_global.h',
-                    group='build_source',
-                    rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
-
 bld.SAMBA_GENERATOR('s3_param_proto_h',
                     source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml',
                     target='param_proto.h',

diff --git a/source3/wscript_build b/source3/wscript_build
@@ -190,7 +190,7 @@ bld.SAMBA3_SUBSYSTEM('param',
                    lib/sharesec.c
                    lib/ldap_debug_handler.c
                    lib/util_names.c''',
-                   deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h s3_param_global_h cups''')
+                   deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param_global.h cups''')
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts