Skip to content

Get builds working when paths contain whitespaces and utf8 chars#42671

Merged
mangod9 merged 6 commits intodotnet:masterfrom
mangod9:fixSpace2
Sep 28, 2020
Merged

Get builds working when paths contain whitespaces and utf8 chars#42671
mangod9 merged 6 commits intodotnet:masterfrom
mangod9:fixSpace2

Conversation

@mangod9
Copy link
Member

@mangod9 mangod9 commented Sep 24, 2020

Partially Fixes #42397
Currently builds clr+libs
Validated only of windows
mono build still needs work

Currently builds clr+libs
Validated only of windows
mono is still failing.
<_IlasmSwitches Condition="'$(DebugType)' == 'PdbOnly'">$(_IlasmSwitches) -DEBUG=OPT</_IlasmSwitches>
<_IlasmSwitches Condition="'$(Optimize)' == 'True'">$(_IlasmSwitches) -OPTIMIZE</_IlasmSwitches>
<_IlasmSwitches Condition="'$(IlasmResourceFile)' != ''">$(_IlasmSwitches) -RESOURCES=$(IlasmResourceFile)</_IlasmSwitches>
<_IlasmSwitches Condition="'$(IlasmResourceFile)' != ''">$(_IlasmSwitches) -RESOURCES="$(IlasmResourceFile)"</_IlasmSwitches>
Copy link
Member Author

Choose a reason for hiding this comment

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

this change will need to propagate to SDK for builds to actually work.

<IncludePath>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'version'))</IncludePath>
<IlasmFlags>$(IlasmFlags) -INCLUDE=$(IncludePath)</IlasmFlags>
<IncludePathTrimmed>$(IncludePath.TrimEnd('\'))</IncludePathTrimmed>
<IlasmFlags>$(IlasmFlags) -INCLUDE="$(IncludePathTrimmed)"</IlasmFlags>
Copy link
Member Author

Choose a reason for hiding this comment

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

this is required since for some reason ilasm doesnt like a trailing \ if the include path is quoted

@mangod9 mangod9 added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 24, 2020
@mangod9 mangod9 removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 26, 2020
@mangod9 mangod9 changed the title [WIP] Get builds working when paths contain whitespaces Get builds working when paths contain whitespaces Sep 27, 2020
@mangod9 mangod9 changed the title Get builds working when paths contain whitespaces Get builds working when paths contain whitespaces and utf8 chars Sep 27, 2020
Copy link
Member

@trylek trylek left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for making these improvements!

@mangod9 mangod9 merged commit 244d939 into dotnet:master Sep 28, 2020
@mangod9 mangod9 deleted the fixSpace2 branch September 28, 2020 04:23
@ghost ghost locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

build.cmd fails if path contains a space

3 participants