diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-24 15:52:15 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-20 10:11:17 +1300 |
| commit | 09417890635423a3a0cdae1617595a7af9a96808 (patch) | |
| tree | d23db9d193ec149a5243605aad879fd7ba6773e9 /script | |
| parent | 9780113846760dd1cafd11e4091aad28f82639d4 (diff) | |
| download | samba-09417890635423a3a0cdae1617595a7af9a96808.tar.gz samba-09417890635423a3a0cdae1617595a7af9a96808.tar.xz samba-09417890635423a3a0cdae1617595a7af9a96808.zip | |
param: remove generated loadparm ctx table file and include it directly
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I5f1d42e3ae6495accf7a711938cc28c03ab2cd62
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
Diffstat (limited to 'script')
| -rw-r--r-- | script/generate_param.py | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/script/generate_param.py b/script/generate_param.py index 97ef470c325..8bd2e2b48ba 100644 --- a/script/generate_param.py +++ b/script/generate_param.py @@ -35,8 +35,8 @@ parser.add_option("-f", "--file", dest="filename", help="input file", metavar="FILE") parser.add_option("-o", "--output", dest="output", help='output file', metavar="FILE") -parser.add_option("--mode", type="choice", metavar="<FUNCTIONS|S3PROTO|LIBPROTO|PARAMDEFS|S3PARAM|S3TABLE>", - choices=["FUNCTIONS", "S3PROTO", "LIBPROTO", "PARAMDEFS", "S3PARAM", "S3TABLE"], default="FUNCTIONS") +parser.add_option("--mode", type="choice", metavar="<FUNCTIONS|S3PROTO|LIBPROTO|PARAMDEFS|S3PARAM>", + choices=["FUNCTIONS", "S3PROTO", "LIBPROTO", "PARAMDEFS", "S3PARAM"], default="FUNCTIONS") parser.add_option("--scope", metavar="<GLOBAL|LOCAL>", choices = ["GLOBAL", "LOCAL"], default="GLOBAL") @@ -285,29 +285,6 @@ def make_s3_param(path_in, path_out): finally: file_out.close() -def make_s3_param_ctx_table(path_in, path_out): - file_out = open(path_out, 'w') - try: - file_out.write('/* This file was automatically generated by generate_param.py. DO NOT EDIT */\n\n') - file_out.write("static struct loadparm_s3_helpers s3_fns =\n") - file_out.write("{\n") - file_out.write("\t.get_parametric = lp_parm_const_string_service,\n") - file_out.write("\t.get_parm_struct = lp_get_parameter,\n") - file_out.write("\t.get_parm_ptr = lp_parm_ptr,\n") - file_out.write("\t.get_service = lp_service_for_s4_ctx,\n") - file_out.write("\t.get_servicebynum = lp_servicebynum_for_s4_ctx,\n") - file_out.write("\t.get_default_loadparm_service = lp_default_loadparm_service,\n") - file_out.write("\t.get_numservices = lp_numservices,\n") - file_out.write("\t.load = lp_load_for_s4_ctx,\n") - file_out.write("\t.set_cmdline = lp_set_cmdline,\n") - file_out.write("\t.dump = lp_dump,\n") - file_out.write("\t.dnsdomain = lp_dnsdomain,\n") - file_out.write("};") - finally: - file_out.close() - - - if options.mode == 'FUNCTIONS': generate_functions(options.filename, options.output) elif options.mode == 'S3PROTO': @@ -318,5 +295,3 @@ elif options.mode == 'PARAMDEFS': make_param_defs(options.filename, options.output, options.scope) elif options.mode == 'S3PARAM': make_s3_param(options.filename, options.output) -elif options.mode == 'S3TABLE': - make_s3_param_ctx_table(options.filename, options.output) |