From 4d7efed5f07c288aa632451c11cc2e91f9c728d4 Mon Sep 17 00:00:00 2001 From: ivanovEV Date: Mon, 22 Jan 2024 07:30:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20?= =?UTF-8?q?=D1=85=D0=B0=D0=BA=20=D0=BD=D0=B0=20=D0=BD=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BC=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy b/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy index ac8d5330..422985f7 100644 --- a/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy +++ b/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy @@ -30,14 +30,11 @@ class GetExtensions implements Serializable { steps.installLocalDependencies(); - String vrunnerPath = initVRunnerPath(); - Logger.println("Сборка расширений") String sourceDirName = "" - if (config.sourceFormat == SourceFormat.EDT) { sourceDirName = "$env.WORKSPACE/$EdtToDesignerFormatTransformation.EXTENSION_DIR" } @@ -46,6 +43,8 @@ class GetExtensions implements Serializable { } extractConvertedExtensions(sourceDirName, steps) + steps.createDir(EXTENSIONS_OUT_DIR) + config.initInfoBaseOptions.extensions.each { if (it.initMethod == InitMethod.SOURCE) { Logger.println("Сборка расширения ${it.name} из исходников") @@ -59,9 +58,6 @@ class GetExtensions implements Serializable { } private void buildExtension(Extension extension, String srcDir, String vrunnerPath, IStepExecutor steps) { - // ТУТ ГРЯЗНЫЙ ХАК - VRunner.exec("mkdir -p $EXTENSIONS_OUT_DIR") - // ТУТ КОНЕЦ ГРЯЗНОГО ХАКА def compileExtCommand = "$vrunnerPath compileexttocfe --src ${srcDir} --out $EXTENSIONS_OUT_DIR/${extension.name}.cfe" List logosConfig = ["LOGOS_CONFIG=$config.logosConfig"]