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.

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

SCons: Add two new COMSTR environment variables #85153

Merged
merged 1 commit into from
Mar 4, 2024

Conversation

Repiteo
Copy link
Contributor

@Repiteo Repiteo commented Nov 20, 2023

This PR aims to make the output logs of a non-verbose build more uniform by adding two new environment variables: RCCOMSTR and GENCOMSTR. RCCOMSTR is an existing keyword for SCons, used for compiling .rc files into .res/.o, so adding it eliminates the last remaining verbose output (on Windows anyway). GENCOMSTR is a bit more involved, as it effectively replaces the methods.Run "short_message" argument. However, because it's now formatted to automatically reference the generated file, the original messages are no longer needed

@Repiteo Repiteo requested review from a team as code owners November 20, 2023 20:44
@Calinou Calinou added this to the 4.x milestone Nov 20, 2023
@YuriSizov
Copy link
Contributor

Can you give some examples of the effect of these changes?

@Repiteo
Copy link
Contributor Author

Repiteo commented Nov 21, 2023

Sure!

RCCOMSTR

Before:

rc /DTOOLS_ENABLED /DDEBUG_ENABLED /DDEV_ENABLED /DNO_EDITOR_SPLASH /DWINDOWS_ENABLED /DWASAPI_ENABLED /DWINMIDI_ENABLED /DTYPED_METHOD_BIND /DWIN32 /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DNOMINMAX /D_WIN64 /DVULKAN_ENABLED /DGLES3_ENABLED /D_HAS_EXCEPTIONS=0 /DMINIZIP_ENABLED /DBROTLI_ENABLED /DCLIPPER2_ENABLED /DZSTD_STATIC_LINKING_ONLY /DUSE_VOLK /DVK_USE_PLATFORM_WIN32_KHR /DGLAD_ENABLED /DEGL_ENABLED /Ithirdparty\freetype\include /Ithirdparty\libpng /Ithirdparty\glad /Ithirdparty\volk /Ithirdparty\vulkan /Ithirdparty\vulkan\include /Ithirdparty\zstd /Ithirdparty\zlib /Ithirdparty\clipper2\include /Ithirdparty\brotli\include /Ithirdparty\angle\include /Iplatform\windows /I. /nologo /foplatform\windows\godot_res_wrap.windows.editor.dev.x86_64.obj platform\windows\godot_res_wrap.rc

After:

Creating Compiled Resource platform\windows\godot_res_wrap.windows.editor.dev.x86_64.obj ...

GENCOMSTR

Before:

Building RD_GLSL header: "servers\rendering\renderer_rd\shaders\blit.glsl.gen.h"
Building GLES3 GLSL header: "drivers\gles3\shaders\copy.glsl.gen.h"
Building application icon.
Building splash screen header.
Generating enabled modules header.

After:

Generating servers\rendering\renderer_rd\shaders\blit.glsl.gen.h ...
Generating drivers\gles3\shaders\copy.glsl.gen.h ...
Generating main\app_icon.gen.h ...
Generating main\splash.gen.h ...
Generating modules\modules_enabled.gen.h ...

Copy link
Member

@Calinou Calinou left a comment

Choose a reason for hiding this comment

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

Tested locally (with progress=no and rebased on top of master dad6c77), it works as expected on Windows 11 23H2 + Visual Studio 2022.

image

It also works when applied at the same time as #87154.

@akien-mga akien-mga requested review from akien-mga and removed request for a team March 1, 2024 23:23
@akien-mga akien-mga modified the milestones: 4.x, 4.3 Mar 4, 2024
@akien-mga akien-mga merged commit 5d3369e into godotengine:master Mar 4, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@Repiteo Repiteo deleted the scons-improve-logs branch March 4, 2024 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants