-
Notifications
You must be signed in to change notification settings - Fork 2
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 win-arm64 support using cl.exe #9
Merged
Merged
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
77a18cd
Add win-arm64 support using cl.exe
isuruf 1d36c3e
debug
isuruf f29ddc5
debug 2
isuruf 4df1392
fix windres
isuruf 453953c
CI
isuruf 6c9a871
use -e
isuruf 71b3d62
fix ci-support
isuruf a815436
fix cl build
isuruf 1486445
no python
isuruf 3415768
use resource compiler
isuruf da23436
fo
isuruf 40ee29c
rc format
isuruf 7773622
remove opt option
isuruf 5de0541
Add user32.lib
isuruf e6a9a55
MD
isuruf 0c14871
add comments
isuruf 5758c51
fix tests
isuruf ddd89bf
define target_platform
isuruf 5b3831d
Use MT
isuruf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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,6 @@ | ||
target_platform: | ||
- win-64 | ||
c_compiler: | ||
- gcc | ||
c_stdlib: | ||
- m2w64-sysroot |
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,6 @@ | ||
target_platform: | ||
- win-arm64 | ||
c_compiler: | ||
- vs | ||
c_stdlib: | ||
- vs |
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
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 |
---|---|---|
@@ -1,5 +1,8 @@ | ||
{% set name = "conda-launchers" %} | ||
{% set version = "24.7.1" %} | ||
{% if target_platform is not defined %} | ||
{% set target_platform = "win-64" %} | ||
{% endif %} | ||
|
||
package: | ||
name: {{ name|lower }} | ||
|
@@ -16,29 +19,32 @@ source: | |
folder: cpython-LICENSE | ||
|
||
build: | ||
number: 0 | ||
number: 1 | ||
skip: true # [not win] | ||
ignore_run_exports_from: | ||
- {{ compiler("m2w64_c") }} | ||
- {{ compiler("c") }} | ||
- {{ stdlib("c") }} | ||
|
||
requirements: | ||
build: | ||
- {{ compiler("m2w64_c") }} | ||
- {{ stdlib("m2w64_c") }} | ||
- posix | ||
- {{ compiler("c") }} | ||
- {{ stdlib("c") }} | ||
# For bash and friends | ||
- m2-base | ||
host: | ||
run: | ||
# Any Python works as `%PREFIX%/python.exe` is present | ||
# cli-64.exe (and friends) will look for it as `../python.exe`, so that's | ||
# why we package the executables in `%PREFIX%/Scripts` | ||
- python | ||
- python # [x86_64] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We are only selecting this so the solver doesn't error out right now, right? But in the future we should re-enable it? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes to both |
||
|
||
test: | ||
commands: | ||
- if not exist "%PREFIX%\\Scripts\\cli-64.exe" exit 1 | ||
- if not exist "%PREFIX%\\Scripts\\cli-64-script.py" exit 1 | ||
- CALL "%PREFIX%\\Scripts\\cli-64.exe" | ||
- if not exist "%PREFIX%\\Scripts\\gui-64.exe" exit 1 | ||
- if not exist "%PREFIX%\\Scripts\\gui-64-script.py" exit 1 | ||
- if not exist "%PREFIX%\\Scripts\\cli-{{ target_platform.split("-")[-1] }}.exe" exit 1 | ||
- if not exist "%PREFIX%\\Scripts\\cli-{{ target_platform.split("-")[-1] }}-script.py" exit 1 | ||
- if not exist "%PREFIX%\\Scripts\\gui-{{ target_platform.split("-")[-1] }}.exe" exit 1 | ||
- if not exist "%PREFIX%\\Scripts\\gui-{{ target_platform.split("-")[-1] }}-script.py" exit 1 | ||
- CALL "%PREFIX%\\Scripts\\cli-{{ target_platform.split("-")[-1] }}.exe" # [x86_64] | ||
|
||
about: | ||
home: https://github.com/conda/conda-build | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@finnagin and @zooba, is this correct or should we go with
-MT
? The executables built here need to able to run without the conda suppliedvcurntime140.dll
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, we don't need to run standalone. So let's use MD
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do need them to run from
Scripts
which doesn't have avcruntime140.dll
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So do we need
-MD
or-MT
? I think we are currently usingMD
but your last message hints at needingMT
as far as I can see? 🤔There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would use
-MT
for safety for launchers - it's too likely to end up running from a place where it can't find a suitable runtime.Using
-MD
matter more for Python itself, because extension modules will also need to load it, and they'll want to share state. The launcher (I assume) is only going to create a new process, rather than dynamically loading DLLs, so it won't be a huge impact.