Skip to content

Commit 3625808

Browse files
committed
Fix userver_target_generate_chaotic command formatting
1 parent ea6f9c7 commit 3625808

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

.cmake-format.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@
4545
"userver_target_generate_chaotic": {
4646
"pargs": 1,
4747
"kwargs": {
48-
"ARGS": {
49-
"kwargs": {
50-
"-n": 1,
51-
}
52-
},
48+
"ARGS": "*",
5349
"FORMAT": "*",
5450
"OUTPUT_DIR": "*",
5551
"SCHEMAS": "*",

chaotic/golden_tests/CMakeLists.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ include(ChaoticGen)
66
file(GLOB_RECURSE SCHEMAS "${CMAKE_CURRENT_SOURCE_DIR}/schemas/*.yaml")
77
userver_target_generate_chaotic(
88
${PROJECT_NAME}-chgen
9-
ARGS -n "/components/schemas/([^/]*)/=ns::{0}"
10-
-I "${CMAKE_CURRENT_SOURCE_DIR}/include" -I "${CMAKE_CURRENT_SOURCE_DIR}/../include" --parse-extra-formats
11-
--generate-serializers
9+
ARGS -n
10+
"/components/schemas/([^/]*)/=ns::{0}"
11+
-I
12+
"${CMAKE_CURRENT_SOURCE_DIR}/include"
13+
-I
14+
"${CMAKE_CURRENT_SOURCE_DIR}/../include"
15+
--parse-extra-formats
16+
--generate-serializers
1217
FORMAT ON
1318
OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
1419
SCHEMAS ${SCHEMAS}

chaotic/integration_tests/CMakeLists.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/i
1212
file(GLOB_RECURSE SCHEMAS ${CMAKE_CURRENT_SOURCE_DIR}/schemas/*.yaml)
1313
userver_target_generate_chaotic(
1414
${PROJECT_NAME}-chgen
15-
ARGS -n "/definitions/([^/]*)/=ns::{0}"
16-
-I ${CMAKE_CURRENT_SOURCE_DIR}/include -I ${CMAKE_CURRENT_SOURCE_DIR}/../include --parse-extra-formats
17-
--generate-serializers
15+
ARGS -n
16+
"/definitions/([^/]*)/=ns::{0}"
17+
-I
18+
${CMAKE_CURRENT_SOURCE_DIR}/include
19+
-I
20+
${CMAKE_CURRENT_SOURCE_DIR}/../include
21+
--parse-extra-formats
22+
--generate-serializers
1823
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/src
1924
SCHEMAS ${SCHEMAS}
2025
RELATIVE_TO ${CMAKE_CURRENT_SOURCE_DIR}

libraries/easy/samples/3_json/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ userver_target_generate_chaotic(
1212
${PROJECT_NAME}-chgen
1313
ARGS # Map '/components/schemas/*' JSONSchema types to C++ types in 'schemas' namespace
1414
-n "/components/schemas/([^/]*)/=schemas::{0}" # Generate serializers for responses
15-
--generate-serializers
15+
--generate-serializers
1616
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/src
1717
SCHEMAS ${SCHEMAS}
1818
RELATIVE_TO ${CMAKE_CURRENT_SOURCE_DIR}

samples/chaotic_service/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ userver_target_generate_chaotic(
2222
${PROJECT_NAME}-chgen
2323
ARGS # Map '/components/schemas/*' JSONSchema types to C++ types in 'samples::hello' namespace
2424
-n "/components/schemas/([^/]*)/=samples::hello::{0}" # Generate serializers for responses
25-
--generate-serializers
25+
--generate-serializers
2626
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/src
2727
SCHEMAS ${SCHEMAS}
2828
RELATIVE_TO ${CMAKE_CURRENT_SOURCE_DIR}

0 commit comments

Comments
 (0)