Merge pull request #268 from openweave/feature/device-manager-clean-up

Weave Device Manager clean-up

Author: Jay Logue

Makefile-iOS

@@ -124,7 +124,7 @@ DynamicLib                                              = $(Framework)/$(Dynamic
 FrameworkName                                           = $(DynamicLibName).framework
 Framework                                               = $(TopTargetLibDir)/$(FrameworkName)
 
-DynamicLibSourceFiles                                   = $(TopTargetLibDir)/libWeave.a $(TopTargetLibDir)/libWeaveDeviceManager.a $(TopTargetLibDir)/libNLWeaveWrapper.a
+DynamicLibSourceFiles                                   = $(TopTargetLibDir)/libWeave.a $(TopTargetLibDir)/libNLWeaveWrapper.a
 
 FrameworkHeaderDirName                                  = Headers
 FrameworkModulesDirName                                 = Modules
@@ -456,7 +456,6 @@ lint pretty-check: $(PRETTY_CHECK_TARGETS)
 
 stage: stage-combine | $(TopResultDir)/$(TargetTuple)/lib
 	$(call combine-archs,$(TargetTupleStemIOS),$(ARCHS),libWeave.a,libWeave.a)
-	$(call combine-archs,$(TargetTupleStemIOS),$(ARCHS),libWeaveDeviceManager.a,libWeaveDeviceManager.a)
 	$(call combine-archs,$(TargetTupleStemIOS),$(ARCHS),libNLWeaveDeviceManager.a,libNLWeaveWrapper.a)
 
 $(Framework): $(DynamicLib) $(FrameworkHeaderDir) $(FrameworkModulesDir) $(FrameworkModuleMap) $(FrameworkPlist)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Weave g06664935-dirty.
+# Generated by GNU Autoconf 2.68 for Weave g212389ac-dirty.
 #
 # Report bugs to <[email protected]>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Weave'
 PACKAGE_TARNAME='weave'
-PACKAGE_VERSION='g06664935-dirty'
-PACKAGE_STRING='Weave g06664935-dirty'
+PACKAGE_VERSION='g212389ac-dirty'
+PACKAGE_STRING='Weave g212389ac-dirty'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='https://developer.nest.com/'
 
@@ -699,6 +699,8 @@ WEAVE_FUZZING_ENABLED_FALSE
 WEAVE_FUZZING_ENABLED_TRUE
 WEAVE_WITH_VERHOEFF_FALSE
 WEAVE_WITH_VERHOEFF_TRUE
+WEAVE_BUILD_DEVICE_MANAGER_FALSE
+WEAVE_BUILD_DEVICE_MANAGER_TRUE
 INET_CONFIG_ENABLE_ASYNC_DNS_SOCKETS_FALSE
 INET_CONFIG_ENABLE_ASYNC_DNS_SOCKETS_TRUE
 INET_WANT_ENDPOINT_UDP_FALSE
@@ -767,8 +769,6 @@ WEAVE_BUILD_WARM_FALSE
 WEAVE_BUILD_WARM_TRUE
 WEAVE_ENABLE_WOBLE_TEST_FALSE
 WEAVE_ENABLE_WOBLE_TEST_TRUE
-WEAVE_BUILD_DEVICE_MANAGER_FALSE
-WEAVE_BUILD_DEVICE_MANAGER_TRUE
 WEAVE_RUN_HAPPY_SERVICEDIR_FALSE
 WEAVE_RUN_HAPPY_SERVICEDIR_TRUE
 WEAVE_RUN_HAPPY_SECMGR_FALSE
@@ -1056,7 +1056,6 @@ with_happy
 with_happy_service
 with_happy_dns
 with_happy_test_suite
-enable_device_manager
 enable_woble_test
 enable_warm
 enable_tunnel_failover
@@ -1071,6 +1070,7 @@ with_target_network
 enable_ipv4
 with_inet_endpoint
 enable_adns
+enable_device_manager
 enable_verhoeff
 enable_fuzzing
 with_enhanced_printf
@@ -1709,7 +1709,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Weave g06664935-dirty to adapt to many kinds of systems.
+\`configure' configures Weave g212389ac-dirty to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1780,7 +1780,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Weave g06664935-dirty:";;
+     short | recursive ) echo "Configuration of Weave g212389ac-dirty:";;
    esac
   cat <<\_ACEOF
 
@@ -1827,8 +1827,6 @@ Optional Features:
   --enable-tests          Enable building of tests [default=yes].
   --enable-long-tests     Enable building of long-running tests [default=no].
   --disable-tools         Disable building of tools [default=no].
-  --disable-device-manager
-                          Disable building of Device Manager [default=no].
   --enable-woble-test     Enable WoBle Test [default=no].
   --disable-warm          Disable building of the Weave Addressing and Routing
                           Module (WARM) [default=no].
@@ -1842,6 +1840,8 @@ Optional Features:
   --disable-ipv4          Disable the inclusion of IPv4 networking
                           [default=yes].
   --disable-adns          Disable building of adns [default=no].
+  --enable-device-manager Enable building of Device Manager wrapper libraries
+                          [default=yes].
   --enable-verhoeff       Enable Verhoeff support [default=no].
   --enable-fuzzing        Enable Fuzzing - Requires clang 6.0 or greater
                           [default=no].
@@ -2146,7 +2146,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Weave configure g06664935-dirty
+Weave configure g212389ac-dirty
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3158,7 +3158,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Weave $as_me g06664935-dirty, which was
+It was created by Weave $as_me g212389ac-dirty, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -4365,7 +4365,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='weave'
- VERSION='g06664935-dirty'
+ VERSION='g212389ac-dirty'
 
 
 # Some tools Automake needs.
@@ -22676,42 +22676,6 @@ else
 fi
 
 
-#
-# Device Manager
-#
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Device Manager" >&5
-$as_echo_n "checking whether to build Device Manager... " >&6; }
-# Check whether --enable-device_manager was given.
-if test "${enable_device_manager+set}" = set; then :
-  enableval=$enable_device_manager;
-        case "${enableval}" in
-
-        no|yes)
-            build_device_manager=${enableval}
-            ;;
-
-        *)
-            as_fn_error $? "Invalid value ${enableval} for --enable-device-manager" "$LINENO" 5
-            ;;
-
-        esac
-
-else
-  build_device_manager=yes
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${build_device_manager}" >&5
-$as_echo "${build_device_manager}" >&6; }
- if test "${build_device_manager}" = "yes"; then
-  WEAVE_BUILD_DEVICE_MANAGER_TRUE=
-  WEAVE_BUILD_DEVICE_MANAGER_FALSE='#'
-else
-  WEAVE_BUILD_DEVICE_MANAGER_TRUE='#'
-  WEAVE_BUILD_DEVICE_MANAGER_FALSE=
-fi
-
-
 #
 # WoBle Control Path and Throughput Test  (Woble Test)
 #
@@ -24501,6 +24465,61 @@ $as_echo "#define INET_CONFIG_ENABLE_ASYNC_DNS_SOCKETS 0" >>confdefs.h
 
 fi
 
+
+#
+# Device Manager
+#
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Device Manager wrapper libraries" >&5
+$as_echo_n "checking whether to build Device Manager wrapper libraries... " >&6; }
+# Check whether --enable-device_manager was given.
+if test "${enable_device_manager+set}" = set; then :
+  enableval=$enable_device_manager;
+        case "${enableval}" in
+
+        no|yes)
+            build_device_manager=${enableval}
+            ;;
+
+        *)
+            as_fn_error $? "Invalid value ${enableval} for --enable-device-manager" "$LINENO" 5
+            ;;
+
+        esac
+
+else
+
+        # Enable building Device Manager wrapper libraries by default UNLESS the "sockets" network
+        # stack is not enabled.
+        if test ${WEAVE_SYSTEM_CONFIG_USE_SOCKETS} -eq 1; then
+            build_device_manager=yes
+        else
+            build_device_manager=no
+        fi
+
+fi
+
+
+# Fail if Device Manager wrapper libraries are enabled but the "sockets" network stack is not.  This combination is
+# not supported.
+if test "${build_device_manager}" = "yes"; then
+    if test "${WEAVE_SYSTEM_CONFIG_USE_SOCKETS}" eq 0; then
+        as_fn_error $? "Building Device Manager wrapper libraries requires selecting sockets as a target network stack" "$LINENO" 5
+    fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${build_device_manager}" >&5
+$as_echo "${build_device_manager}" >&6; }
+ if test "${build_device_manager}" = "yes"; then
+  WEAVE_BUILD_DEVICE_MANAGER_TRUE=
+  WEAVE_BUILD_DEVICE_MANAGER_FALSE='#'
+else
+  WEAVE_BUILD_DEVICE_MANAGER_TRUE='#'
+  WEAVE_BUILD_DEVICE_MANAGER_FALSE=
+fi
+
+
+
 #
 # Verhoeff support
 #
@@ -24539,6 +24558,13 @@ else
 fi
 
 
+
+#
+# Fuzzing support
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable fuzzing" >&5
+$as_echo_n "checking whether to enable fuzzing... " >&6; }
+
 # Check whether --enable-fuzzing was given.
 if test "${enable_fuzzing+set}" = set; then :
   enableval=$enable_fuzzing;
@@ -29349,7 +29375,7 @@ fi
 #
 # Identify the various makefiles and auto-generated files for the package
 #
-ac_config_files="$ac_config_files Makefile third_party/Makefile third_party/lwip/Makefile third_party/android/platform-system/core-mincrypt/Makefile third_party/micro-ecc/Makefile third_party/openssl/Makefile third_party/openssl-jpake/Makefile src/Makefile src/include/Makefile src/ble/Makefile src/lwip/Makefile src/platform/ble/bluez/Makefile src/system/Makefile src/inet/Makefile src/lib/Makefile src/lib/support/Makefile src/lib/support/verhoeff/Makefile src/wrappers/jni/Makefile src/wrappers/jni/jni-utils/Makefile src/wrappers/jni/security-support/Makefile src/device-manager/Makefile src/device-manager/cocoa/Makefile src/device-manager/java/Makefile src/device-manager/python/Makefile src/warm/Makefile src/ra-daemon/Makefile src/test-apps/Makefile src/test-apps/wrapper-tests/jni/Makefile src/test-apps/fuzz/Makefile src/tools/weave/Makefile src/tools/misc/Makefile src/examples/Makefile src/adaptations/device-layer/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile third_party/Makefile third_party/lwip/Makefile third_party/android/platform-system/core-mincrypt/Makefile third_party/micro-ecc/Makefile third_party/openssl/Makefile third_party/openssl-jpake/Makefile src/Makefile src/include/Makefile src/ble/Makefile src/lwip/Makefile src/platform/ble/bluez/Makefile src/system/Makefile src/inet/Makefile src/lib/Makefile src/lib/support/Makefile src/lib/support/verhoeff/Makefile src/wrappers/jni/Makefile src/wrappers/jni/jni-utils/Makefile src/wrappers/jni/security-support/Makefile src/device-manager/cocoa/Makefile src/device-manager/java/Makefile src/device-manager/python/Makefile src/warm/Makefile src/ra-daemon/Makefile src/test-apps/Makefile src/test-apps/wrapper-tests/jni/Makefile src/test-apps/fuzz/Makefile src/tools/weave/Makefile src/tools/misc/Makefile src/examples/Makefile src/adaptations/device-layer/Makefile doc/Makefile"
 
 
 #
@@ -29644,10 +29670,6 @@ if test -z "${WEAVE_RUN_HAPPY_SERVICEDIR_TRUE}" && test -z "${WEAVE_RUN_HAPPY_SE
   as_fn_error $? "conditional \"WEAVE_RUN_HAPPY_SERVICEDIR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WEAVE_BUILD_DEVICE_MANAGER_TRUE}" && test -z "${WEAVE_BUILD_DEVICE_MANAGER_FALSE}"; then
-  as_fn_error $? "conditional \"WEAVE_BUILD_DEVICE_MANAGER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${WEAVE_ENABLE_WOBLE_TEST_TRUE}" && test -z "${WEAVE_ENABLE_WOBLE_TEST_FALSE}"; then
   as_fn_error $? "conditional \"WEAVE_ENABLE_WOBLE_TEST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -29728,6 +29750,10 @@ if test -z "${INET_CONFIG_ENABLE_ASYNC_DNS_SOCKETS_TRUE}" && test -z "${INET_CON
   as_fn_error $? "conditional \"INET_CONFIG_ENABLE_ASYNC_DNS_SOCKETS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WEAVE_BUILD_DEVICE_MANAGER_TRUE}" && test -z "${WEAVE_BUILD_DEVICE_MANAGER_FALSE}"; then
+  as_fn_error $? "conditional \"WEAVE_BUILD_DEVICE_MANAGER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WEAVE_WITH_VERHOEFF_TRUE}" && test -z "${WEAVE_WITH_VERHOEFF_FALSE}"; then
   as_fn_error $? "conditional \"WEAVE_WITH_VERHOEFF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -30205,7 +30231,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Weave $as_me g06664935-dirty, which was
+This file was extended by Weave $as_me g212389ac-dirty, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -30272,7 +30298,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Weave config.status g06664935-dirty
+Weave config.status g212389ac-dirty
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -30799,7 +30825,6 @@ do
     "src/wrappers/jni/Makefile") CONFIG_FILES="$CONFIG_FILES src/wrappers/jni/Makefile" ;;
     "src/wrappers/jni/jni-utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/wrappers/jni/jni-utils/Makefile" ;;
     "src/wrappers/jni/security-support/Makefile") CONFIG_FILES="$CONFIG_FILES src/wrappers/jni/security-support/Makefile" ;;
-    "src/device-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/device-manager/Makefile" ;;
     "src/device-manager/cocoa/Makefile") CONFIG_FILES="$CONFIG_FILES src/device-manager/cocoa/Makefile" ;;
     "src/device-manager/java/Makefile") CONFIG_FILES="$CONFIG_FILES src/device-manager/java/Makefile" ;;
     "src/device-manager/python/Makefile") CONFIG_FILES="$CONFIG_FILES src/device-manager/python/Makefile" ;;