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.

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

Add a package for v1.2.0 #2

Merged
merged 23 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 52 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
target_platform:
- linux-64
zlib:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libxml2:
- '2.12'
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
Expand Down
16 changes: 16 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
clangdev:
- 17.*
cxx_compiler:
- vs2019
libxml2:
- '2'
target_platform:
- win-64
zlib:
- '1.2'
zstd:
- '1.5'
5 changes: 3 additions & 2 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

120 changes: 120 additions & 0 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions azure-pipelines.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
rem # Common settings
setlocal EnableDelayedExpansion

set CPU_COUNT=%NUMBER_OF_PROCESSORS%
set PATH="%PATH%;%BUILD_PREFIX%/x86_64-conda-linux-gnu/lib;%BUILD_PREFIX/lib;%PREFIX/lib"
set INCLUDE="%INCLUDE%;%cd%/include;%BUILD_PREFIX/x86_64-conda-linux-gnu/include/c++/12.3.0;%BUILD_PREFIX%/x86_64-conda-linux-gnu/include/c++/12.3.0/x86_64-conda-linux-gnu;%BUILD_PREFIX%/x86_64-conda-linux-gnu/sysroot/usr/include;%BUILD_PREFIX%/include;%PREFIX%/include"

rem ### Build CppInterOp next to llvm-project.

pushd cppinterop
mkdir build
Expand All @@ -19,7 +15,9 @@ cmake ^
-DCPPINTEROP_ENABLE_TESTING=ON ^
..

ninja -j%CPU_COUNT% check-cppinterop
if errorlevel 1 exit 1

rem ninja -j%CPU_COUNT% check-cppinterop
rem if errorlevel 1 exit 1

ninja install
Expand Down
14 changes: 6 additions & 8 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "CppInterOp" %}
{% set build_number = 1 %}
{% set version = "1.1.0" %}
{% set build_number = 0 %}
{% set version = "1.2.0" %}
{% set revision_tag = "v"+version %}

package:
Expand All @@ -9,15 +9,14 @@ package:

source:
- url: https://github.com/compiler-research/CppInterOp/archive/refs/tags/{{ revision_tag }}.tar.gz
sha256: 29377ba4fecd82395efd2fefcaa911fe72396d78293607852bd0e9b9ab65d1dc
sha256: b3cf25f500624fe12ffc40f858a04c46daea808298e64d924b594eb35ca1c806
folder: cppinterop
patches:
- patches/cppinterop/cppinterop-1.1.0-0001-cppinterop-Add-missing-dependencies.patch
- patches/cppinterop/0001-cmake-Work-around-a-bug-in-the-llvm-config.patch
- path: patches
folder: add_patches

build:
skip: true # [win]
number: {{ build_number }}
string: clang{{ (clangdev or "None").split(".")[0] }}_repl_h{{ PKG_HASH }}_{{ build_number }}

Expand All @@ -28,7 +27,6 @@ requirements:
- make # [unix]
- ninja # [win]
- {{ compiler('cxx') }}
- wget
- llvm {{ clangdev }}
- llvmdev {{ clangdev }}
- clangdev {{ clangdev }}
Expand All @@ -42,7 +40,7 @@ requirements:
- backtrace # [unix and x86]
- libxml2
- zlib
- zstd
- zstd # [not win]
- libcxx {{ cxx_compiler_version }} # [osx]
- libstdcxx-ng {{ cxx_compiler_version }} # [linux]
run_constrained:
Expand All @@ -56,7 +54,7 @@ requirements:
test:
commands:
- test -f $PREFIX/lib/libclangCppInterOp${SHLIB_EXT} # [unix]
- if not exist %LIBRARY_BIN%\\libclangCppInterOp.dll exit 1 # [win]
- if not exist %LIBRARY_BIN%\\clangCppInterOp.dll exit 1 # [win]

about:
home: https://github.com/compiler-research/CppInterOp
Expand Down
Loading