← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to config/register_plugins.py

  • Committer: Monty Taylor
  • Date: 2009-04-20 14:42:34 UTC
  • mto: (997.2.5 mordred)
  • mto: This revision was merged to the branch mainline in revision 1003.
  • Revision ID: mordred@inaugust.com-20090420144234-4k1x60fiag2l1y0n
Ported InnoDB to register_plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/register_plugins.py
30
30
 
31
31
for plugin_dir in plugin_list:
32
32
  plugin_file= os.path.join(plugin_dir,plugin_ini_fname)
33
 
  parser=ConfigParser.ConfigParser(defaults=dict(sources="",cflags="",cppflags="",cxxflags="", libadd="", ldflags=""))
 
33
  parser=ConfigParser.ConfigParser(defaults=dict(sources="",cflags="",cppflags="",cxxflags="", libs="", ldflags=""))
34
34
  parser.read(plugin_file)
35
35
  plugin=dict(parser.items('plugin'))
36
36
  plugin['rel_path']= plugin_dir[len(top_srcdir)+len(os.path.sep):]
39
39
  new_sources=""
40
40
  for src in plugin['sources'].split():
41
41
    if not src.startswith(plugin['rel_path']):
42
 
      src= os.path.join(plugin['rel_path'], plugin['sources'])
43
 
      new_sources += src
 
42
      src= os.path.join(plugin['rel_path'], src)
 
43
      new_sources= "%s %s" % (new_sources, src)
44
44
  plugin['sources']= new_sources
45
45
  
46
46
  if plugin.has_key('load_by_default'):
79
79
plugin_lib%(name)s_dir=${top_srcdir}/%(rel_path)s
80
80
if %(build_conditional_tag)s
81
81
  noinst_LTLIBRARIES+=plugin/lib%(name)s_plugin.la
82
 
  plugin_lib%(name)s_plugin_la_LDFLAGS=%(ldflags)s
83
 
  plugin_lib%(name)s_plugin_la_LIBADD=%(libadd)s
 
82
  plugin_lib%(name)s_plugin_la_LIBADD=%(libs)s
 
83
  plugin_lib%(name)s_plugin_la_LDFLAGS=$(AM_LDFLAGS) %(ldflags)s
84
84
  plugin_lib%(name)s_plugin_la_CPPFLAGS=$(AM_CPPFLAGS) %(cppflags)s
85
85
  plugin_lib%(name)s_plugin_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
86
86
  plugin_lib%(name)s_plugin_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
91
91
  # Add this once we're actually doing dlopen (and remove -avoid-version if
92
92
  # we move to ltdl
93
93
  #pkgplugin_LTLIBRARIES+=plugin/lib%(name)s_plugin.la
94
 
  #plugin_lib%(name)s_plugin_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) %(ldflags)s
 
94
  #plugin_lib%(name)s_plugin_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) %(libs)s
95
95
  # Add this and remove $drizzled_plugin_libs once drizzled is built from .
96
96
  #drizzled_drizzled_LDADD+=${top_builddir}/plugin/lib%(name)s_plugin.la
97
97
 
135
135
        drizzled_default_plugin_list="%(name)s,${drizzled_default_plugin_list}"
136
136
        drizzled_builtin_list="builtin_%(name)s_plugin,${drizzled_builtin_list}"
137
137
        drizzled_plugin_libs="${drizzled_plugin_libs} \${top_builddir}/plugin/lib%(name)s_plugin.la"
 
138
        DRIZZLED_PLUGIN_DEP_LIBS="${DRIZZLED_PLUGIN_DEP_LIBS} %(libs)s"
138
139
      ])
139
140
""" % plugin)
140
141