Skip to content

Commit a7ff720

Browse files
illwieckzillwieckz
committed
DaemonSourceGenerator: lowercase local variables (even if the leak outside)
1 parent 63fa871 commit a7ff720

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

‎cmake/DaemonSourceGenerator.cmake‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -23,102 +23,102 @@ foreach(kind CPP H)
2323
set(DAEMON_BUILDINFO_${kind}_TEXT "${DAEMON_GENERATED_HEADER}")
2424
endforeach()
2525

26-
macro(daemon_add_buildinfo TYPE NAME VALUE)
27-
string(APPEND DAEMON_BUILDINFO_CPP_TEXT "const ${TYPE} ${NAME}=${VALUE};\n")
28-
string(APPEND DAEMON_BUILDINFO_H_TEXT "extern const ${TYPE} ${NAME};\n")
26+
macro(daemon_add_buildinfo type name value)
27+
string(APPEND DAEMON_BUILDINFO_CPP_TEXT "const ${type} ${name}=${value};\n")
28+
string(APPEND DAEMON_BUILDINFO_H_TEXT "extern const ${type} ${name};\n")
2929
endmacro()
3030

31-
macro(daemon_write_generated GENERATED_PATH GENERATED_CONTENT)
32-
set(DAEMON_GENERATED_FILE ${DAEMON_GENERATED_DIR}/${GENERATED_PATH})
31+
macro(daemon_write_generated generated_path generated_content)
32+
set(DAEMON_GENERATED_FILE ${DAEMON_GENERATED_DIR}/${generated_path})
3333

3434
if (EXISTS "${DAEMON_GENERATED_FILE}")
35-
file(READ "${DAEMON_GENERATED_FILE}" GENERATED_CONTENT_READ)
35+
file(READ "${DAEMON_GENERATED_FILE}" generated_content_read)
3636
endif()
3737

38-
if (NOT "${GENERATED_CONTENT}" STREQUAL "${GENERATED_CONTENT_READ}")
39-
message(STATUS "Generating ${GENERATED_PATH}")
40-
file(WRITE "${DAEMON_GENERATED_FILE}" "${GENERATED_CONTENT}")
38+
if (NOT "${generated_content}" STREQUAL "${generated_content_read}")
39+
message(STATUS "Generating ${generated_path}")
40+
file(WRITE "${DAEMON_GENERATED_FILE}" "${generated_content}")
4141
endif()
4242
endmacro()
4343

44-
macro(daemon_write_buildinfo NAME)
44+
macro(daemon_write_buildinfo name)
4545
foreach(kind CPP H)
46-
set(DAEMON_BUILDINFO_${kind}_NAME "${NAME}${DAEMON_GENERATED_${kind}_EXT}")
47-
set(DAEMON_BUILDINFO_${kind}_PATH "${DAEMON_BUILDINFO_SUBDIR}/${DAEMON_BUILDINFO_${kind}_NAME}")
46+
set(daemon_buildinfo_${kind}_name "${name}${DAEMON_GENERATED_${kind}_EXT}")
47+
set(daemon_buildinfo_${kind}_path "${DAEMON_BUILDINFO_SUBDIR}/${daemon_buildinfo_${kind}_name}")
4848

49-
daemon_write_generated("${DAEMON_BUILDINFO_${kind}_PATH}" "${DAEMON_BUILDINFO_${kind}_TEXT}")
49+
daemon_write_generated("${daemon_buildinfo_${kind}_path}" "${DAEMON_BUILDINFO_${kind}_TEXT}")
5050
list(APPEND BUILDINFOLIST "${DAEMON_GENERATED_FILE}")
5151
endforeach()
5252
endmacro()
5353

54-
macro(daemon_embed_files BASENAME SLUG FORMAT TARGETNAME)
55-
set(EMBED_SOURCE_DIR "${SLUG}_EMBED_DIR")
56-
set(EMBED_SOURCE_LIST "${SLUG}_EMBED_LIST")
54+
macro(daemon_embed_files basename slug format targetname)
55+
set(embed_source_dir "${slug}_EMBED_DIR")
56+
set(embed_source_list "${slug}_EMBED_LIST")
5757

58-
set(EMBED_SUBDIR "${DAEMON_EMBEDDED_SUBDIR}/${BASENAME}")
59-
set(EMBED_DIR "${DAEMON_GENERATED_DIR}/${EMBED_SUBDIR}")
58+
set(embed_subdir "${DAEMON_EMBEDDED_SUBDIR}/${basename}")
59+
set(embed_dir "${DAEMON_GENERATED_DIR}/${embed_subdir}")
6060

