These patches should address the previous issue with building the Python wrapper when builddir != srcdir. It also ensures that the wrapper can be properly built by pip from out-of-tree by ensuring that json.h is added to include/openvswitch/json.h.
Terry Wilson (2): Move lib/json.h to include/openvswitch JSON serialization via Python's json lib configure.ac | 2 + include/openvswitch/automake.mk | 3 + include/openvswitch/hmap.h | 407 ++++++++++++++++++++++++++++++++++++++++ include/openvswitch/json.h | 141 ++++++++++++++ include/openvswitch/shash.h | 81 ++++++++ lib/automake.mk | 3 - lib/bfd.c | 2 +- lib/bundle.c | 1 + lib/cfm.c | 3 +- lib/cfm.h | 2 +- lib/db-ctl-base.c | 4 +- lib/db-ctl-base.h | 2 +- lib/dpctl.c | 2 +- lib/dpif-netdev.c | 2 +- lib/dpif-netlink.c | 2 +- lib/dpif.c | 2 +- lib/fat-rwlock.c | 2 +- lib/fatal-signal.c | 2 +- lib/flow.c | 1 + lib/hmap.c | 2 +- lib/hmap.h | 407 ---------------------------------------- lib/hmapx.h | 2 +- lib/id-pool.c | 2 +- lib/json.c | 4 +- lib/json.h | 140 -------------- lib/jsonrpc.c | 2 +- lib/lacp.c | 5 +- lib/learning-switch.c | 4 +- lib/lockfile.c | 2 +- lib/mac-learning.h | 2 +- lib/mcast-snooping.h | 2 +- lib/meta-flow.c | 2 +- lib/multipath.c | 1 + lib/netdev-bsd.c | 2 +- lib/netdev-dpdk.c | 2 +- lib/netdev-dummy.c | 2 +- lib/netdev-linux.c | 5 +- lib/netdev-provider.h | 2 +- lib/netdev-windows.c | 2 +- lib/netdev.c | 2 +- lib/netlink-conntrack.h | 2 +- lib/netlink-socket.c | 2 +- lib/netlink.c | 1 + lib/nx-match.c | 4 +- lib/odp-util.h | 2 +- lib/ofp-actions.c | 2 +- lib/ofp-msgs.c | 3 +- lib/ofp-parse.c | 1 + lib/ofp-util.c | 1 + lib/ovs-lldp.h | 2 +- lib/ovs-numa.c | 2 +- lib/ovs-rcu.c | 1 + lib/ovsdb-data.c | 5 +- lib/ovsdb-data.h | 2 +- lib/ovsdb-error.c | 2 +- lib/ovsdb-idl-provider.h | 4 +- lib/ovsdb-idl.c | 4 +- lib/ovsdb-map-op.c | 2 +- lib/ovsdb-parser.h | 2 +- lib/ovsdb-types.c | 3 +- lib/packets.c | 2 +- lib/pcap-file.c | 3 +- lib/perf-counter.c | 2 +- lib/poll-loop.c | 2 +- lib/reconnect.c | 1 + lib/rstp-common.h | 2 +- lib/seq.c | 2 +- lib/shash.c | 2 +- lib/shash.h | 81 -------- lib/simap.h | 2 +- lib/smap.c | 2 +- lib/smap.h | 2 +- lib/sset.h | 2 +- lib/stream-ssl.c | 2 +- lib/table.c | 2 +- lib/timeval.c | 2 +- lib/tun-metadata.c | 3 +- lib/unixctl.c | 4 +- lib/util.h | 1 + m4/openvswitch.m4 | 47 +++++ ofproto/bond.c | 5 +- ofproto/bundles.c | 2 +- ofproto/connmgr.c | 3 +- ofproto/connmgr.h | 2 +- ofproto/ofproto-dpif-ipfix.c | 2 +- ofproto/ofproto-dpif-mirror.c | 2 +- ofproto/ofproto-dpif-monitor.c | 2 +- ofproto/ofproto-dpif-sflow.c | 2 +- ofproto/ofproto-dpif-xlate.c | 1 + ofproto/ofproto-dpif.c | 1 + ofproto/ofproto-provider.h | 2 +- ofproto/ofproto.c | 5 +- ofproto/pinsched.c | 2 +- ofproto/tunnel.c | 2 +- ovn/controller-vtep/binding.c | 2 +- ovn/controller-vtep/vtep.c | 4 +- ovn/controller/binding.c | 2 +- ovn/controller/chassis.c | 1 + ovn/controller/lport.h | 2 +- ovn/controller/ofctrl.c | 2 +- ovn/controller/ovn-controller.c | 2 +- ovn/controller/patch.c | 2 +- ovn/controller/physical.c | 3 +- ovn/lib/actions.c | 4 +- ovn/lib/actions.h | 2 +- ovn/lib/expr.c | 5 +- ovn/lib/expr.h | 2 +- ovn/lib/lex.c | 2 +- ovn/lib/ovn-dhcp.h | 2 +- ovn/northd/ovn-northd.c | 4 +- ovn/utilities/ovn-nbctl.c | 2 +- ovn/utilities/ovn-sbctl.c | 4 +- ovsdb/column.c | 2 +- ovsdb/condition.c | 6 +- ovsdb/execution.c | 2 +- ovsdb/file.c | 2 +- ovsdb/jsonrpc-server.c | 3 +- ovsdb/log.c | 2 +- ovsdb/monitor.c | 3 +- ovsdb/mutation.c | 6 +- ovsdb/ovsdb-client.c | 2 +- ovsdb/ovsdb-server.c | 4 +- ovsdb/ovsdb-tool.c | 2 +- ovsdb/ovsdb.c | 2 +- ovsdb/ovsdb.h | 4 +- ovsdb/replication.c | 2 +- ovsdb/replication.h | 2 +- ovsdb/row.c | 5 +- ovsdb/row.h | 2 +- ovsdb/server.h | 4 +- ovsdb/table.c | 2 +- ovsdb/table.h | 4 +- ovsdb/transaction.c | 4 +- ovsdb/trigger.c | 2 +- python/automake.mk | 26 ++- python/ovs/_json.c | 2 +- python/ovs/json.py | 106 +---------- tests/json.at | 26 ++- tests/test-ccmap.c | 2 +- tests/test-cmap.c | 2 +- tests/test-hmap.c | 2 +- tests/test-json.c | 2 +- tests/test-jsonrpc.c | 2 +- tests/test-ovn.c | 2 +- tests/test-ovsdb.c | 2 +- utilities/ovs-vsctl.c | 2 +- vswitchd/bridge.c | 4 +- vswitchd/system-stats.c | 4 +- vtep/vtep-ctl.c | 2 +- 149 files changed, 920 insertions(+), 884 deletions(-) create mode 100644 include/openvswitch/hmap.h create mode 100644 include/openvswitch/json.h create mode 100644 include/openvswitch/shash.h delete mode 100644 lib/hmap.h delete mode 100644 lib/json.h delete mode 100644 lib/shash.h -- 1.8.3.1 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
