Fix minor issues in MSVC projects. #3333

irwir · 2020-05-19T17:08:39Z

Description

Resolves #3297 - erroneous definition is removed.
Removed preprocessor definitions from project files:
as unused - _WINDOWS WIN32 WIN64
as predefined - _DEBUG

Removed explicit settings with default values:
PrecompiledHeader and ShowProgress

Status

READY

Requires Backporting

NO, but might be considered.
Which branch?
development

Migrations

NO

Additional comments

I left for now, but may also delete _CONSOLE.
This is never referenced anywhere in the repository and probably is not useful in the example programs.

danh-arm · 2020-05-20T11:32:27Z

Thanks for you contribution. Unfortunately this fails our CI:

******************************************************************

* check_generated_files: Check: freshness of generated source files 

* Tue May 19 17:22:53 UTC 2020

******************************************************************

'visualc/VS2010/mbedTLS.vcxproj' was either modified or deleted by 'scripts/generate_visualc_files.pl'

^^^^check_generated_files: Check: freshness of generated source files: tests/scripts/check-generated-files.sh -> 1^^^^


******************************************************************

* check_generated_files: Done, cleaning up 

* Tue May 19 17:22:53 UTC 2020

******************************************************************


!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

FAILED: 1

check_generated_files: Check: freshness of generated source files: tests/scripts/check-generated-files.sh -> 1

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

danh-arm · 2020-05-20T13:19:33Z

We're still getting a test failure in one of our configs:

./tests/scripts/all.sh --seed 4 --keep-going check_generated_files

******************************************************************

* check_generated_files: Check: freshness of generated source files 

* Wed May 20 12:36:12 UTC 2020

******************************************************************

'visualc/VS2010/zeroize.vcxproj' was either modified or deleted by 'scripts/generate_visualc_files.pl'

^^^^check_generated_files: Check: freshness of generated source files: tests/scripts/check-generated-files.sh -> 1^^^^


******************************************************************

* check_generated_files: Done, cleaning up 

* Wed May 20 12:36:13 UTC 2020

******************************************************************


!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

FAILED: 1

check_generated_files: Check: freshness of generated source files: tests/scripts/check-generated-files.sh -> 1

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

irwir · 2020-05-20T16:32:53Z

In my opinion a more straightforward message saying generated file differs from the one in the library might have been more clear than Check: freshness of generated source files.
Anyway, all the tests passed.
_CONSOLE macro was deleted in this version.

paul-elliott-arm · 2020-05-20T17:30:08Z

Hi!

Apologies, this is admittedly slightly confusing. Only the template files (scripts/data_files/vs2010-(app|main)-template.vcxproj) are supposed to be edited. If you revert (or shelve) your changes to all the other files, and run scripts/generate_visualc_files.pl then you should find the changes you made to the templates propagated to all the other .vcxproj'es.

