e_connman0_7x: phase-2 - remove the old library and create the new one.

good bye libeconnman.so, you're dead.

welcome libeconnman0_7x.so, you're born.

README was rephrased to clarify stuff for future releases.

PS: I don't feel like having libconnman.so and libconnman0_7x.so at
    the same time, but this should be possible.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@65499 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/Makefile.am b/Makefile.am
index 2ada72b..1d9b0ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,8 +33,8 @@ if BUILD_ENOTIFY
 ENOTIFY_PC = enotify.pc
 endif
 
-if BUILD_ECONNMAN
-ECONNMAN_PC = econnman.pc
+if BUILD_ECONNMAN0_7X
+ECONNMAN_PC = econnman-0.7x.pc
 endif
 
 if BUILD_EBLUEZ
@@ -58,7 +58,7 @@ README \
 $(pkgconfig_DATA) \
 autogen.sh \
 ebluez.pc.in \
-econnman.pc.in \
+econnman-0.7x.pc.in \
 edbus.pc.in \
 ehal.pc.in \
 enotify.pc.in \

diff --git a/README b/README
index 7f0124f..a51bf67 100644 (file)
--- a/README
+++ b/README
@@ -50,12 +50,30 @@ itself, while the following modules provides more and their respective
 version:
 
  * bluez(v4.9x): barebones to toggle state and change visibility.
- * connman(v0.7x): complete manager, service and technology.
+ * connman0.7x: complete manager, service and technology.
  * hal(v0.5.x): deprecated, provides basic for e17. See ukit.
  * notification(v0.7.x): complete client and server.
  * ofono(v0.5x, v1.0): barebones to toggle state.
  * ukit(upower-v0.9.x, udisks-1.0.x): most of upower, status api from udisks.
 
+
+API STABILITY:
+--------------
+
+Everything but libedbus (E_DBus.h) is subject to API or ABI stability
+of the provided service or protocol specification. If the service
+change their API, we'll break our API.
+
+The library/module versioning will be used at the name, leaving the
+soversion synchronized with libedbus.so.
+
+Examples:
+ * libeconnman0_7x.so.1.1.0 is the service connman at version
+   0.7x created with libedbus.so.1.1.0.
+ * econnman-0.7x.pc (Version: 1.1.0) is the service connman at version
+   0.7x created with edbus.pc (Version: 1.1.0).
+
+
 ------------------------------------------------------------------------------
 COMPILING AND INSTALLING:
 

diff --git a/configure.ac b/configure.ac
index 2555bde..2fcc1e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
 want_ebluez="yes"
-want_econnman="yes"
+want_econnman0_7x="yes"
 want_ehal="yes"
 want_enotify="yes"
 want_eofono="yes"
@@ -73,7 +73,7 @@ want_eukit="yes"
 case "$host_os" in
    mingw*)
       want_ebluez="no"
-      want_econnman="no"
+      want_econnman0_7x="no"
       want_ehal="no"
       want_enotify="no"
       want_eofono="no"
@@ -82,7 +82,7 @@ case "$host_os" in
 esac
 
 requirement_ebluez="edbus >= 1.1.0"
-requirement_econnman="edbus >= 1.1.0"
+requirement_econnman0_7x="edbus >= 1.1.0 connman >= 0.75"
 requirement_edbus="ecore >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62"
 requirement_ehal="edbus >= 1.1.0"
 requirement_enotify="edbus >= 1.1.0"
@@ -99,10 +99,10 @@ AC_ARG_ENABLE([ebluez],
    [enable_ebluez=$enableval],
    [enable_ebluez="${want_ebluez}"])
 
