From 3cebe9514a80a833dda2e160172ac54be091d3ba Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 30 May 2023 12:20:43 +0300 Subject: [PATCH 1/9] Ghanged source --- recipe/meta.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2127564..140a095 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,12 +1,13 @@ -{% set version = "0.4.0" %} +{% set version = "0.5.0" %} package: name: jsonarango version: {{ version }} source: - url: https://bitbucket.org/gems4/jsonarango/get/v{{ version }}.tar.gz - sha256: 0b559c03fcc0656856e80cfc2c20d3ef19658014b1a30000cccf1d8557f7ca73 + git_url: https://bitbucket.org/gems4/jsonarango.git + git_rev: v{{ version }} + git_depth: 3 build: number: 1 @@ -20,7 +21,7 @@ requirements: - make host: - curl - - velocypack + test: commands: From 0cd67df2fade3da112030bd79add287ea85e9d09 Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 30 May 2023 12:36:33 +0300 Subject: [PATCH 2/9] Add spdlog dependencies --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 140a095..3b70c2e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,6 +21,7 @@ requirements: - make host: - curl + - spdlog >=1.10.0 test: From 24a01724634e11f9d087c110994940477774a327 Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 30 May 2023 13:00:07 +0300 Subject: [PATCH 3/9] Changed BUILD_EXAMPLES --- recipe/bld.bat | 2 +- recipe/build.sh | 5 +++-- recipe/meta.yaml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 6366631..0e4916a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -15,7 +15,7 @@ cmake -G Ninja ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -DCMAKE_INCLUDE_PATH:PATH="%LIBRARY_INC%" ^ - -DBULID_REMOTE_TESTS=OFF ^ + -DBUILD_EXAMPLES=OFF ^ .. if errorlevel 1 exit 1 ninja install diff --git a/recipe/build.sh b/recipe/build.sh index 1de4535..a687348 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,8 +13,9 @@ cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="$PREFIX" \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DJSONARANGO_BUILD_EXAMPLES=OFF \ + -DBUILD_EXAMPLES=OFF \ .. # Build step -make -j${CPU_COUNT} +#make -j${CPU_COUNT} +make make install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3b70c2e..c34a429 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,6 +19,7 @@ requirements: - cmake - ninja # [win] - make + - git host: - curl - spdlog >=1.10.0 From fd16ececd1808bd0c58648b60ca17e5722f6a365 Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 30 May 2023 13:55:02 +0300 Subject: [PATCH 4/9] Set latest macos --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 9e4e167..b87cace 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-latest strategy: matrix: osx_64_: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c34a429..a326961 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,8 +19,8 @@ requirements: - cmake - ninja # [win] - make - - git host: + - git - curl - spdlog >=1.10.0 From e54b23a7fdab5a138dd7b5db0438e4cef9ca350d Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 30 May 2023 14:34:49 +0300 Subject: [PATCH 5/9] Try fix build MacOS --- recipe/build.sh | 3 +-- recipe/meta.yaml | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index a687348..c7ab05c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -16,6 +16,5 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DBUILD_EXAMPLES=OFF \ .. # Build step -#make -j${CPU_COUNT} -make +make -j${CPU_COUNT} make install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a326961..37dd595 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,6 +23,8 @@ requirements: - git - curl - spdlog >=1.10.0 + - ccache # [unix] + - nlohmann_json test: From 35ca8dbd6288114bc7ff7460c2db1a4618a7a064 Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 30 May 2023 15:48:45 +0300 Subject: [PATCH 6/9] Changed macos build --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- recipe/meta.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index b87cace..876dc6c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-latest + vmImage: macOS-13 strategy: matrix: osx_64_: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 37dd595..2d16cc8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,6 +19,7 @@ requirements: - cmake - ninja # [win] - make + - ccache # [unix] host: - git - curl From b0c3ce97b92303734b52d9302e81bae8b1917795 Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 30 May 2023 18:03:30 +0300 Subject: [PATCH 7/9] Try no sse --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index c7ab05c..11fbb33 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,6 +13,7 @@ cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="$PREFIX" \ -DCMAKE_INSTALL_LIBDIR=lib \ + -DEnableSSE=OFF \ -DBUILD_EXAMPLES=OFF \ .. # Build step From 9a00b49fb14bdaf74812b63751f7703076d3ee5a Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 30 May 2023 22:33:33 +0300 Subject: [PATCH 8/9] New tag rebuild --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 876dc6c..b87cace 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-13 + vmImage: macOS-latest strategy: matrix: osx_64_: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2d16cc8..b091aab 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: git_depth: 3 build: - number: 1 + number: 0 skip: true # [win and vc<14] requirements: From 1f162e04c092ee19c21bf501dfcdbdb9b74b0a06 Mon Sep 17 00:00:00 2001 From: svetad Date: Fri, 2 Jun 2023 11:23:50 +0300 Subject: [PATCH 9/9] New tag --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b091aab..b402819 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ requirements: build: - {{ compiler('cxx') }} - cmake - - ninja # [win] + - ninja - make - ccache # [unix] host: