Justin, I'd appreciate a review of this patch.
On Thu, Jan 26, 2017 at 10:26:30AM -0800, Ben Pfaff wrote: > It turns out that, since groff 1.20 around 2009, groff comes with a > preprocessor named "preconv" that can fix encoding issues. Use it instead > of the existing hack. > > Signed-off-by: Ben Pfaff <[email protected]> > --- > build-aux/extract-ofp-fields | 8 -------- > lib/automake.mk | 4 ++-- > 2 files changed, 2 insertions(+), 10 deletions(-) > > diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields > index 333d90e..e99ec2e 100755 > --- a/build-aux/extract-ofp-fields > +++ b/build-aux/extract-ofp-fields > @@ -752,14 +752,6 @@ ovs\-fields \- protocol header fields in OpenFlow and > Open vSwitch > output = [] > for oline in s.split("\n"): > oline = oline.strip() > - > - # Life is easier with nroff if we don't try to feed it Unicode. > - # Fortunately, we only use a few characters outside the ASCII range. > - oline = oline.replace(u'\u2208', r'\[mo]') > - oline = oline.replace(u'\u2260', r'\[!=]') > - oline = oline.replace(u'\u2264', r'\[<=]') > - oline = oline.replace(u'\u2265', r'\[>=]') > - oline = oline.replace(u'\u00d7', r'\[mu]') > if len(oline): > output += [oline] > > diff --git a/lib/automake.mk b/lib/automake.mk > index a1bee0d..4931d39 100644 > --- a/lib/automake.mk > +++ b/lib/automake.mk > @@ -1,4 +1,4 @@ > -# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. > +# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Nicira, > Inc. > # > # Copying and distribution of this file, with or without modification, > # are permitted in any medium without royalty provided the copyright > @@ -543,6 +543,6 @@ lib/ovs-fields.7: $(srcdir)/build-aux/extract-ofp-fields > include/openvswitch/met > $(AM_V_GEN)PYTHONIOENCODING=utf8 $(run_python) $< \ > --ovs-version=$(VERSION) ovs-fields \ > $(srcdir)/include/openvswitch/meta-flow.h \ > - $(srcdir)/lib/meta-flow.xml > [email protected] > + $(srcdir)/lib/meta-flow.xml | preconv -e utf-8 > [email protected] > $(AM_V_at)mv [email protected] $@ > EXTRA_DIST += lib/meta-flow.xml > -- > 2.10.2 > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