6161
foreach(kind CPP H)
62-
set(EMBED_${kind}_BASENAME "${BASENAME}${DAEMON_GENERATED_${kind}_EXT}")
63-
set(EMBED_${kind}_SRC_FILE "${DAEMON_EMBEDDED_DIR}/${EMBED_${kind}_BASENAME}")
64-
set(EMBED_${kind}_FILE "${DAEMON_EMBEDDED_SUBDIR}/${EMBED_${kind}_BASENAME}")
65-
set(EMBED_${kind}_TEXT "${DAEMON_GENERATED_HEADER}")
66-
set_property(TARGET "${TARGETNAME}" APPEND PROPERTY SOURCES "${EMBED_${kind}_SRC_FILE}")
62+
set(embed_${kind}_basename "${basename}${DAEMON_GENERATED_${kind}_EXT}")
63+
set(embed_${kind}_src_file "${DAEMON_EMBEDDED_DIR}/${embed_${kind}_basename}")
64+
set(embed_${kind}_file "${DAEMON_EMBEDDED_SUBDIR}/${embed_${kind}_basename}")
65+
set(embed_${kind}_text "${DAEMON_GENERATED_HEADER}")
66+
set_property(TARGET "${targetname}" APPEND PROPERTY SOURCES "${embed_${kind}_src_file}")
6767
endforeach()
6868

69-
string(APPEND EMBED_CPP_TEXT
70-
"#include \"${EMBED_H_FILE}\"\n"
69+
string(APPEND embed_CPP_text
70+
"#include \"${embed_H_file}\"\n"
7171
"\n"
72-
"namespace ${BASENAME} {\n"
72+
"namespace ${basename} {\n"
7373
)
7474

75-
string(APPEND EMBED_H_TEXT
75+
string(APPEND embed_H_text
7676
"#include \"common/Common.h\"\n"
7777
"\n"
78-
"namespace ${BASENAME} {\n"
78+
"namespace ${basename} {\n"
7979
)
8080

81-
set(EMBED_MAP_TEXT "")
81+
set(embed_map_text "")
8282

83-
foreach(filename ${${EMBED_SOURCE_LIST}})
83+
foreach(filename ${${embed_source_list}})
8484
string(REPLACE "/" "_" filename_symbol "${filename}")
8585
string(REPLACE "." "_" filename_symbol "${filename_symbol}")
8686

87-
set(inpath "${${EMBED_SOURCE_DIR}}/${filename}")
88-
set(outpath "${EMBED_DIR}/${filename_symbol}${DAEMON_GENERATED_H_EXT}")
87+
set(inpath "${${embed_source_dir}}/${filename}")
88+
set(outpath "${embed_dir}/${filename_symbol}${DAEMON_GENERATED_H_EXT}")
8989

9090
add_custom_command(
9191
OUTPUT ${outpath}
9292
COMMAND ${CMAKE_COMMAND}
9393
"-DINPUT_FILE=${inpath}"
9494
"-DOUTPUT_FILE=${outpath}"
95-
"-DFILE_FORMAT=${FORMAT}"
95+
"-DFILE_FORMAT=${format}"
9696
"-DVARIABLE_NAME=${filename_symbol}"
9797
-P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/EmbedText.cmake"
9898
MAIN_DEPENDENCY ${inpath}
9999
)
100100

101-
set_property(TARGET "${TARGETNAME}" APPEND PROPERTY SOURCES "${outpath}")
101+
set_property(TARGET "${targetname}" APPEND PROPERTY SOURCES "${outpath}")
102102

103-
string(APPEND EMBED_CPP_TEXT
104-
"#include \"${BASENAME}/${filename_symbol}.h\"\n"
103+
string(APPEND embed_CPP_text
104+
"#include \"${basename}/${filename_symbol}.h\"\n"
105105
)
106106

107-
string(APPEND EMBED_H_TEXT
107+
string(APPEND embed_H_text
108108
"extern const unsigned char ${filename_symbol}[];\n"
109109
)
110110

111-
string(APPEND EMBED_MAP_TEXT
111+
string(APPEND embed_map_text
112112
"\t{ \"${filename}\", "
113113
"std::string(reinterpret_cast<const char *>( ${filename_symbol} ), "
114114
"sizeof( ${filename_symbol} )) },\n"
115115
)
116116
endforeach()
117117

118-
string(APPEND EMBED_CPP_TEXT
118+
string(APPEND embed_CPP_text
119119
"\n"
120120
"const std::unordered_map<std::string, std::string> FileMap\n{\n"
121-
"${EMBED_MAP_TEXT}"
121+
"${embed_map_text}"
122122
"};\n"
123123
"\n"
124124
"const char* ReadFile(Str::StringRef filename)\n"
@@ -129,13 +129,13 @@ macro(daemon_embed_files BASENAME SLUG FORMAT TARGETNAME)
129129
"}"
130130
)
131131

132-
string(APPEND EMBED_H_TEXT
132+
string(APPEND embed_H_text
133133
"extern const std::unordered_map<std::string, std::string> FileMap;\n"
134134
"const char* ReadFile(Str::StringRef filename);\n"
135135
"};\n"
136136
)
137137

138138
foreach(kind CPP H)
139-
daemon_write_generated("${EMBED_${kind}_FILE}" "${EMBED_${kind}_TEXT}")
139+
daemon_write_generated("${embed_${kind}_file}" "${embed_${kind}_text}")
140140
endforeach()
141141
endmacro()

0 commit comments

Comments
 (0)