-
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #137 from mattip/v2.9.0-windows
unskip windows build
- Loading branch information
Showing
11 changed files
with
237 additions
and
13 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
c_compiler: | ||
- vs2019 | ||
channel_sources: | ||
- conda-forge | ||
channel_targets: | ||
- conda-forge main | ||
curl: | ||
- '8' | ||
cxx_compiler: | ||
- vs2019 | ||
libgrpc: | ||
- '1.59' | ||
nodejs: | ||
- '18' | ||
- '20' | ||
pin_run_as_build: | ||
python: | ||
min_pin: x.x | ||
max_pin: x.x | ||
python: | ||
- 3.10.* *_cpython | ||
target_platform: | ||
- win-64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
c_compiler: | ||
- vs2019 | ||
channel_sources: | ||
- conda-forge | ||
channel_targets: | ||
- conda-forge main | ||
curl: | ||
- '8' | ||
cxx_compiler: | ||
- vs2019 | ||
libgrpc: | ||
- '1.59' | ||
nodejs: | ||
- '18' | ||
- '20' | ||
pin_run_as_build: | ||
python: | ||
min_pin: x.x | ||
max_pin: x.x | ||
python: | ||
- 3.11.* *_cpython | ||
target_platform: | ||
- win-64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
c_compiler: | ||
- vs2019 | ||
channel_sources: | ||
- conda-forge | ||
channel_targets: | ||
- conda-forge main | ||
curl: | ||
- '8' | ||
cxx_compiler: | ||
- vs2019 | ||
libgrpc: | ||
- '1.59' | ||
nodejs: | ||
- '18' | ||
- '20' | ||
pin_run_as_build: | ||
python: | ||
min_pin: x.x | ||
max_pin: x.x | ||
python: | ||
- 3.8.* *_cpython | ||
target_platform: | ||
- win-64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
c_compiler: | ||
- vs2019 | ||
channel_sources: | ||
- conda-forge | ||
channel_targets: | ||
- conda-forge main | ||
curl: | ||
- '8' | ||
cxx_compiler: | ||
- vs2019 | ||
libgrpc: | ||
- '1.59' | ||
nodejs: | ||
- '18' | ||
- '20' | ||
pin_run_as_build: | ||
python: | ||
min_pin: x.x | ||
max_pin: x.x | ||
python: | ||
- 3.9.* *_cpython | ||
target_platform: | ||
- win-64 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
recipe/patches/0006-remove-bazel-command-line-output-directory-override.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
From e06f87d932ed2a44e2ddc842110ecc855e952a86 Mon Sep 17 00:00:00 2001 | ||
From: Matti Picus <matti.picus@gmail.com> | ||
Date: Sun, 21 Jan 2024 18:42:39 +0200 | ||
Subject: [PATCH 6/7] remove bazel command line output directory override | ||
|
||
--- | ||
python/setup.py | 15 +-------------- | ||
1 file changed, 1 insertion(+), 14 deletions(-) | ||
|
||
diff --git a/python/setup.py b/python/setup.py | ||
index 0aa524af1b..531a78eade 100644 | ||
--- a/python/setup.py | ||
+++ b/python/setup.py | ||
@@ -469,20 +469,7 @@ def build(build_python, build_java, build_cpp): | ||
if not is_automated_build: | ||
bazel_precmd_flags = [] | ||
if is_automated_build: | ||
- root_dir = os.path.join( | ||
- os.path.abspath(os.environ["SRC_DIR"]), "..", "bazel-root" | ||
- ) | ||
- out_dir = os.path.join(os.path.abspath(os.environ["SRC_DIR"]), "..", "b-o") | ||
- | ||
- for d in (root_dir, out_dir): | ||
- if not os.path.exists(d): | ||
- os.makedirs(d) | ||
- | ||
- bazel_precmd_flags = [ | ||
- "--output_user_root=" + root_dir, | ||
- "--output_base=" + out_dir, | ||
- ] | ||
- | ||
+ bazel_precmd_flags = [] | ||
if is_native_windows_or_msys(): | ||
bazel_flags.append("--enable_runfiles=false") | ||
|
||
-- | ||
2.33.0.windows.2 | ||
|