libnm: add libnm/libnm-core (part 2)

System Internals / NetworkManager - Dan Winship [gnome.org] - 1 August 2014 13:34 UTC

This fixes up the code from the previous "clean" import, and adds build infrastructure.

[There are two slightly orthogonal sets of changes in this patch. First, the files added in the previous commit were modified as followed:

# Replace internal references to "libnm-util" and "libnm-glib" with "libnm" perl -pi -e 's/libnm-(util|glib)/libnm/;' libnm-core/*.[ch] libnm-core/tests/*.[ch] libnm/*.[ch] libnm/tests/*.[ch]

# Fix includes of the enum-types files perl -pi -e 's/nm-utils-enum-types/nm-core-enum-types/;' libnm-core/*.[ch] libnm-core/tests/*.[ch] libnm/*.[ch] libnm/tests/*.[ch] perl -pi -e 's/nm-glib-enum-types/nm-enum-types/;' libnm/*.[ch] libnm/tests/*.[ch]

# Fix some python example code perl -pi -e 's/import NMClient/import NM/;' -e 's/NMClient.Client\(\)/NM.Client()/;' libnm/nm-client.c

Then, the build infrastructure was added (without further modifying any existing files in libnm-core or libnm.)

Note: to regenerate libnm.ver after rebase: (head -2 libnm-util/libnm-util.ver; (grep -h '\s'nm_ libnm-util/libnm-util.ver libnm-glib/libnm-glib.ver | env LANG=C sort); tail -3 libnm-util/libnm-util.ver) > libnm/libnm.ver ]

eedcf18 libnm: add libnm/libnm-core (part 2)
.gitignore | 10 +
Makefile.am | 2 +
configure.ac | 7 +
libnm-core/Makefile.am | 48 ++
libnm-core/Makefile.libnm-core | 82 +++
libnm-core/NetworkManager.h | 4 +-
libnm-core/NetworkManagerVPN.h | 4 +-
libnm-core/nm-setting.c | 4 +-
libnm-core/nm-utils-private.h | 4 +-
libnm-core/nm-utils.c | 8 +-
libnm-core/nm-utils.h | 2 +-
libnm-core/tests/Makefile.am | 89 +++
libnm-core/tests/test-general.c | 98 +--
libnm-core/tests/test-secrets.c | 4 +-
libnm-core/tests/test-setting-8021x.c | 2 +-
libnm-core/tests/test-setting-dcb.c | 2 +-
libnm-core/tests/test-settings-defaults.c | 2 +-
libnm/Makefile.am | 205 ++++++
libnm/libnm-vpn.pc.in | 13 +
libnm/libnm-vpn.ver | 29 +
libnm/libnm.pc.in | 13 +
libnm/libnm.ver | 958 +++++++++++++++++++++++++++++
libnm/nm-client.c | 6 +-
libnm/nm-object.c | 4 +-
libnm/nm-object.h | 2 +-
libnm/nm-secret-agent.c | 2 +-
libnm/nm-types.h | 2 +-
libnm/tests/Makefile.am | 37 ++
libnm/tests/libnm-test-launch.sh | 7 +
libnm/tests/test-nm-client.c | 28 +-
po/POTFILES.in | 30 +
31 files changed, 1619 insertions(+), 89 deletions(-)

Upstream: cgit.freedesktop.org

  • Share