[Fix uwp toolchain|world rebuild] make ninja work for uwp #22831

Neumann-A · 2022-01-27T23:10:59Z

~~depends #23001~~
~~depends #23846~~ (for less changes)
closes #19601

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2021-12-20
-- Old SHA: a35eb7c761372dc64526d59fa918a13c0dfbba1b
-- New SHA: bec39c4d9e3a770f7647b6944eadae5df6e9be08
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

JackBoosY · 2022-01-28T05:19:36Z

This may fix #19818.

Neumann-A · 2022-01-28T08:19:08Z

This may fix #19818.

be aware that the Fortran runtime libraries are not build against WindowsApp.lib which makes them not suiteable for UWP. So currently, Fortran cannot support UWP.

Neumann-A · 2022-01-28T08:20:09Z

scripts/cmake/vcpkg_configure_make.cmake

-            string(REPLACE "\\" "/" VCToolsInstallDir "$ENV{VCToolsInstallDir}")
+            file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir)
+            set(_replacement -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\")
+            string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}")
+            string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG}")
+            string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}")
+            string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}")
            # Can somebody please check if CMake's compiler flags for UWP are correct?
-            set(ENV{_CL_} "$ENV{_CL_} /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB_ -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"")
-            string(APPEND VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE " -ZW:nostdlib")
-            string(APPEND VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG " -ZW:nostdlib")
-            set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES} /MANIFEST /DYNAMICBASE /WINMD:NO /APPCONTAINER") 
+            set(ENV{_CL_} "$ENV{_CL_} -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"")
+            set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}")


Theoretically this needs to be generalized to every flag containing spaces in its arguments.

Neumann-A · 2022-01-28T13:45:24Z

@BillyONeal: Please take a look at the uwp errors (except boost) and tell me which class of errors should be marked as supports: "!uwp"

BillyONeal · 2022-01-31T08:07:03Z

Unfortunately I know next to nothing about UWP; although if things built in the old msbuild world order it doesn't seem like a "shared" change like this should change which things are built successfully?

Neumann-A · 2022-01-31T08:50:02Z

built in the old msbuild

As far as i know normal CI won't tell me if i passed a former regression and subsequent ports now fail.
Also cmake msbuild != vs default msbuild. Cmake is probably just using /ZW which is why it works. I'll compare some cmake msbuild build flags against this PR. Currently this PR uses just the vs defaults.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: 73901e3427bc4e9dc315a84843193d011b47d53d
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Neumann-A · 2022-01-31T14:37:55Z

@BillyONeal I see a lot of Error: curl failed to put file to https://vcpkgbinarycache.blob.core.windows.net/cache/449c37a85a2ae47ab26223514fef805ea0d0f856cf3039497e58535ce80ce45c.zip?*** SECRET *** with exit code '0' and http code '403' errors in the uwp ci run

also fix bug in build_make

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: 73901e3427bc4e9dc315a84843193d011b47d53d
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: 73901e3427bc4e9dc315a84843193d011b47d53d
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: 73901e3427bc4e9dc315a84843193d011b47d53d
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

ports/vcpkg-cmake/vcpkg_cmake_configure.cmake

JackBoosY · 2022-03-18T08:23:42Z

Since microsoft/vcpkg-tool#350 was merged, can we continue this PR?

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-04-08
-- Old SHA: 11b8114c46aae5abcbff8a6c985a63cc1f030f9b
-- New SHA: 9350fa30123000ea0c075b4aa43ce5b6dc462d34
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/cpprestsdk/vcpkg.json
ports/libcerf/vcpkg.json
ports/liblbfgs/vcpkg.json
ports/orc/vcpkg.json
ports/physfs/vcpkg.json
ports/physx/vcpkg.json
ports/sdl2/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/cpprestsdk/vcpkg.json
ports/libcerf/vcpkg.json
ports/liblbfgs/vcpkg.json
ports/orc/vcpkg.json
ports/physfs/vcpkg.json
ports/physx/vcpkg.json
ports/sdl2/vcpkg.json

Valid values for the license field can be found in the documentation

# Conflicts: # ports/physx/vcpkg.json # ports/vcpkg-cmake/vcpkg.json # scripts/ci.baseline.txt # versions/baseline.json # versions/p-/physx.json # versions/v-/vcpkg-cmake.json

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/cpprestsdk/vcpkg.json
ports/libcerf/vcpkg.json
ports/liblbfgs/vcpkg.json
ports/orc/vcpkg.json
ports/physfs/vcpkg.json
ports/sdl2/vcpkg.json

Valid values for the license field can be found in the documentation

# Conflicts: # ports/boost-modular-build-helper/vcpkg.json # versions/b-/boost-modular-build-helper.json # versions/baseline.json

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/cpprestsdk/vcpkg.json
ports/libcerf/vcpkg.json
ports/liblbfgs/vcpkg.json
ports/orc/vcpkg.json
ports/physfs/vcpkg.json
ports/sdl2/vcpkg.json

