[Abseil] Retire recipe as it was accepted upstream in conan-center-index

0x8000-0000 · May 18, 2020 · 27eb1f4 · 27eb1f4
1 parent f47cefa
commit 27eb1f4
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 197 deletions.
diff --git a/README.md b/README.md
@@ -17,8 +17,6 @@ Building
 --------
 
    ```shell
-   $ cd recipes/abseil
-   $ conan create . abseil/20200225.2@signbit/testing
    $ cd ../protoc_installer
    $ conan create . protobuf_compiler/3.11.4@signbit/testing
    $ cd ../grpc_plugin
@@ -34,17 +32,6 @@ Testing
 -------
 
    ```shell
-   $ cd tests
-   # abseil
-   $ mkdir abseil.build
-   $ cd abseil.build
-   $ conan install ../abseil
-   $ cmake ../abseil
-   $ cmake --build .
-   $ ./test1
-   dewey                                                                    
-   huey            
-   louie 
    # grpc
    $ cd ../
    $ mkdir greeter_example.build
@@ -66,7 +53,6 @@ License
 
 These scripts have been heavily influenced by the original upstream sources:
 
-   * <https://github.com/abseil/abseil-cpp/blob/master/conanfile.py> licensed under Apache-2.0
    * <https://github.com/bincrafters/conan-protoc_installer> licensed under MIT
    * <https://github.com/inexorgame/conan-grpc> licensed under MIT
 

diff --git a/recipes/abseil/CMakeLists.txt b/recipes/abseil/CMakeLists.txt
diff --git a/recipes/abseil/conandata.yml b/recipes/abseil/conandata.yml
diff --git a/recipes/abseil/conanfile.py b/recipes/abseil/conanfile.py
diff --git a/recipes/grpc/conanfile.py b/recipes/grpc/conanfile.py
@@ -26,13 +26,13 @@ def _build_subfolder(self):
         return "build_subfolder"
 
     def requirements(self):
-        self.requires.add("zlib/1.2.11")
-        self.requires.add("gflags/2.2.2")
-        self.requires.add("openssl/1.1.1e")
-        self.requires.add("libuv/1.34.2")
-        self.requires.add("c-ares/1.15.0")
-        self.requires.add("protobuf/3.11.4")
-        self.requires.add("abseil/20200225.2@signbit/testing")
+        self.requires("zlib/1.2.11")
+        self.requires("gflags/2.2.2")
+        self.requires("openssl/1.1.1e")
+        self.requires("libuv/1.34.2")
+        self.requires("c-ares/1.15.0")
+        self.requires("protobuf/3.11.4")
+        self.requires("abseil/20200225.2")
 
     def build_requirements(self):
         self.build_requires("protobuf_compiler/3.11.4@signbit/testing")

diff --git a/recipes/grpc_plugin/conanfile.py b/recipes/grpc_plugin/conanfile.py
@@ -24,13 +24,13 @@ def _build_subfolder(self):
         return "build_subfolder"
 
     def requirements(self):
-        self.requires.add("zlib/1.2.11")
-        self.requires.add("gflags/2.2.2")
-        self.requires.add("openssl/1.1.1e")
-        self.requires.add("libuv/1.34.2")
-        self.requires.add("c-ares/1.15.0")
-        self.requires.add("protobuf/3.11.4")
-        self.requires.add("abseil/20200225.2@signbit/testing")
+        self.requires("zlib/1.2.11")
+        self.requires("gflags/2.2.2")
+        self.requires("openssl/1.1.1e")
+        self.requires("libuv/1.34.2")
+        self.requires("c-ares/1.15.0")
+        self.requires("protobuf/3.11.4")
+        self.requires("abseil/20200225.2")
 
     def build_requirements(self):
         self.build_requires("protobuf_compiler/3.11.4@signbit/testing")

diff --git a/tests/abseil/CMakeLists.txt b/tests/abseil/CMakeLists.txt
diff --git a/tests/abseil/conanfile.txt b/tests/abseil/conanfile.txt
diff --git a/tests/abseil/test1.cpp b/tests/abseil/test1.cpp