param: use generate_param.py to generate param_local.h

Pair-programmed-with: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/param/wscript_build b/lib/param/wscript_build
index 3d216c4913c676693b94cdb845a8c7ed2f2716e1..c0b612bfcbaa387a3e8ed637e32b7f6c188e7921 100644 (file)
--- a/lib/param/wscript_build
+++ b/lib/param/wscript_build
@@ -12,12 +12,11 @@ bld.SAMBA_GENERATOR('param_functions.h',
                     group='build_source',
                     rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=LIBPROTO')
 
-bld.SAMBA_GENERATOR('param_local_h',
-                    source= '../../script/mkparamdefs.pl loadparm.c param_functions.c ',
+bld.SAMBA_GENERATOR('param_local.h',
+                    source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml',
                     target='param_local.h',
                     group='build_source',
-                    rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=LOCAL')
-
+                    rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=PARAMDEFS --scope=LOCAL')
 
 bld.SAMBA_GENERATOR('s3_param_h',
                     source= ' ../../script/mks3param.pl loadparm.c param_functions.c',
@@ -41,7 +40,7 @@ bld.SAMBA_LIBRARY('samba-hostconfig',
        pc_files='samba-hostconfig.pc',
        vnum='0.0.1',
        deps='DYNCONFIG server-role',
-       public_deps='samba-util param_local_h',
+       public_deps='samba-util param_local.h',
        public_headers='param.h',
        autoproto='param_proto.h'
        )

diff --git a/source3/wscript_build b/source3/wscript_build
index 9b6111930d01b6412c48327054720b88208484bb..12e473f0f2ae8a56b4fd64914f8c59f1eee0fd99 100755 (executable)
--- 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 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