:circus: goodluck.20200410: new universal version

conan-io · May 11, 2020 · fd01761 · fd01761
1 parent dce7099
commit fd01761
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/recipes/rapidjson/all/conandata.yml b/recipes/rapidjson/all/conandata.yml
@@ -2,6 +2,6 @@ sources:
   "1.1.0":
     url: "https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz"
     sha256: bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
-  "1.1.0-cci.20200410":
+  "cci.20200410":
     url: "https://github.com/Tencent/rapidjson/archive/8f4c021fa2f1e001d2376095928fc0532adf2ae6.zip"
     sha256: e6fc99c7df7f29995838a764dd68df87b71db360f7727ace467b21b82c85efda
diff --git a/recipes/rapidjson/all/conanfile.py b/recipes/rapidjson/all/conanfile.py
@@ -18,11 +18,7 @@ def _source_subfolder(self):
 
     def source(self):
         tools.get(**self.conan_data["sources"][self.version])
-        version = tools.Version(self.version)
-        if "cci" in version.prerelease: # Assuming it's a commit url
-            extracted_dir = glob.glob(self.name + "-*/")[0]
-        else:
-            extracted_dir = self.name + "-" + self.version
+        extracted_dir = glob.glob(self.name + "-*/")[0]
         os.rename(extracted_dir, self._source_subfolder)
 
     def package(self):

diff --git a/recipes/rapidjson/all/test_package/CMakeLists.txt b/recipes/rapidjson/all/test_package/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(test_package)
 
-set(CMAKE_VERBOSE_MAKEFILE TRUE)
-
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
 

diff --git a/recipes/rapidjson/config.yml b/recipes/rapidjson/config.yml
@@ -1,5 +1,5 @@
 versions:
   "1.1.0":
     folder: "all"
-  "1.1.0-cci.20200410":
+  "cci.20200410":
     folder: "all"