Page MenuHomeWildfire Games

User report backslash fix on Windows
ClosedPublic

Authored by Langbart on Mar 29 2022, 6:49 PM.

Details

Summary

Add escapeText to take backslash characters in paths into account.

Test Plan

Windows: Check the terms.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Langbart created this revision.Mar 29 2022, 6:49 PM
Owners added a subscriber: Restricted Owners Package.Mar 29 2022, 6:49 PM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
fatal error: fatal errorfatal errorfile '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built: 
file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was builtfatal error: : file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built
notefile '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built: please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'
note: please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'


note: please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'
note: please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'
1 error generated.
make[1]: *** [obj/graphics_Debug/MiniMapTexture.o] Error 1
make[1]: *** Waiting for unfinished jobs....
1 error generated.
make[1]: *** [obj/graphics_Debug/CinemaManager.o] Error 1
1 error generated.
make[1]: *** [obj/graphics_Debug/MapGenerator.o] Error 1
1 error generated.
make[1]: *** [obj/graphics_Debug/MapReader.o] Error 1
make: *** [graphics] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/5883/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/6974/display/redirect

Langbart requested review of this revision.Mar 29 2022, 7:00 PM
Langbart updated this revision to Diff 20024.EditedMar 29 2022, 7:19 PM
Langbart edited the summary of this revision. (Show Details)
Langbart edited the test plan for this revision. (Show Details)

elexis suggests to remove the comment.

comment shouldnt be necessary since the only thing escapeText does is escape the backslash

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
fatal error: fatal errorfatal error: : file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was builtfile '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was builtfile '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built


note: please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'
note: noteplease rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch': please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'

fatal error: file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built
note: please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'
1 error generated.
make[1]: *** [obj/graphics_Debug/MiniMapTexture.o] Error 1
make[1]: *** Waiting for unfinished jobs....
1 error generated.
make[1]: *** [obj/graphics_Debug/CinemaManager.o] Error 1
1 error generated.
make[1]: *** [obj/graphics_Debug/MapGenerator.o] Error 1
1 error generated.
make[1]: *** [obj/graphics_Debug/MapReader.o] Error 1
make: *** [graphics] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/5884/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/6975/display/redirect

vladislavbelov accepted this revision.Mar 29 2022, 7:44 PM
vladislavbelov added a subscriber: vladislavbelov.

It works. Are there other places with paths in JS?

This revision is now accepted and ready to land.Mar 29 2022, 7:44 PM

It works. Are there other places with paths in JS?

there is the path in the replay, but it looks good.

Similar issue was fixed in rP20784.

This revision was landed with ongoing or failed builds.Mar 30 2022, 12:13 AM
This revision was automatically updated to reflect the committed changes.