-AC_ARG_ENABLE([econnman],
-   [AC_HELP_STRING([--enable-econnman], [Enable econnman build])],
-   [enable_econnman=$enableval],
-   [enable_econnman="${want_econnman}"])
+AC_ARG_ENABLE([econnman0_7x],
+   [AC_HELP_STRING([--enable-econnman0_7x], [Enable econnman 0.7x build])],
+   [enable_econnman0_7x=$enableval],
+   [enable_econnman0_7x="${want_econnman0_7x}"])
 
 AC_ARG_ENABLE([ehal],
    [AC_HELP_STRING([--disable-ehal], [Disable ehal build])],
@@ -186,7 +186,7 @@ if test "x${enable_enotify}" = "xyes" ; then
 fi
 
 AM_CONDITIONAL([BUILD_EBLUEZ],   [test "x${enable_ebluez}"   = "xyes"])
-AM_CONDITIONAL([BUILD_ECONNMAN], [test "x${enable_econnman}" = "xyes"])
+AM_CONDITIONAL([BUILD_ECONNMAN0_7X], [test "x${enable_econnman0_7x}" = "xyes"])
 AM_CONDITIONAL([BUILD_EHAL],     [test "x${enable_ehal}"     = "xyes"])
 AM_CONDITIONAL([BUILD_ENOTIFY],  [test "x${enable_enotify}"  = "xyes"])
 AM_CONDITIONAL([BUILD_EOFONO],   [test "x${enable_eofono}"   = "xyes"])
@@ -197,7 +197,7 @@ AM_CONDITIONAL([BUILD_EUKIT],    [test "x${enable_eukit}"    = "xyes"])
 EFL_ENABLE_BIN([edbus-test], ["yes"])
 EFL_ENABLE_BIN([edbus-test-client], ["yes"])
 EFL_ENABLE_BIN([edbus-bluez-test], [${enable_ebluez}])
-EFL_ENABLE_BIN([edbus-connman-test], [${enable_econnman}])
+EFL_ENABLE_BIN([edbus-connman0_7x-test], [${enable_econnman0_7x}])
 EFL_ENABLE_BIN([edbus-notification-daemon-test], [${enable_enotify}])
 EFL_ENABLE_BIN([edbus-notify-send], [${enable_enotify}])
 EFL_ENABLE_BIN([edbus-notify-test], [${enable_enotify}])
@@ -225,11 +225,11 @@ if test "x${have_edbus_bluez_test}" = "xyes" ; then
       [have_edbus_bluez_test="no"])
 fi
 
-if test "x${have_edbus_connman_test}" = "xyes" ; then
-   PKG_CHECK_MODULES([EDBUS_CONNMAN_TEST],
+if test "x${have_edbus_connman0_7x_test}" = "xyes" ; then
+   PKG_CHECK_MODULES([EDBUS_CONNMAN0_7X_TEST],
       [ecore >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62],
-      [have_edbus_connman_test="yes"],
-      [have_edbus_connman_test="no"])
+      [have_edbus_connman0_7x_test="yes"],
+      [have_edbus_connman0_7x_test="no"])
 fi
 
 if test "x${have_edbus_notification_daemon_test}" = "xyes" ; then
@@ -315,7 +315,7 @@ AC_FUNC_ALLOCA
 
 
 AC_SUBST(requirement_ebluez)
-AC_SUBST(requirement_econnman)
+AC_SUBST(requirement_econnman0_7x)
 AC_SUBST(requirement_edbus)
 AC_SUBST(requirement_ehal)
 AC_SUBST(requirement_enotify)
@@ -331,7 +331,7 @@ doc/Doxyfile
 src/Makefile
 src/lib/Makefile
 src/lib/bluez/Makefile
-src/lib/connman/Makefile
+src/lib/connman0_7x/Makefile
 src/lib/dbus/Makefile
 src/lib/hal/Makefile
 src/lib/notification/Makefile
@@ -339,7 +339,7 @@ src/lib/ofono/Makefile
 src/lib/ukit/Makefile
 src/bin/Makefile
 ebluez.pc
-econnman.pc
+econnman-0.7x.pc
 edbus.pc
 ehal.pc
 enotify.pc
@@ -363,7 +363,7 @@ echo
 echo "  Modules:"
 echo
 echo "    EBluez.............: $enable_ebluez"
-echo "    EConnman...........: $enable_econnman"
+echo "    EConnman (0.7x)....: $enable_econnman0_7x"
 echo "    EHal...............: $enable_ehal"
 echo "    ENotify............: $enable_enotify"
 echo "    EOfono.............: $enable_eofono"
@@ -374,7 +374,7 @@ echo
 echo "    EDbus test.........: $have_edbus_test"
 echo "    EDbus client test..: $have_edbus_test_client"
 echo "    EBluez test........: $have_edbus_bluez_test"
-echo "    EConnman test......: $have_edbus_connman_test"
+echo "    EConnman (0.7x)test: $have_edbus_connman0_7x_test"
 echo "    ENotify Daemon test: $have_edbus_notification_daemon_test"
 echo "    ENotify send.......: $have_edbus_notify_send"
 echo "    ENotify test.......: $have_edbus_notify_test"

diff --git a/econnman-0.7x.pc.in b/econnman-0.7x.pc.in
new file mode 100644 (file)
index 0000000..f3ba96a
--- /dev/null
+++ b/econnman-0.7x.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: econnman-0.7x
+Description: network connection manager (connman v0.7x)
+@pkgconfig_requires_private@: @requirement_econnman0_7x@
+Version: @VERSION@
+Libs: -L${libdir} -leconnman0_7x
+Cflags: -I${includedir}/e_dbus-@VMAJ@

