Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding rapidjson/20200410 #1464

Merged
merged 4 commits into from
May 12, 2020
Merged

adding rapidjson/20200410 #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f26fa7
adding rapidjson/20200410
prince-chrismc Apr 26, 2020
38bdab9
selecting a version to highlight 'upstream update' while respecting s…
prince-chrismc Apr 27, 2020
dce7099
squashing everything into one folder
prince-chrismc Apr 27, 2020
fd01761
:circus: goodluck.20200410: new universal version
prince-chrismc May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions recipes/rapidjson/1.1.x/conandata.yml
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions recipes/rapidjson/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
sources:
"1.1.0":
url: "https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz"
sha256: bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
"cci.20200410":
url: "https://github.com/Tencent/rapidjson/archive/8f4c021fa2f1e001d2376095928fc0532adf2ae6.zip"
sha256: e6fc99c7df7f29995838a764dd68df87b71db360f7727ace467b21b82c85efda
10 changes: 7 additions & 3 deletions recipes/rapidjson/1.1.x/conanfile.py → recipes/rapidjson/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from conans import ConanFile, tools
import os
import glob


class RapidjsonConan(ConanFile):
Expand All @@ -10,12 +11,15 @@ class RapidjsonConan(ConanFile):
homepage = "http://rapidjson.org"
license = "MIT"
no_copy_source = True
_source_subfolder = "source_subfolder"

@property
def _source_subfolder(self):
return "source_subfolder"

def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_folder = self.name + "-" + self.version
os.rename(extracted_folder, self._source_subfolder)
extracted_dir = glob.glob(self.name + "-*/")[0]
prince-chrismc marked this conversation as resolved.
Show resolved Hide resolved
os.rename(extracted_dir, self._source_subfolder)

def package(self):
include_folder = os.path.join(self._source_subfolder, "include")
Expand Down
2 changes: 0 additions & 2 deletions ...pidjson/1.1.x/test_package/CMakeLists.txt → ...rapidjson/all/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
0 ...rapidjson/1.1.x/test_package/conanfile.py → ...s/rapidjson/all/test_package/conanfile.py
View file
Open in desktop
File renamed without changes.
0 ...djson/1.1.x/test_package/test_package.cpp → ...pidjson/all/test_package/test_package.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion recipes/rapidjson/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"1.1.0":
folder: "1.1.x"
folder: "all"
"cci.20200410":
folder: "all"