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

re2 v2023-06-02 #68

Merged
merged 21 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3ff1a39
updated v2023-06-02
regro-cf-autotick-bot Jun 1, 2023
d70502b
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
regro-cf-autotick-bot Jun 1, 2023
0c3db40
Remove abi_bump_version
h-vetinari May 31, 2023
9b655a0
add dependence on abseil
h-vetinari May 31, 2023
b430f0a
add test for pkg-config metadata
h-vetinari May 31, 2023
1d9f829
clean up build scripts; normalize indentation
h-vetinari May 31, 2023
12b0267
don't rebuild twice on unix; use cmake+ninja exclusively
h-vetinari May 31, 2023
231f036
reflect soversion that pkg-config metadata reports
h-vetinari May 31, 2023
6e9c368
clean up artefact tests
h-vetinari May 31, 2023
33565f1
remove fake variable
h-vetinari May 31, 2023
c249492
remove $CMAKE_ARGS/%CMAKE_ARGS% from CMake integration test
h-vetinari May 31, 2023
33bcff8
re-enable build testing
h-vetinari Jun 1, 2023
4df8e0b
turn into multi-output recipe
h-vetinari Jun 11, 2023
de4cb21
align build folder names between osx/win
h-vetinari Jun 12, 2023
7b18970
introduce libre2-{{ soversion }} and use it as run-export
h-vetinari Jun 12, 2023
48403f0
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
h-vetinari Jun 12, 2023
8c2de94
Restore plain build number
h-vetinari Jun 12, 2023
8f866ee
ensure `libre2-{{ soversion }}` is not co-installable for different s…
h-vetinari Jun 16, 2023
aadbdbd
opt into the new abseil world
h-vetinari Oct 10, 2023
7cce4d6
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
h-vetinari Oct 10, 2023
4f2dfb9
tighten run-constraint for libre2-X
h-vetinari Oct 10, 2023
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
6 changes: 3 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,11 +11,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20220623.0'
- '20230125'
target_platform:
- linux-64
zip_keys:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,11 +15,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20220623.0'
- '20230125'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,11 +11,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20220623.0'
- '20230125'
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
libabseil:
- '20220623.0'
- '20230125'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
libabseil:
- '20220623.0'
- '20230125'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20220623.0'
- '20230125'
target_platform:
- win-64
24 changes: 13 additions & 11 deletions README.md

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

33 changes: 15 additions & 18 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,21 @@
set "CFLAGS= -MD"
set "CXXFLAGS= -MD"

mkdir -p cmake-build
cd cmake-build
set "VS_VERSION=14.0"
set "VS_MAJOR=14"
set "VS_YEAR=2015"
cmake -DBUILD_SHARED_LIBS=ON ^
-DCMAKE_CXX_STANDARD=17 ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
-G "NMake Makefiles" ^
%SRC_DIR%
if errorlevel 1 exit 1
mkdir -p build
cd build

nmake
if errorlevel 1 exit 1
cmake -G Ninja ^
-DBUILD_SHARED_LIBS=ON ^
-DCMAKE_CXX_STANDARD=17 ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
-DRE2_BUILD_TESTING=ON ^
..
if %ERRORLEVEL% neq 0 exit 1

ctest -E "dfa|exhaustive|random"
if errorlevel 1 exit 1
cmake --build .
if %ERRORLEVEL% neq 0 exit 1

nmake install
if errorlevel 1 exit 1
:: same test filter as upstream uses, see build.sh
ctest --output-on-failure -E "dfa|exhaustive|random"
if %ERRORLEVEL% neq 0 exit 1
39 changes: 24 additions & 15 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,27 @@ if [[ "${target_platform}" == osx-* ]]; then
export CXXFLAGS="${CXXFLAGS} -DTARGET_OS_OSX=1"
fi

mkdir build-cmake
pushd build-cmake
cmake ${CMAKE_ARGS} -GNinja \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_PREFIX_PATH=$PREFIX \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_INSTALL_LIBDIR=lib \
-DRE2_BUILD_TESTING=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
..
ninja install
popd
# Also do this installation to get .pc files. This duplicates the compilation but gets us all necessary components without patching.
make -j "${CPU_COUNT}" prefix=${PREFIX} shared-install
if [[ "${target_platform}" == "${build_platform}" ]]; then
export CMAKE_ARGS="${CMAKE_ARGS} -DRE2_BUILD_TESTING=ON"
fi

mkdir build
cd build

cmake -GNinja \
${CMAKE_ARGS} \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_PREFIX_PATH=$PREFIX \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
..

cmake --build .

if [[ "${target_platform}" == "${build_platform}" ]]; then
# same test filter as upstream uses, see
# https://github.com/google/re2/blob/main/.github/cmake.sh
ctest --output-on-failure -E "dfa|exhaustive|random"
fi
11 changes: 11 additions & 0 deletions recipe/install.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@echo on

if [%PKG_NAME%] == [re2] (
REM everything else but the DLL
cmake --install build
if %ERRORLEVEL% neq 0 exit 1
) else (
REM package only the DLL for the output libre2-{{soversion}};
REM sorted second because it keeps changing names, easier in "else"
copy build\re2.dll %LIBRARY_BIN%
)
15 changes: 15 additions & 0 deletions recipe/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash
set -ex

if [[ "$PKG_NAME" == "re2" ]]; then
# everything else but the versioned libs
cmake --install ./build
else
# package only the versioned library for the output libre2-{{soversion}};
# sorted second because it keeps changing names, easier in "else"
if [[ "${target_platform}" == linux-* ]]; then
cp ./build/libre2.so.* $PREFIX/lib
else
cp ./build/libre2.*.dylib $PREFIX/lib
fi
fi
Loading