diff --git a/econnman.pc.in b/econnman.pc.in
deleted file mode 100644 (file)
index 8ce8db6..0000000
--- a/econnman.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: econnman
-Description: network connection manager (connman)
-@pkgconfig_requires_private@: @requirement_econnman@
-Version: @VERSION@
-Libs: -L${libdir} -leconnman
-Cflags: -I${includedir}/e_dbus-@VMAJ@

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 911e2ac..a83b695 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -3,7 +3,6 @@ MAINTAINERCLEANFILES = Makefile.in
 EDBUS_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/dbus \
 -I$(top_srcdir)/src/lib/notification \
--I$(top_srcdir)/src/lib/connman \
 -I$(top_srcdir)/src/lib/bluez \
 -I$(top_srcdir)/src/lib/ofono \
 -I$(top_srcdir)/src/lib/ukit \
@@ -23,8 +22,8 @@ if BUILD_EDBUS_BLUEZ_TEST
 bin_PROGRAMS += e_dbus_bluez_test
 endif
 
-if BUILD_EDBUS_CONNMAN_TEST
-bin_PROGRAMS += e_dbus_connman_test
+if BUILD_EDBUS_CONNMAN0_7X_TEST
+bin_PROGRAMS += e_dbus_connman0_7x_test
 endif
 
 if BUILD_EDBUS_NOTIFICATION_DAEMON_TEST
@@ -49,8 +48,8 @@ endif
 
 noinst_PROGRAMS =
 
-if BUILD_EDBUS_CONNMAN_TEST
-noinst_PROGRAMS += e_dbus_connman_test_api
+if BUILD_EDBUS_CONNMAN0_7X_TEST
+noinst_PROGRAMS += e_dbus_connman0_7x_test_api
 endif
 
 if BUILD_EDBUS_TEST
@@ -85,26 +84,26 @@ $(top_builddir)/src/lib/bluez/libebluez.la \
 @EDBUS_BLUEZ_TEST_LIBS@
 endif
 
-if BUILD_EDBUS_CONNMAN_TEST
-e_dbus_connman_test_SOURCES = e_dbus_connman_test.c
-e_dbus_connman_test_CPPFLAGS = \
+if BUILD_EDBUS_CONNMAN0_7X_TEST
+e_dbus_connman0_7x_test_SOURCES = e_dbus_connman0_7x_test.c
+e_dbus_connman0_7x_test_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/dbus \
--I$(top_srcdir)/src/lib/connman \
-@EDBUS_CONNMAN_TEST_CFLAGS@
-e_dbus_connman_test_LDADD = \
+-I$(top_srcdir)/src/lib/connman0_7x \
+@EDBUS_CONNMAN0_7X_TEST_CFLAGS@
+e_dbus_connman0_7x_test_LDADD = \
 $(top_builddir)/src/lib/dbus/libedbus.la \
-$(top_builddir)/src/lib/connman/libeconnman.la \
-@EDBUS_CONNMAN_TEST_LIBS@
+$(top_builddir)/src/lib/connman0_7x/libeconnman0_7x.la \
+@EDBUS_CONNMAN0_7X_TEST_LIBS@
 
-e_dbus_connman_test_api_SOURCES = e_dbus_connman_test_api.c
-e_dbus_connman_test_api_CPPFLAGS = \
+e_dbus_connman0_7x_test_api_SOURCES = e_dbus_connman0_7x_test_api.c
+e_dbus_connman0_7x_test_api_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/dbus \
--I$(top_srcdir)/src/lib/connman \
-@EDBUS_CONNMAN_TEST_CFLAGS@
-e_dbus_connman_test_api_LDADD = \
+-I$(top_srcdir)/src/lib/connman0_7x \
+@EDBUS_CONNMAN0_7X_TEST_CFLAGS@
+e_dbus_connman0_7x_test_api_LDADD = \
 $(top_builddir)/src/lib/dbus/libedbus.la \
-$(top_builddir)/src/lib/connman/libeconnman.la \
-@EDBUS_CONNMAN_TEST_LIBS@
+$(top_builddir)/src/lib/connman0_7x/libeconnman0_7x.la \
+@EDBUS_CONNMAN0_7X_TEST_LIBS@
 endif
 
 ENOTIFY_LIBS = $(top_builddir)/src/lib/notification/libenotify.la