Valid values for the license field can be found in the documentation

# Conflicts: # versions/i-/igraph.json

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/cpprestsdk/vcpkg.json
ports/libcerf/vcpkg.json
ports/liblbfgs/vcpkg.json
ports/orc/vcpkg.json
ports/physfs/vcpkg.json
ports/sdl2/vcpkg.json

Valid values for the license field can be found in the documentation

BillyONeal · 2022-04-26T00:43:56Z

Thanks for making this work @Neumann-A : Words can't describe how much I appreciate the pain you went through to get here trying to demystify the UWP black box. I'm going to try to confirm with some folks who own what UWP means tomorrow.

BillyONeal · 2022-04-27T01:14:09Z

BillyONeal

I am giving folks who understand UWP better a few days to confirm that this is reasonable, but this is awesome.

THANK YOU SO MUCH!

BillyONeal · 2022-04-27T01:24:02Z

scripts/toolchains/uwp.cmake

+        message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"")
+    endif()
+
+    set(_vcpkg_charset "/utf-8")


I'm a bit sad that this one is called _vcpkg_charset but the equivalent in the Windows toolchain is CHARSET_FLAG. No change requested (unless you want).

you can change this with the /MP change below however you like. I just mimicked the windows toolchain.

The flag is pointless, but isn't worth another world rebuild to change if that's the only remaining nitpick. You got it to be green, so I'm going to run with it :)

BillyONeal · 2022-04-27T01:26:56Z

scripts/toolchains/uwp.cmake

+    endif()
+
+    set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs;
+    set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") 


Suggested change

set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc")

set(_vcpkg_common_flags "/nologo /Z7 /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc")

/MP is a workaround for an MSBuildism that doesn't apply here.

(Don't worry about applying this yet; I'll just apply it before merging. Just avoiding building the world again until I'm ready to push the merge button)

BillyONeal · 2022-04-27T01:30:25Z

@JackBoosY I'm waiting for internal folks to OK it, @Neumann-A doesn't need to respond unless they want. :)

BillyONeal · 2022-04-28T01:13:00Z

Thanks again for getting UWP to not be a special snowflake!

* [toolchain windows] set CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR In specific, I did this for the cpuinfo PR - I realized the reason that cpuinfo doesn't support arm64 windows cross compilation is because we don't set CMAKE_SYSTEM_PROCESSOR. * correctly set CMAKE_CROSSCOMPILING * start fixin libraries * more changes: - gainput: remove line - glog: remove try_run when cross compiling - windows.cmake: set CMAKE_SYSTEM_VERSION * more patches - mapnik: set BOOST_REGEX_HAS_ICU to avoid check_cxx_source_runs - orc: set HAS_PRE_1970 and HAS_POST_2038 for same - seal: change out check_cxx_source_runs for check_cxx_source_compiles * more changes * fix x86-windows * fix qpid-proton, glog * build corrade-rc * fix x64-uwp ports * forgot to _actually_ always build corrade-rc .,. * Replay #22831 * Dedupe CMAKE_SYSTEM_NAME settings. * Add quotes for corrade_rc_param Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update version DB. Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

uwp magic with ninja

07f768b

github-actions bot requested changes Jan 27, 2022

View reviewed changes

JonLiu1993 assigned JackBoosY Jan 28, 2022

JackBoosY added category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:world-rebuild labels Jan 28, 2022

Neumann-A commented Jan 28, 2022

View reviewed changes

Neumann-A mentioned this pull request Jan 28, 2022

[boost] build script cannot handle compiler flags with spaces #22840

Closed

JackBoosY requested a review from BillyONeal January 28, 2022 17:40

fine tuning

10fddd0

github-actions bot requested changes Jan 31, 2022

View reviewed changes

more fine tuning

12c87a6

also fix bug in build_make

github-actions bot requested changes Jan 31, 2022

View reviewed changes

more fixes

20e35ae

github-actions bot requested changes Jan 31, 2022

View reviewed changes

more fixes

e7de7d7

github-actions bot requested changes Jan 31, 2022

View reviewed changes

Neumann-A commented Jan 31, 2022

View reviewed changes

ports/vcpkg-cmake/vcpkg_cmake_configure.cmake Outdated Show resolved Hide resolved

This was referenced Feb 7, 2022

[vcpkg_configure_make] Fix handling of link flags #22798

Merged

[boost-modular-build-helper] Attempt to pass flags more correctly into b2 #23001

Merged

ras0219-msft reviewed Feb 12, 2022

View reviewed changes

ports/vcpkg-cmake/vcpkg_cmake_configure.cmake Outdated Show resolved Hide resolved

ras0219-msft mentioned this pull request Feb 12, 2022

Move toolchain decision making entirely into the tool microsoft/vcpkg-tool#350

Merged

