← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to config/pandora-plugin

  • Committer: Monty Taylor
  • Date: 2010-11-25 17:49:44 UTC
  • mfrom: (1948.1.8 bug675395)
  • mto: This revision was merged to the branch mainline in revision 1955.
  • Revision ID: mordred@inaugust.com-20101125174944-ql08udmvxs41qrib
Merge Monty - fix configure tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/pandora-plugin
131
131
pkgplugindir=%(pkgplugindir)s
132
132
EXTRA_DIST = plugin.ini
133
133
 
 
134
noinst_HEADERS=
 
135
nobase_include_HEADERS=
 
136
check_PROGRAMS=
 
137
noinst_LTLIBRARIES=
 
138
bin_PROGRAMS=
 
139
 
 
140
 
134
141
""" % plugin)
135
142
  if plugin['headers'] != "":
136
 
    plugin_file.write("noinst_HEADERS = %(headers)s\n" % plugin)
 
143
    plugin_file.write("noinst_HEADERS += %(headers)s\n" % plugin)
137
144
  if plugin['install_headers'] != "":
138
145
    plugin_file.write("nobase_include_HEADERS += %(install_headers)s\n" % plugin)
139
146
  if plugin['testsuite']:
367
374
    return os.path.join(plugin_dir, "docs")
368
375
 
369
376
def read_plugin_ini(plugin_dir):
 
377
    sources_default=""
370
378
    if plugin_dir == ".":
371
379
      plugin_name="**OUT-OF-TREE**"
 
380
      module_name="**OUT-OF-TREE**"
372
381
    else:
373
 
      short_name=os.path.basename(plugin_dir)
 
382
      sources_default="%s.cc" % os.path.basename(plugin_dir)
374
383
      plugin_name = plugin_dir[plugin_dir.index(config['root_plugin_dir']) + len(config['root_plugin_dir']) + 1:]
375
384
      module_name = plugin_name.replace("/", config['module_name_separator']).replace("\\", config['module_name_separator'])
376
385
      plugin_name = plugin_name.replace("/", config['plugin_name_separator']).replace("\\", config['plugin_name_separator'])
377
386
 
378
387
 
379
388
    plugin_file= os.path.join(plugin_dir,config['plugin_ini_fname'])
380
 
    plugin_defaults= dict(sources="%s.cc" % short_name,
 
389
    plugin_defaults= dict(sources=sources_default,
381
390
                          headers="",
382
391
                          install_headers="",
383
392
                          cflags="",