diff --git a/src/bin/e_dbus_connman_test.c b/src/bin/e_dbus_connman0_7x_test.c
similarity index 99%
rename from src/bin/e_dbus_connman_test.c
rename to src/bin/e_dbus_connman0_7x_test.c
index e0fa7f0..6767b1c 100644 (file)
--- a/src/bin/e_dbus_connman_test.c
+++ b/src/bin/e_dbus_connman0_7x_test.c
@@ -922,7 +922,7 @@ _on_cmd_service_get_security(__UNUSED__ char *cmd, char *args)
    path = args;
 
    e = e_connman_service_get(path);
-   if (e_connman_service_security2_get(e, &count, &security))
+   if (e_connman_service_security_get(e, &count, &security))
      {
         unsigned int i;
         for (i = 0; i < count; i++)

diff --git a/src/bin/e_dbus_connman_test_api.c b/src/bin/e_dbus_connman0_7x_test_api.c
similarity index 100%
rename from src/bin/e_dbus_connman_test_api.c
rename to src/bin/e_dbus_connman0_7x_test_api.c

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 29b550f..f4ccefc 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -6,8 +6,8 @@ if BUILD_EBLUEZ
 SUBDIRS += bluez
 endif
 
-if BUILD_ECONNMAN
-SUBDIRS += connman
+if BUILD_ECONNMAN0_7X
+SUBDIRS += connman0_7x
 endif
 
 if BUILD_EHAL

diff --git a/src/lib/connman/E_Connman.h b/src/lib/connman0_7x/E_Connman.h
similarity index 100%
rename from src/lib/connman/E_Connman.h
rename to src/lib/connman0_7x/E_Connman.h

diff --git a/src/lib/connman/Makefile.am b/src/lib/connman0_7x/Makefile.am
similarity index 68%
rename from src/lib/connman/Makefile.am
rename to src/lib/connman0_7x/Makefile.am
index 7f371dc..4161071 100644 (file)
--- a/src/lib/connman/Makefile.am
+++ b/src/lib/connman0_7x/Makefile.am
@@ -4,11 +4,11 @@ AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
 @EDBUS_CFLAGS@
 
-lib_LTLIBRARIES = libeconnman.la
+lib_LTLIBRARIES = libeconnman0_7x.la
 includes_HEADERS = E_Connman.h
 includesdir = $(includedir)/e_dbus-@VMAJ@
 
-libeconnman_la_SOURCES = \
+libeconnman0_7x_la_SOURCES = \
 e_connman.c \
 e_connman_element.c \
 e_connman_manager.c \
@@ -16,9 +16,9 @@ e_connman_profile.c \
 e_connman_service.c \
 e_connman_technology.c
 
-libeconnman_la_LIBADD = \
+libeconnman0_7x_la_LIBADD = \
 $(top_builddir)/src/lib/dbus/libedbus.la
 
-libeconnman_la_LDFLAGS = -version-info @version_info@ @release_info@
+libeconnman0_7x_la_LDFLAGS = -version-info @version_info@ @release_info@
 
 EXTRA_DIST = e_connman_private.h

diff --git a/src/lib/connman/e_connman.c b/src/lib/connman0_7x/e_connman.c
similarity index 100%
rename from src/lib/connman/e_connman.c
rename to src/lib/connman0_7x/e_connman.c

diff --git a/src/lib/connman/e_connman_element.c b/src/lib/connman0_7x/e_connman_element.c
similarity index 100%
rename from src/lib/connman/e_connman_element.c
rename to src/lib/connman0_7x/e_connman_element.c

diff --git a/src/lib/connman/e_connman_manager.c b/src/lib/connman0_7x/e_connman_manager.c
similarity index 100%
rename from src/lib/connman/e_connman_manager.c
rename to src/lib/connman0_7x/e_connman_manager.c

diff --git a/src/lib/connman/e_connman_private.h b/src/lib/connman0_7x/e_connman_private.h
similarity index 100%
rename from src/lib/connman/e_connman_private.h
rename to src/lib/connman0_7x/e_connman_private.h

diff --git a/src/lib/connman/e_connman_profile.c b/src/lib/connman0_7x/e_connman_profile.c
similarity index 100%
rename from src/lib/connman/e_connman_profile.c
rename to src/lib/connman0_7x/e_connman_profile.c

diff --git a/src/lib/connman/e_connman_service.c b/src/lib/connman0_7x/e_connman_service.c
similarity index 100%
rename from src/lib/connman/e_connman_service.c
rename to src/lib/connman0_7x/e_connman_service.c

diff --git a/src/lib/connman/e_connman_technology.c b/src/lib/connman0_7x/e_connman_technology.c
similarity index 100%
rename from src/lib/connman/e_connman_technology.c
rename to src/lib/connman0_7x/e_connman_technology.c