Once you have done this, tests/scripts/check-generated-files.sh should run without error (it will moan if the generated version doesn't match the version in a given changelist).

paul-elliott-arm

LGTM

irwir · 2020-05-20T18:20:17Z

Thank you, @paul-elliott-arm
Edited projects were messed up somehow, and finally the sure way was taken - generate the projects with the script.

By the way, script/data files has three files for Visual Studio 6.
Is it intentional or the files could be purged as unsupported?

danh-arm

Just a couple of minor things:

Please add a ChangeLog entry.
Would be nice to add a "Fixes A bug in .vcxpoj files and suggested fix #3297" (or similar) to the commit message.

defaults. Fixes Mbed-TLS#3297. Signed-off-by: irwir <[email protected]>

paul-elliott-arm

LGTM

danh-arm

Sorry, I'm withdrawing my approval as I've just spotted a CI failure. The ChangeLog didn't assemble:

******************************************************************

* check_changelog: Check: changelog entries 

* Tue Jun  9 03:26:32 UTC 2020

******************************************************************

Traceback (most recent call last):

  File "scripts/assemble_changelog.py", line 505, in <module>

    main()

  File "scripts/assemble_changelog.py", line 502, in main

    merge_entries(options)

  File "scripts/assemble_changelog.py", line 449, in merge_entries

    finish_output(changelog, options.output, options.input, files_to_merge)

  File "scripts/assemble_changelog.py", line 415, in finish_output

    check_output(output_temp, input_file, merged_files)

  File "scripts/assemble_changelog.py", line 399, in check_output

    raise LostContent(merged_file, line)

__main__.LostContent: Lost content from ChangeLog.d/bugfix_PR3333.txt: "b'   * Remove unused macros from MSVC projects. Reported in #3297 and fix submitted in #3333 by irwir.'"

^^^^check_changelog: Check: changelog entries: scripts/assemble_changelog.py -o ChangeLog.new -> 1^^^^

It seems the ChangeLog script can't handle the lack of whitespace at the end of the this ChangeLog entry. We will look into fixing the script but if you want this merge in the meantime, just add a LF to the entry.

Signed-off-by: irwir <[email protected]>

gilles-peskine-arm · 2020-06-09T12:05:54Z

Text files need a LF at the end. The lack of a LF at the end of a changelog entry files breaks the changelog assembly file with a hard-to-understand error. That's low-priority because it's about dealing with ill-formed input that check-files.py now rejects anyway. We only very recently updated check-files.py to check changelog entries, and this branch is too old to have the check, which is why pr-head passes. check_files fails on pr-merge

Missing newline at end of file:
ChangeLog.d/bugfix_PR3333.txt

and fixing this will make check_changelog pass.

danh-arm · 2020-06-09T14:43:30Z

I'm taking Paul's previous approval since there was only the LF change to the ChangeLog entry. All CI passing now.

irwir force-pushed the fix_vcxproj2 branch from 6e15484 to b581d60 Compare May 19, 2020 17:14

danh-arm added the needs-ci Needs to pass CI tests label May 20, 2020

danh-arm requested a review from paul-elliott-arm May 20, 2020 11:33

danh-arm assigned paul-elliott-arm May 20, 2020

irwir force-pushed the fix_vcxproj2 branch from b581d60 to 6988e8e Compare May 20, 2020 12:19

irwir force-pushed the fix_vcxproj2 branch from 6988e8e to 709d0b6 Compare May 20, 2020 15:07

danh-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs-ci Needs to pass CI tests labels May 20, 2020

paul-elliott-arm previously approved these changes May 20, 2020

View reviewed changes

danh-arm requested changes May 21, 2020

View reviewed changes

danh-arm added needs-work and removed needs-review Every commit must be reviewed by at least two team members, labels May 21, 2020

Remove definitions and settings that are never used or duplicate MSVC

fcdea0f

defaults. Fixes Mbed-TLS#3297. Signed-off-by: irwir <[email protected]>

irwir dismissed paul-elliott-arm’s stale review via 08ad037 May 21, 2020 14:26

irwir force-pushed the fix_vcxproj2 branch 2 times, most recently from 08ad037 to fab9373 Compare May 21, 2020 14:28

irwir requested review from danh-arm and paul-elliott-arm May 21, 2020 16:10

irwir force-pushed the fix_vcxproj2 branch from fab9373 to 24deb89 Compare May 24, 2020 05:00

paul-elliott-arm removed the needs-work label May 27, 2020

paul-elliott-arm previously approved these changes May 28, 2020

View reviewed changes

danh-arm self-assigned this Jun 2, 2020

danh-arm approved these changes Jun 9, 2020

View reviewed changes

danh-arm requested changes Jun 9, 2020

View reviewed changes

danh-arm added the needs-ci Needs to pass CI tests label Jun 9, 2020

Add changelog entry

672257b

Signed-off-by: irwir <[email protected]>

irwir dismissed paul-elliott-arm’s stale review via 672257b June 9, 2020 12:03

irwir force-pushed the fix_vcxproj2 branch from 24deb89 to 672257b Compare June 9, 2020 12:03

gilles-peskine-arm added component-platform Portability layer and build scripts enhancement needs-work needs-review Every commit must be reviewed by at least two team members, and removed needs-work labels Jun 9, 2020

danh-arm approved these changes Jun 9, 2020

View reviewed changes

danh-arm merged commit 5afc4c7 into Mbed-TLS:development Jun 9, 2020

irwir deleted the fix_vcxproj2 branch October 6, 2023 14:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix minor issues in MSVC projects. #3333

Fix minor issues in MSVC projects. #3333

irwir commented May 19, 2020

danh-arm commented May 20, 2020

danh-arm commented May 20, 2020

irwir commented May 20, 2020 •

edited

Loading

paul-elliott-arm commented May 20, 2020 •

edited

Loading

paul-elliott-arm left a comment

irwir commented May 20, 2020

danh-arm left a comment

paul-elliott-arm left a comment

danh-arm left a comment

gilles-peskine-arm commented Jun 9, 2020

danh-arm commented Jun 9, 2020

Fix minor issues in MSVC projects. #3333

Fix minor issues in MSVC projects. #3333

Conversation

irwir commented May 19, 2020

Description

Status

Requires Backporting

Migrations

Additional comments

danh-arm commented May 20, 2020

danh-arm commented May 20, 2020

irwir commented May 20, 2020 • edited Loading

paul-elliott-arm commented May 20, 2020 • edited Loading

paul-elliott-arm left a comment

Choose a reason for hiding this comment

irwir commented May 20, 2020

danh-arm left a comment

Choose a reason for hiding this comment

paul-elliott-arm left a comment

Choose a reason for hiding this comment

danh-arm left a comment

Choose a reason for hiding this comment

gilles-peskine-arm commented Jun 9, 2020

danh-arm commented Jun 9, 2020

irwir commented May 20, 2020 •

edited

Loading

paul-elliott-arm commented May 20, 2020 •

edited

Loading