Inicio Explorar Ayuda
Iniciar sesión
carto
/
grpc
2
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

Regenerating project files, and adding experimental disclaimer.

Nicolas "Pixel" Noble hace 9 años
padre
955b95de7e
commit
b360c8acc7
Se han modificado 3 ficheros con 16 adiciones y 4 borrados
Dividir vista Mostrar estadísticas de diff
  1. 11 2
      CMakeLists.txt
  2. 4 1
      templates/CMakeLists.txt.template
  3. 1 1
      third_party/protobuf

+ 11 - 2
CMakeLists.txt
Ver fichero 

@@ -4,7 +4,10 @@
 
 # Please look at the templates directory instead.
 
 # This file can be regenerated from the template by running
 
 # tools/buildgen/generate_projects.sh
 
-
 
+#
 
+# Additionally, this is currently very experimental, and unsupported.
 
+# Further work will happen on that file.
 
+#
 
 # Copyright 2015, Google Inc.
 
 # All rights reserved.
 
 #
 
@@ -39,7 +42,7 @@
 
 cmake_minimum_required(VERSION 2.8)
 
 
 set(PACKAGE_NAME      "grpc")
 
-set(PACKAGE_VERSION   "0.15.0-dev")
 
+set(PACKAGE_VERSION   "0.16.0-dev")
 
 set(PACKAGE_STRING    "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 
 set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 
 set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
 
@@ -142,6 +145,7 @@ add_library(grpc
 
   src/core/lib/iomgr/endpoint_pair_posix.c
 
   src/core/lib/iomgr/endpoint_pair_windows.c
 
   src/core/lib/iomgr/error.c
 
+  src/core/lib/iomgr/ev_epoll_linux.c
 
   src/core/lib/iomgr/ev_poll_and_epoll_posix.c
 
   src/core/lib/iomgr/ev_poll_posix.c
 
   src/core/lib/iomgr/ev_posix.c
 
@@ -152,6 +156,7 @@ add_library(grpc
 
   src/core/lib/iomgr/iomgr_posix.c
 
   src/core/lib/iomgr/iomgr_windows.c
 
   src/core/lib/iomgr/load_file.c
 
+  src/core/lib/iomgr/network_status_tracker.c
 
   src/core/lib/iomgr/polling_entity.c
 
   src/core/lib/iomgr/pollset_set_windows.c
 
   src/core/lib/iomgr/pollset_windows.c
 
@@ -345,6 +350,7 @@ add_library(grpc_cronet
 
   src/core/lib/iomgr/endpoint_pair_posix.c
 
   src/core/lib/iomgr/endpoint_pair_windows.c
 
   src/core/lib/iomgr/error.c
 
+  src/core/lib/iomgr/ev_epoll_linux.c
 
   src/core/lib/iomgr/ev_poll_and_epoll_posix.c
 
   src/core/lib/iomgr/ev_poll_posix.c
 
   src/core/lib/iomgr/ev_posix.c
 
@@ -355,6 +361,7 @@ add_library(grpc_cronet
 
   src/core/lib/iomgr/iomgr_posix.c
 
   src/core/lib/iomgr/iomgr_windows.c
 
   src/core/lib/iomgr/load_file.c
 
+  src/core/lib/iomgr/network_status_tracker.c
 
   src/core/lib/iomgr/polling_entity.c
 
   src/core/lib/iomgr/pollset_set_windows.c
 
   src/core/lib/iomgr/pollset_windows.c
 
@@ -525,6 +532,7 @@ add_library(grpc_unsecure
 
   src/core/lib/iomgr/endpoint_pair_posix.c
 
   src/core/lib/iomgr/endpoint_pair_windows.c
 
   src/core/lib/iomgr/error.c
 
+  src/core/lib/iomgr/ev_epoll_linux.c
 
   src/core/lib/iomgr/ev_poll_and_epoll_posix.c
 
   src/core/lib/iomgr/ev_poll_posix.c
 
   src/core/lib/iomgr/ev_posix.c
 
@@ -535,6 +543,7 @@ add_library(grpc_unsecure
 
   src/core/lib/iomgr/iomgr_posix.c
 
   src/core/lib/iomgr/iomgr_windows.c
 
   src/core/lib/iomgr/load_file.c
 
+  src/core/lib/iomgr/network_status_tracker.c
 
   src/core/lib/iomgr/polling_entity.c
 
   src/core/lib/iomgr/pollset_set_windows.c
 
   src/core/lib/iomgr/pollset_windows.c

+ 4 - 1
templates/CMakeLists.txt.template
Ver fichero 

@@ -6,7 +6,10 @@
 
   # Please look at the templates directory instead.
 
   # This file can be regenerated from the template by running
 
   # tools/buildgen/generate_projects.sh
 
-
 
+  #
 
+  # Additionally, this is currently very experimental, and unsupported.
 
+  # Further work will happen on that file.
 
+  #
 
   # Copyright 2015, Google Inc.
 
   # All rights reserved.
 
   #

+ 1 - 1
third_party/protobuf
Ver fichero 

@@ -1 +1 @@
 
-Subproject commit d4d13a4349e4e59d67f311185ddcc1890d956d7a
 
+Subproject commit 3470b6895aa659b7559ed678e029a5338e535f14