Migrate to the new c-ares dir

1 files changed, 84 insertions, 84 deletions

diff --git a/src/c-ares/gen_build_yaml.py b/src/c-ares/gen_build_yaml.py
index 28ef7362d1..b2ae971f37 100755
--- a/src/c-ares/gen_build_yaml.py
+++ b/src/c-ares/gen_build_yaml.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.7
 
-# Copyright 2016, Google Inc.
+# Copyright 2015, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,24 +40,24 @@ out = {}
 
 try:
   def gen_ares_build(x):
-    subprocess.call("third_party/c-ares/buildconf", shell=True)
-    subprocess.call("third_party/c-ares/configure", shell=True)
+    subprocess.call("third_party/cares/cares/buildconf", shell=True)
+    subprocess.call("third_party/cares/cares/configure", shell=True)
 
   def config_platform(x):
     if 'linux' in sys.platform:
-      return 'src/c-ares/config_linux/ares_config.h'
+      return 'src/cares/cares/config_linux/ares_config.h'
     if 'darwin' in sys.platform:
-      return 'src/c-ares/config_darwin/ares_config.h'
-    if not os.path.isfile('third_party/c-ares/ares_config.h'):
+      return 'src/cares/cares/config_darwin/ares_config.h'
+    if not os.path.isfile('third_party/cares/cares/ares_config.h'):
       gen_ares_build(x)
-    return 'third_party/c-ares/ares_config.h'
+    return 'third_party/cares/cares/ares_config.h'
 
   def ares_build(x):
-    if os.path.isfile('src/c-ares/ares_build.h'):
-      return 'src/c-ares/ares_build.h'
-    if not os.path.isfile('third_party/c-ares/ares_build.h'):
+    if os.path.isfile('src/cares/cares/ares_build.h'):
+      return 'src/cares/cares/ares_build.h'
+    if not os.path.isfile('third_party/cares/cares/ares_build.h'):
       gen_ares_build(x)
