langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid path in cargo-env.bat (#1477)

Browse Source 
* Fix invalid path in cargo-env.bat

* Assume cargo-env.bat is run from repo root; fix package script (dae)

* mention cargo-raze doesn't work on Windows (dae)
This commit is contained in:
Abdo 2021-11-05 04:08:23 +03:00 committed by GitHub
parent 84021976d5
commit 896d11546b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cargo/README.md
View File

@ -12,6 +12,10 @@ After updating dependencies in ../rslib/Cargo.toml, change to this
folder and run python update.py to update the external Bazel repositories folder and run python update.py to update the external Bazel repositories
to point to the updated deps. to point to the updated deps.
Note: cargo-raze does not currently work when run from Windows, and nobody
has investigated why yet. For now, you'll need a Mac or Linux machine, or
will need to run update.py from within WSL.
A couple of crates need extra work to build with Bazel, and are listed A couple of crates need extra work to build with Bazel, and are listed
in ../Cargo.toml. For example: in ../Cargo.toml. For example:

4
qt/package/build.bat
View File

@ -1,6 +1,7 @@
:: ensure wheels are built :: ensure wheels are built and set up Rust env
pushd ..\.. pushd ..\..
call scripts\build || exit /b call scripts\build || exit /b
call scripts\cargo-env
set ROOT=%CD% set ROOT=%CD%
popd popd
@ -16,6 +17,5 @@ if not exist %VENV% (
:: run the rest of the build in Python :: run the rest of the build in Python
FOR /F "tokens=*" %%g IN ('call ..\..\bazel.bat info output_base --ui_event_filters=-INFO') do (SET BAZEL_EXTERNAL=%%g/external) FOR /F "tokens=*" %%g IN ('call ..\..\bazel.bat info output_base --ui_event_filters=-INFO') do (SET BAZEL_EXTERNAL=%%g/external)
call %ROOT%\scripts\cargo-env
call ..\..\bazel.bat query @pyqt515//:* call ..\..\bazel.bat query @pyqt515//:*
%VENV%\scripts\python build.py %ROOT% %BAZEL_EXTERNAL% || exit /b %VENV%\scripts\python build.py %ROOT% %BAZEL_EXTERNAL% || exit /b

4
scripts/cargo-env.bat
View File

@ -1,2 +1,4 @@
FOR /F "tokens=*" %%g IN ('call ..\..\bazel.bat info output_base --ui_event_filters=-INFO') do (SET BAZEL_EXTERNAL=%%g/external) rem Run this from the repo root folder
FOR /F "tokens=*" %%g IN ('call bazel.bat info output_base --ui_event_filters=-INFO') do (SET BAZEL_EXTERNAL=%%g/external)
set PATH=%BAZEL_EXTERNAL%\rust_windows_x86_64\bin;%PATH% set PATH=%BAZEL_EXTERNAL%\rust_windows_x86_64\bin;%PATH%