Skip to content

Commit 6eaa5dc

Browse files
nixel2007nixel2007
committed
Merged release/v0.9.3 into master
2 parents b740949 + d1c332e commit 6eaa5dc

File tree

17 files changed

+398
-30
lines changed

17 files changed

+398
-30
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oscript_modules/

‎.vscode/tasks.json‎

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

‎src/opm.os‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
ОбработкаКоманд.ВыполнитьКоманду(ПараметрыКоманды);
3333
Исключение
3434
Лог.Отладка(ОписаниеОшибки());
35-
Сообщить(КраткоеПредставлениеОшибки(ИнформацияОбОшибке()));
35+
Лог.Информация(КраткоеПредставлениеОшибки(ИнформацияОбОшибке()));
3636
ЗавершитьРаботу(1);
3737
КонецПопытки;
3838

@@ -54,7 +54,7 @@
5454
/////////////////////////////////////////////////////////////////////////
5555
// Точка входа
5656

57-
Лог = Логирование.ПолучитьЛог("oscript.app.opm");
57+
Лог = Логирование.ПолучитьЛог(Константы.ИмяЛога);
5858

5959
НастройкиПриложения.УстановитьФайлНастроек(ОбъединитьПути(СтартовыйСценарий().Каталог, "opm.cfg"));
6060
ВыполнитьКоманду(АргументыКоманднойСтроки);

‎src/Классы/ДиспетчерКомандПриложения.os‎

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

339339
/////////////////////////////////////////////////////////////////////
340340

341-
Лог = Логирование.ПолучитьЛог("oscript.app.opm");
341+
Лог = Логирование.ПолучитьЛог(Константы.ИмяЛога);
342342
СистемнаяИнформация = Новый СистемнаяИнформация;
343343
ЭтоWindows = Найти(НРег(СистемнаяИнформация.ВерсияОС), "windows") > 0;

‎src/Классы/КэшУстановленныхПакетов.os‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
// @deprecated
2424
УстановленнаяВерсия = 0;
2525
КонецЕсли;
26+
Лог.Отладка("ПакетУстановлен: Перед вызовом СравнитьВерсии(ЭтаВерсия = <%1>, БольшеЧемВерсия = <%2>)", УстановленнаяВерсия, ОписаниеЗависимости.МинимальнаяВерсия);
2627

2728
УстановленаКорректнаяВерсия = ОписаниеЗависимости.МинимальнаяВерсия = Неопределено
2829
ИЛИ РаботаСВерсиями.СравнитьВерсии(УстановленнаяВерсия, ОписаниеЗависимости.МинимальнаяВерсия) = 1;

0 commit comments

Comments
 (0)