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.

Sign up for GitHub

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

Jump to bottom

Finalize fixing bugs in .vcxproj files #2853

Merged
merged 4 commits into from
Apr 28, 2020
Merged

Finalize fixing bugs in .vcxproj files #2853

merged 4 commits into from
Apr 28, 2020

Conversation

irwir
Copy link
Contributor

@irwir irwir commented Sep 21, 2019 •
edited by mpg
Loading

Description

The previous PRs on the issue #1430 had modified the file scripts\data_files\vs2010-main-template.vcxproj, but somehow it was omitted in merging, and the project visualc\VS2010\mbedTLS.vcxproj remained buggy.
This PR repeats the necessary changes to fix #1430.

Status

READY

Requires Backporting

YES
[edited by mpg]: 2.16 #3205 2.7 #3204

Which branch?

Development

Migrations

NO

@RonEld RonEld added the bug label Sep 23, 2019
RonEld
RonEld previously approved these changes Sep 23, 2019
View reviewed changes
@RonEld RonEld added component-platform Portability layer and build scripts needs-review Every commit must be reviewed by at least two team members, labels Sep 26, 2019
AndrzejKurek
AndrzejKurek previously approved these changes Oct 17, 2019
View reviewed changes
@Patater Patater added needs-backports Backports are missing or are pending review and approval. and removed needs-review Every commit must be reviewed by at least two team members, labels Oct 18, 2019
@gilles-peskine-arm
Copy link
Contributor

gilles-peskine-arm commented Apr 17, 2020 •
edited
Loading

Hi! This is your friendly Mbed TLS team member cleaning up some old pull requests that fell through the cracks. Would you mind doing the following?

  1. Rebase this pull request on top of current development.
  2. Create a changelog entry using our new mechanism: a .txt file in ChangeLog.d.
  3. Make backports to 2.16 and 2.7, with a similar file in ChangeLog.d (which doesn't exist yet, but soon will) but with “2.19” adjusted to the correct version.

Suggested content for the changelog entry file (if I've understood the change correctly):

Bugfix
   * Fix the Visual Studio Release x64 build configuration for mbedtls itself.
     Completes a previous fix in Mbed TLS 2.19 that only fixed the build for
     the example programs. Reported in #1430 and fix contributed by irwir.

@irwir
Finalize fixing the issue Mbed-TLS#1430.
49d46a7 
The previous PRs had correct template project, but somehow it was not merged.

Signed-off-by: irwir <[email protected]>
@irwir irwir dismissed stale reviews from AndrzejKurek and RonEld via 49d46a7 April 19, 2020 13:27
irwir added a commit to irwir/mbedtls that referenced this pull request Apr 19, 2020
@irwir
[backport 2.7] Finalize fixing bugs in .vcxproj files
86f47bf 
This is the 2.7 backport of Mbed-TLS#2853
@irwir irwir mentioned this pull request Apr 19, 2020
Merged
irwir added a commit to irwir/mbedtls that referenced this pull request Apr 19, 2020
@irwir
[backport 2.7] Finalize fixing bugs in .vcxproj files
2eb0c50 
This is the 2.7 backport of Mbed-TLS#2853

Signed-off-by: irwir <[email protected]>
irwir added a commit to irwir/mbedtls that referenced this pull request Apr 19, 2020
@irwir
[backport 2.16] Finalize fixing bugs in .vcxproj files
a9f0009 
This is the 2.16 backport of Mbed-TLS#2853
irwir added a commit to irwir/mbedtls that referenced this pull request Apr 19, 2020
@irwir
[backport 2.16] Finalize fixing bugs in .vcxproj files
3d9b798 
This is the 2.16 backport of Mbed-TLS#2853

Signed-off-by: irwir <[email protected]>
@irwir irwir mentioned this pull request Apr 19, 2020
Merged
@gilles-peskine-arm
Copy link
Contributor

Please don't make changes (adding a changelog entry file) during a merge commit.

Given that the pull request is a single, small commit, please rebase it rather than merging.

@irwir
Copy link
Contributor Author

irwir commented Apr 24, 2020

Please don't make changes (adding a changelog entry file) during a merge commit.
Given that the pull request is a single, small commit, please rebase it rather than merging.

Thanks, I have made a separate commit that adds changelog entry after rebasing.

@gilles-peskine-arm gilles-peskine-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs: changelog labels Apr 25, 2020
mpg
mpg approved these changes Apr 28, 2020
View reviewed changes
Copy link
Contributor

@mpg mpg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mpg mpg added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, needs-backports Backports are missing or are pending review and approval. labels Apr 28, 2020
@mpg mpg merged commit 0c103a8 into Mbed-TLS:development Apr 28, 2020
@irwir irwir deleted the fix_vcxproj branch October 6, 2023 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gilles-peskine-arm gilles-peskine-arm gilles-peskine-arm approved these changes

@mpg mpg mpg approved these changes

@AndrzejKurek AndrzejKurek AndrzejKurek left review comments

@RonEld RonEld RonEld left review comments

Assignees
No one assigned
Labels
approved Design and code approved - may be waiting for CI or backports bug component-platform Portability layer and build scripts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

All VS2010 projects have incorrect Release|x64 configuration
6 participants
@irwir @gilles-peskine-arm @mpg @RonEld @AndrzejKurek @Patater