Skip to content

Commit 91a15a6

Browse files
artbearartbear
committed
Merge branch 'release/0.6.0'
2 parents 0f74e39 + faf7f4d commit 91a15a6

File tree

4 files changed

+471
-77
lines changed

4 files changed

+471
-77
lines changed

‎.vscode/tasks.json

Lines changed: 242 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,242 @@
1+
// Available variables which can be used inside of strings.
2+
// ${workspaceRoot}: the root folder of the team
3+
// ${file}: the current opened file
4+
// ${fileBasename}: the current opened file's basename
5+
// ${fileDirname}: the current opened file's dirname
6+
// ${fileExtname}: the current opened file's extension
7+
// ${cwd}: the current working directory of the spawned process
8+
9+
{
10+
"version": "2.0.0",
11+
"_runner": "terminal",
12+
"windows": {
13+
"command": "cmd",
14+
"args": ["/c", "chcp 65001 ;"]
15+
},
16+
"linux": {
17+
"command": "sh",
18+
"args": ["-c"]
19+
},
20+
"isShellCommand": true,
21+
// "showOutput": "silent",
22+
"_runner": "terminal",
23+
"tasks": [
24+
{
25+
"taskName": "Testing project",
26+
"args": [
27+
"1testrunner",
28+
"-runall",
29+
"${workspaceRoot}/tests"
30+
],
31+
"echoCommand": true,
32+
"showOutput": "always",
33+
"suppressTaskName": true,
34+
// "isBuildCommand": false,
35+
"isTestCommand": false,
36+
"problemMatcher": {
37+
"fileLocation": "absolute",
38+
"pattern": {
39+
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
40+
"file": 1,
41+
"location": 2,
42+
"message": 3
43+
}
44+
}
45+
},
46+
{
47+
"taskName": "Testing current test-file",
48+
"args": [
49+
"1testrunner",
50+
"-run",
51+
"${file}",
52+
],
53+
"echoCommand": true,
54+
"showOutput": "always",
55+
"suppressTaskName": true,
56+
"isBuildCommand": false,
57+
"isTestCommand": true,
58+
"problemMatcher": {
59+
"fileLocation": "absolute",
60+
"pattern": {
61+
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
62+
"file": 1,
63+
"location": 2,
64+
"message": 3
65+
}
66+
}
67+
},
68+
{
69+
"taskName": "Exec all features",
70+
"args": [
71+
"1bdd",
72+
"${workspaceRoot}/features",
73+
"-fail-fast",
74+
"-out",
75+
"${workspaceRoot}/exec.log"
76+
],
77+
"echoCommand": true,
78+
"showOutput": "always",
79+
"suppressTaskName": true,
80+
"isBuildCommand": true,
81+
"isTestCommand": false,
82+
"problemMatcher": {
83+
"fileLocation": "absolute",
84+
"pattern": {
85+
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
86+
"file": 1,
87+
"location": 2,
88+
"message": 3
89+
}
90+
}
91+
},
92+
{
93+
"taskName": "Exec feature",
94+
"args": [
95+
"1bdd",
96+
"${file}",
97+
"-fail-fast",
98+
"-out",
99+
"${workspaceRoot}/exec.log"
100+
],
101+
"echoCommand": true,
102+
"showOutput": "always",
103+
"suppressTaskName": true,
104+
"isBuildCommand": false,
105+
"isTestCommand": true,
106+
"problemMatcher": {
107+
"fileLocation": "absolute",
108+
"pattern": [
109+
{
110+
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
111+
"file": 1,
112+
"location": 2,
113+
"message": 3
114+
}
115+
]
116+
}
117+
},
118+
{
119+
"taskName": "Exec feature for current step def",
120+
"args": [
121+
"1bdd",
122+
"${fileDirname}/../${fileBasenameNoExtension}.feature",
123+
"-fail-fast",
124+
"-out",
125+
"${workspaceRoot}/exec.log"
126+
],
127+
"echoCommand": true,
128+
"showOutput": "always",
129+
"suppressTaskName": true,
130+
"isBuildCommand": false,
131+
"isTestCommand": true,
132+
"problemMatcher": {
133+
"fileLocation": "absolute",
134+
"pattern": [
135+
{
136+
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
137+
"file": 1,
138+
"location": 2,
139+
"message": 3
140+
}
141+
]
142+
}
143+
},
144+
{
145+
"taskName": "Generate feature steps",
146+
"args": [
147+
"1bdd",
148+
"gen",
149+
"${file}",
150+
"-out",
151+
"${workspaceRoot}/exec.log"
152+
],
153+
"echoCommand": true,
154+
"showOutput": "always",
155+
"suppressTaskName": true,
156+
"isBuildCommand": false,
157+
"isTestCommand": false,
158+
"problemMatcher": {
159+
"fileLocation": "absolute",
160+
"pattern": {
161+
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
162+
"file": 1,
163+
"location": 2,
164+
"message": 3
165+
}
166+
}
167+
},
168+
{
169+
"taskName": "Opm: package build",
170+
"args": [
171+
"opm",
172+
"build",
173+
"${workspaceRoot}"
174+
],
175+
"echoCommand": true,
176+
"showOutput": "always",
177+
"suppressTaskName": true,
178+
"isBuildCommand": false
179+
},
180+
{
181+
"taskName": "OneScript: compile",
182+
"args": [
183+
"oscript",
184+
"-encoding=utf-8",
185+
"-compile",
186+
"${file}"
187+
],
188+
"echoCommand": true,
189+
"showOutput": "always",
190+
"suppressTaskName": true,
191+
"isBuildCommand": false
192+
},
193+
{
194+
"taskName": "OneScript: check",
195+
"args": [
196+
"oscript",
197+
"-encoding=utf-8",
198+
"-check",
199+
"${file}"
200+
],
201+
"echoCommand": true,
202+
"showOutput": "always",
203+
"suppressTaskName": true,
204+
"isBuildCommand": false
205+
},
206+
{
207+
"taskName": "OneScript: make",
208+
"args": [
209+
"oscript",
210+
"-encoding=utf-8",
211+
"-make",
212+
"${file}",
213+
"${fileBasename}.exe"
214+
],
215+
"echoCommand": true,
216+
"showOutput": "always",
217+
"suppressTaskName": true,
218+
"isBuildCommand": false
219+
},
220+
{
221+
"taskName": "OneScript: run",
222+
"args": [
223+
"oscript",
224+
"-encoding=utf-8",
225+
"${file}"
226+
],
227+
"echoCommand": true,
228+
"showOutput": "always",
229+
"suppressTaskName": true,
230+
"isBuildCommand": true,
231+
"problemMatcher": {
232+
"fileLocation": "absolute",
233+
"pattern": {
234+
"regexp": "^{Модуль\\s+(.*)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+(.*)}$",
235+
"file": 1,
236+
"location": 2,
237+
"message": 3
238+
}
239+
}
240+
}
241+
]
242+
}

‎packagedef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Описание.Имя("cmdline")
3-
.Версия("0.3.1")
3+
.Версия("0.6.0")
44
.ЗависитОт("logos")
55
.ВключитьФайл("src")
66
.ВключитьФайл("tests")

0 commit comments

Comments
 (0)