diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | clients/cli/Makefile.am | 2 | ||||
| -rw-r--r-- | libnm/Makefile.am | 8 | ||||
| -rwxr-xr-x | libnm/generate-setting-docs.py | 8 |
4 files changed, 16 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 37adc4fa74..89047a3442 100644 --- a/.gitignore +++ b/.gitignore @@ -165,6 +165,7 @@ valgrind-*.log /libnm/nm-ifcfg-rh-docs.xml /libnm/nm-keyfile-docs.xml +/libnm/nm-property-docs.xml /libnm/nm-setting-docs.xml /libnm/nm-setting-docs-overrides.xml /libnm/tests/test-nm-client diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am index 6cf1c74e5f..75c00a998d 100644 --- a/clients/cli/Makefile.am +++ b/clients/cli/Makefile.am @@ -51,7 +51,7 @@ nmcli_LDADD += $(POLKIT_LIBS) endif if BUILD_SETTING_DOCS -settings-docs.c: settings-docs.xsl $(top_builddir)/libnm/nm-setting-docs.xml +settings-docs.c: settings-docs.xsl $(top_builddir)/libnm/nm-property-docs.xml $(AM_V_GEN) xsltproc --output $@ $^ BUILT_SOURCES = settings-docs.c diff --git a/libnm/Makefile.am b/libnm/Makefile.am index 75c3f18acd..9f63a0ffe1 100644 --- a/libnm/Makefile.am +++ b/libnm/Makefile.am @@ -185,6 +185,7 @@ check-local: if BUILD_SETTING_DOCS noinst_DATA = \ + nm-property-docs.xml \ nm-setting-docs-overrides.xml \ nm-setting-docs.xml \ nm-keyfile-docs.xml \ @@ -195,6 +196,13 @@ docs_sources = $(filter-out nm-core-enum-types.c,$(libnm_core_sources)) nm-setting-docs-overrides.xml: generate-plugin-docs.pl $(docs_sources) $(srcdir)/generate-plugin-docs.pl dbus $(top_srcdir)/libnm-core $@ +nm-property-docs.xml: generate-setting-docs.py $(docs_sources) | NM-1.0.gir NM-1.0.typelib libnm.la + export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ + export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ + $(srcdir)/generate-setting-docs.py \ + --gir $(builddir)/NM-1.0.gir \ + --output $@ + nm-setting-docs.xml: generate-setting-docs.py $(docs_sources) nm-setting-docs-overrides.xml | NM-1.0.gir NM-1.0.typelib libnm.la export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py index a47794715a..1d99b8621a 100755 --- a/libnm/generate-setting-docs.py +++ b/libnm/generate-setting-docs.py @@ -173,7 +173,8 @@ settings = sorted(settings, key=lambda setting: setting.attrib['{%s}symbol-prefi init_constants(girxml, settings) -overrides = ET.parse(args.overrides).getroot() +if args.overrides is not None: + overrides = ET.parse(args.overrides).getroot() outfile.write("""<?xml version=\"1.0\"?> <!DOCTYPE nm-setting-docs [ @@ -192,7 +193,10 @@ for settingxml in settings: outfile.write(" <setting name=\"%s\">\n" % setting.props.name) setting_properties = { prop.name: prop for prop in GObject.list_properties(setting) } - setting_overrides = { override.attrib['name']: override for override in overrides.findall('./setting[@name="%s"]/property' % setting.props.name) } + if args.overrides is None: + setting_overrides = {} + else: + setting_overrides = { override.attrib['name']: override for override in overrides.findall('./setting[@name="%s"]/property' % setting.props.name) } properties = sorted(set.union(set(setting_properties.keys()), set(setting_overrides.keys()))) |