Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upAdded support to download nuget and added python code to automate the… #23961
Conversation
|
Important note. if you perform a cross platform build by opening a regular command prompt, you must set the path to where msbuild.exe is prior to:
Here is an attempt to determine the msbuild.exe path at build time. location of Msbuild.exe => MSBuild\15.0\Bin VisualStudioVersion =15.0 set MSBUILDDIR=%VSINSTALLDIR%MsBuild%VisualStudioVersion%\bin |
nirbheek
commented
Aug 13, 2019
The approach used in GStreamer's Cerbero build system is to extract Might be worth trying to do the same in Servo too. |
Thank you for looking at the pull request and providing this suggestion. I will review your suggestion! Thank you, |
0c6ccef
to
d28df22
|
Looks like a good start! I've left some comments for ways to make the code a bit more idiomatic and integrate better with the rest of the build system. |
|
@bors-servo try=windows |
Added support to download nuget and added python code to automate the… … x64 and arm64 mach build -r/-d --uwp build process. <!-- Please describe your changes on the following line: --> Modified/added python code to: 1. Download nuget which is required for building support\HoloLens 2. added python code to perform a nuget install/restore ServoApp.sln which causes the Angle libraries to be installed so that mach build will succeed. 3. added python code to perform a MsBuild of the support\HoloLens\ServoApp.sln solution so that mach build will build ServoApp and create a ServoApp .appx install file. Note: The Msbuild path must be present otherwise the msbuild command will fail. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #_23753__ (GitHub issue number if applicable) <!-- Either: --> - [x] There are tests for these changes OR - [x] These changes do not require tests because by performing python mach build -r/-d --uwp ---win-arm64 or mach build -r/-d --uwp <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23961) <!-- Reviewable:end -->
|
|
|
@bors-servo retry |
Added support to download nuget and added python code to automate the… … x64 and arm64 mach build -r/-d --uwp build process. <!-- Please describe your changes on the following line: --> Modified/added python code to: 1. Download nuget which is required for building support\HoloLens 2. added python code to perform a nuget install/restore ServoApp.sln which causes the Angle libraries to be installed so that mach build will succeed. 3. added python code to perform a MsBuild of the support\HoloLens\ServoApp.sln solution so that mach build will build ServoApp and create a ServoApp .appx install file. Note: The Msbuild path must be present otherwise the msbuild command will fail. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #_23753__ (GitHub issue number if applicable) <!-- Either: --> - [x] There are tests for these changes OR - [x] These changes do not require tests because by performing python mach build -r/-d --uwp ---win-arm64 or mach build -r/-d --uwp <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23961) <!-- Reviewable:end -->
393a1b5
to
ae8afab
|
Implemented changes requested by JDM and performed the below tests. Rebased changes and performed a pull request for testing. Ran tests to verify the following passed:
The error occurred in code that was called by the mach command. This is either You should consider filing a bug for this issue. If filing a bug, please include the full output of mach, including this error The details of the failure are as follows: CalledProcessError: Command 'm s b u i l d / m / p : p r o j e c t = S e r v o A p p . \ s u p p o r t \ h o l o l e n s \ s e r v o a p p . s l n 2 / p : S o l u t i o n D i r = . \ s u p p o r t \ h o l o l e n s / p : C o n f i g u r a t i o n = R e l e a s e / p : P l a t f o r m = x 6 4 / p : A p p x B u n d l e = A l w a y s ; A p p x B u n d l e P l a t f o r m s = x 6 4' returned non-zero exit status 1 File "C:\git-mozilla\angelortiz1007-2\python\servo\build_commands.py", line 702, in build |
| print("Angle Found...") | ||
| else: | ||
| print("Angle not found. Performing nuget to restore Angle package") | ||
| check_call(nuget_command) |
This comment has been minimized.
This comment has been minimized.
jdm
Aug 15, 2019
Member
Instead of passing a single string, we should use a list:
check_call(["nuget", "restore", nuget_app])ae396d6
to
cd6b048
|
@bors-servo try=windows |
|
|
@bors-servo try=windows |
Added support to download nuget and added python code to automate the… … x64 and arm64 mach build -r/-d --uwp build process. <!-- Please describe your changes on the following line: --> Modified/added python code to: 1. Download nuget which is required for building support\HoloLens 2. added python code to perform a nuget install/restore ServoApp.sln which causes the Angle libraries to be installed so that mach build will succeed. 3. added python code to perform a MsBuild of the support\HoloLens\ServoApp.sln solution so that mach build will build ServoApp and create a ServoApp .appx install file. Note: The Msbuild path must be present otherwise the msbuild command will fail. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #23753 (GitHub issue number if applicable) <!-- Either: --> - [x] There are tests for these changes OR - [x] These changes do not require tests because by performing python mach build -r/-d --uwp ---win-arm64 or mach build -r/-d --uwp <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23961) <!-- Reviewable:end -->
|
|
|
@bors-servo r+ |
|
|
Added support to download nuget and added python code to automate the… … x64 and arm64 mach build -r/-d --uwp build process. <!-- Please describe your changes on the following line: --> Modified/added python code to: 1. Download nuget which is required for building support\HoloLens 2. added python code to perform a nuget install/restore ServoApp.sln which causes the Angle libraries to be installed so that mach build will succeed. 3. added python code to perform a MsBuild of the support\HoloLens\ServoApp.sln solution so that mach build will build ServoApp and create a ServoApp .appx install file. Note: The Msbuild path must be present otherwise the msbuild command will fail. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #23753 (GitHub issue number if applicable) <!-- Either: --> - [x] There are tests for these changes OR - [x] These changes do not require tests because by performing python mach build -r/-d --uwp ---win-arm64 or mach build -r/-d --uwp <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23961) <!-- Reviewable:end -->
|
|
|
@bors-servo retry |
|
|
Added support to download nuget and added python code to automate the… … x64 and arm64 mach build -r/-d --uwp build process. <!-- Please describe your changes on the following line: --> Modified/added python code to: 1. Download nuget which is required for building support\HoloLens 2. added python code to perform a nuget install/restore ServoApp.sln which causes the Angle libraries to be installed so that mach build will succeed. 3. added python code to perform a MsBuild of the support\HoloLens\ServoApp.sln solution so that mach build will build ServoApp and create a ServoApp .appx install file. Note: The Msbuild path must be present otherwise the msbuild command will fail. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #23753 (GitHub issue number if applicable) <!-- Either: --> - [x] There are tests for these changes OR - [x] These changes do not require tests because by performing python mach build -r/-d --uwp ---win-arm64 or mach build -r/-d --uwp <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23961) <!-- Reviewable:end -->
|
|
angelortiz1007 commentedAug 13, 2019
•
edited by CYBAI
… x64 and arm64 mach build -r/-d --uwp build process.
Modified/added python code to:
Note: The Msbuild path must be present otherwise the msbuild command will fail.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is