BillyONeal mentioned this pull request Feb 16, 2022

[arm64ec] Fix Windows toolchain. #23139

Closed

BillyONeal removed the info:world-rebuild label Feb 17, 2022

github-actions bot requested changes Apr 17, 2022

View reviewed changes

Neumann-A added 2 commits April 18, 2022 23:34

Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp

cba12df

update version

f21e944

github-actions bot approved these changes Apr 18, 2022

View reviewed changes

Alexander Neumann added 2 commits April 20, 2022 09:25

Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp

261ed4c

# Conflicts: # ports/physx/vcpkg.json # ports/vcpkg-cmake/vcpkg.json # scripts/ci.baseline.txt # versions/baseline.json # versions/p-/physx.json # versions/v-/vcpkg-cmake.json

version stuff

a334bc6

github-actions bot approved these changes Apr 20, 2022

View reviewed changes

Neumann-A added 2 commits April 21, 2022 23:42

Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp

221a787

# Conflicts: # ports/boost-modular-build-helper/vcpkg.json # versions/b-/boost-modular-build-helper.json # versions/baseline.json

version stuff

fc27223

github-actions bot approved these changes Apr 21, 2022

View reviewed changes

Neumann-A added 3 commits April 23, 2022 10:58

Merge remote-tracking branch 'upstream/master' into fix_ninja_uwp

51461b7

# Conflicts: # versions/i-/igraph.json

reset stuff

59cbf87

version stuff

b0633b0

github-actions bot approved these changes Apr 23, 2022

View reviewed changes

BillyONeal added the info:reviewed Pull Request changes follow basic guidelines label Apr 26, 2022

BillyONeal approved these changes Apr 27, 2022

View reviewed changes

JackBoosY added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Apr 27, 2022

BillyONeal added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Apr 27, 2022

BillyONeal merged commit 05c93c5 into microsoft:master Apr 28, 2022

Neumann-A deleted the fix_ninja_uwp branch April 28, 2022 05:07

BillyONeal added a commit to strega-nil/vcpkg that referenced this pull request Apr 28, 2022

Replay microsoft#22831

566b8ff

JonLiu1993 mentioned this pull request Jun 21, 2022

[vcpkg baseline][chmlib] Fix the failed in baseline #25357

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Fix uwp toolchain|world rebuild] make ninja work for uwp #22831

[Fix uwp toolchain|world rebuild] make ninja work for uwp #22831

Neumann-A commented Jan 27, 2022 •

edited by BillyONeal

Loading

github-actions bot left a comment

JackBoosY commented Jan 28, 2022

Neumann-A commented Jan 28, 2022

Neumann-A Jan 28, 2022

Neumann-A commented Jan 28, 2022

BillyONeal commented Jan 31, 2022

Neumann-A commented Jan 31, 2022

github-actions bot left a comment

Neumann-A commented Jan 31, 2022

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

JackBoosY commented Mar 18, 2022

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

BillyONeal commented Apr 26, 2022

BillyONeal commented Apr 27, 2022

BillyONeal left a comment

BillyONeal Apr 27, 2022

Neumann-A Apr 27, 2022

BillyONeal Apr 28, 2022

BillyONeal Apr 27, 2022

BillyONeal Apr 27, 2022

BillyONeal commented Apr 27, 2022

BillyONeal commented Apr 28, 2022

	set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc")
	set(_vcpkg_common_flags "/nologo /Z7 /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc")

[Fix uwp toolchain|world rebuild] make ninja work for uwp #22831

[Fix uwp toolchain|world rebuild] make ninja work for uwp #22831

Conversation

Neumann-A commented Jan 27, 2022 • edited by BillyONeal Loading

github-actions bot left a comment

Choose a reason for hiding this comment

JackBoosY commented Jan 28, 2022

Neumann-A commented Jan 28, 2022

Neumann-A Jan 28, 2022

Choose a reason for hiding this comment

Neumann-A commented Jan 28, 2022

BillyONeal commented Jan 31, 2022

Neumann-A commented Jan 31, 2022

github-actions bot left a comment

Choose a reason for hiding this comment

Neumann-A commented Jan 31, 2022

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

JackBoosY commented Mar 18, 2022

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

BillyONeal commented Apr 26, 2022

BillyONeal commented Apr 27, 2022

BillyONeal left a comment

Choose a reason for hiding this comment

BillyONeal Apr 27, 2022

Choose a reason for hiding this comment

Neumann-A Apr 27, 2022

Choose a reason for hiding this comment

BillyONeal Apr 28, 2022

Choose a reason for hiding this comment

BillyONeal Apr 27, 2022

Choose a reason for hiding this comment

BillyONeal Apr 27, 2022

Choose a reason for hiding this comment

BillyONeal commented Apr 27, 2022

BillyONeal commented Apr 28, 2022

Neumann-A commented Jan 27, 2022 •

edited by BillyONeal

Loading