-    return 'third_party/c-ares/ares_build.h'
+    return 'third_party/cares/cares/ares_build.h'
 
   out['libs'] = [{
       'name': 'ares',
@@ -66,81 +66,81 @@ try:
       'language': 'c',
       'secure': 'no',
       'src': [
-        "third_party/c-ares/ares__close_sockets.c",
-        "third_party/c-ares/ares__get_hostent.c",
-        "third_party/c-ares/ares__read_line.c",
-        "third_party/c-ares/ares__timeval.c",
-        "third_party/c-ares/ares_cancel.c",
-        "third_party/c-ares/ares_create_query.c",
-        "third_party/c-ares/ares_data.c",
-        "third_party/c-ares/ares_destroy.c",
-        "third_party/c-ares/ares_expand_name.c",
-        "third_party/c-ares/ares_expand_string.c",
-        "third_party/c-ares/ares_fds.c",
-        "third_party/c-ares/ares_free_hostent.c",
-        "third_party/c-ares/ares_free_string.c",
-        "third_party/c-ares/ares_getenv.c",
-        "third_party/c-ares/ares_gethostbyaddr.c",
-        "third_party/c-ares/ares_gethostbyname.c",
-        "third_party/c-ares/ares_getnameinfo.c",
-        "third_party/c-ares/ares_getopt.c",
-        "third_party/c-ares/ares_getsock.c",
-        "third_party/c-ares/ares_init.c",
-        "third_party/c-ares/ares_library_init.c",
-        "third_party/c-ares/ares_llist.c",
-        "third_party/c-ares/ares_mkquery.c",
-        "third_party/c-ares/ares_nowarn.c",
-        "third_party/c-ares/ares_options.c",
-        "third_party/c-ares/ares_parse_a_reply.c",
-        "third_party/c-ares/ares_parse_aaaa_reply.c",
-        "third_party/c-ares/ares_parse_mx_reply.c",
-        "third_party/c-ares/ares_parse_naptr_reply.c",
-        "third_party/c-ares/ares_parse_ns_reply.c",
-        "third_party/c-ares/ares_parse_ptr_reply.c",
-        "third_party/c-ares/ares_parse_soa_reply.c",
-        "third_party/c-ares/ares_parse_srv_reply.c",
-        "third_party/c-ares/ares_parse_txt_reply.c",
-        "third_party/c-ares/ares_platform.c",
-        "third_party/c-ares/ares_process.c",
-        "third_party/c-ares/ares_query.c",
-        "third_party/c-ares/ares_search.c",
-        "third_party/c-ares/ares_send.c",
-        "third_party/c-ares/ares_strcasecmp.c",
-        "third_party/c-ares/ares_strdup.c",
-        "third_party/c-ares/ares_strerror.c",
-        "third_party/c-ares/ares_timeout.c",
-        "third_party/c-ares/ares_version.c",
-        "third_party/c-ares/ares_writev.c",
-        "third_party/c-ares/bitncmp.c",
-        "third_party/c-ares/inet_net_pton.c",
-        "third_party/c-ares/inet_ntop.c",
-        "third_party/c-ares/windows_port.c",
+        "third_party/cares/cares/ares__close_sockets.c",
+        "third_party/cares/cares/ares__get_hostent.c",
+        "third_party/cares/cares/ares__read_line.c",
+        "third_party/cares/cares/ares__timeval.c",
+        "third_party/cares/cares/ares_cancel.c",
+        "third_party/cares/cares/ares_create_query.c",
+        "third_party/cares/cares/ares_data.c",
+        "third_party/cares/cares/ares_destroy.c",
+        "third_party/cares/cares/ares_expand_name.c",
+        "third_party/cares/cares/ares_expand_string.c",
+        "third_party/cares/cares/ares_fds.c",
+        "third_party/cares/cares/ares_free_hostent.c",
+        "third_party/cares/cares/ares_free_string.c",
+        "third_party/cares/cares/ares_getenv.c",
+        "third_party/cares/cares/ares_gethostbyaddr.c",
+        "third_party/cares/cares/ares_gethostbyname.c",
+        "third_party/cares/cares/ares_getnameinfo.c",
+        "third_party/cares/cares/ares_getopt.c",
+        "third_party/cares/cares/ares_getsock.c",
+        "third_party/cares/cares/ares_init.c",
+        "third_party/cares/cares/ares_library_init.c",
+        "third_party/cares/cares/ares_llist.c",
+        "third_party/cares/cares/ares_mkquery.c",
+        "third_party/cares/cares/ares_nowarn.c",
+        "third_party/cares/cares/ares_options.c",
+        "third_party/cares/cares/ares_parse_a_reply.c",
+        "third_party/cares/cares/ares_parse_aaaa_reply.c",
+        "third_party/cares/cares/ares_parse_mx_reply.c",
+        "third_party/cares/cares/ares_parse_naptr_reply.c",
+        "third_party/cares/cares/ares_parse_ns_reply.c",
+        "third_party/cares/cares/ares_parse_ptr_reply.c",
+        "third_party/cares/cares/ares_parse_soa_reply.c",
+        "third_party/cares/cares/ares_parse_srv_reply.c",
+        "third_party/cares/cares/ares_parse_txt_reply.c",
+        "third_party/cares/cares/ares_platform.c",
+        "third_party/cares/cares/ares_process.c",
+        "third_party/cares/cares/ares_query.c",
+        "third_party/cares/cares/ares_search.c",
+        "third_party/cares/cares/ares_send.c",
+        "third_party/cares/cares/ares_strcasecmp.c",
+        "third_party/cares/cares/ares_strdup.c",
+        "third_party/cares/cares/ares_strerror.c",
+        "third_party/cares/cares/ares_timeout.c",
+        "third_party/cares/cares/ares_version.c",
+        "third_party/cares/cares/ares_writev.c",
+        "third_party/cares/cares/bitncmp.c",
+        "third_party/cares/cares/inet_net_pton.c",
+        "third_party/cares/cares/inet_ntop.c",
+        "third_party/cares/cares/windows_port.c",
       ],
       'headers': [
-        "third_party/c-ares/ares.h",
-        "third_party/c-ares/ares_data.h",
-        "third_party/c-ares/ares_dns.h",
-        "third_party/c-ares/ares_getenv.h",
-        "third_party/c-ares/ares_getopt.h",
-        "third_party/c-ares/ares_inet_net_pton.h",
-        "third_party/c-ares/ares_iphlpapi.h",
-        "third_party/c-ares/ares_ipv6.h",
-        "third_party/c-ares/ares_library_init.h",
-        "third_party/c-ares/ares_llist.h",
-        "third_party/c-ares/ares_nowarn.h",
-        "third_party/c-ares/ares_platform.h",
-        "third_party/c-ares/ares_private.h",
-        "third_party/c-ares/ares_rules.h",
-        "third_party/c-ares/ares_setup.h",
-        "third_party/c-ares/ares_strcasecmp.h",
-        "third_party/c-ares/ares_strdup.h",
-        "third_party/c-ares/ares_version.h",
-        "third_party/c-ares/bitncmp.h",
-        "third_party/c-ares/config-win32.h",
-        "third_party/c-ares/setup_once.h",
-        "src/c-ares/ares_build.h",
-        "src/c-ares/config_linux/ares_config.h",
-        "src/c-ares/config_darwin/ares_config.h"
+        "third_party/cares/cares/ares.h",
+        "third_party/cares/cares/ares_data.h",
+        "third_party/cares/cares/ares_dns.h",
+        "third_party/cares/cares/ares_getenv.h",
+        "third_party/cares/cares/ares_getopt.h",
+        "third_party/cares/cares/ares_inet_net_pton.h",
+        "third_party/cares/cares/ares_iphlpapi.h",
+        "third_party/cares/cares/ares_ipv6.h",
+        "third_party/cares/cares/ares_library_init.h",
+        "third_party/cares/cares/ares_llist.h",
+        "third_party/cares/cares/ares_nowarn.h",
+        "third_party/cares/cares/ares_platform.h",
+        "third_party/cares/cares/ares_private.h",
+        "third_party/cares/cares/ares_rules.h",
+        "third_party/cares/cares/ares_setup.h",
+        "third_party/cares/cares/ares_strcasecmp.h",
+        "third_party/cares/cares/ares_strdup.h",
+        "third_party/cares/cares/ares_version.h",
+        "third_party/cares/cares/bitncmp.h",
+        "third_party/cares/cares/config-win32.h",
+        "third_party/cares/cares/setup_once.h",
+        "third_party/cares/ares_build.h",
+        "third_party/cares/config_linux/ares_config.h",
+        "third_party/cares/config_darwin/ares_config.h"
     ],
   }]
 except: