From e907814ea9789a757027e5fbdc5710772ca8a761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Wed, 19 Mar 2025 15:07:19 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81:=20=D0=A3=D0=BA=D0=B0?= =?UTF-8?q?=D0=B7=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B0=20=D0=B2=20edtcliCommand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jenkins/library/edt/NativeEdtCliConverter.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy b/src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy index c553f38..502b917 100644 --- a/src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy +++ b/src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy @@ -15,6 +15,7 @@ class NativeEdtCliConverter implements IEdtCliEngine { void edtToDesignerTransformConfiguration(IStepExecutor steps, JobConfiguration config) { def env = steps.env() + def srcDir = config.srcDir String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.WORKSPACE").getRemote() String projectWorkspaceDir = FileUtils.getFilePath("$workspaceDir/cf").getRemote() @@ -25,8 +26,8 @@ class NativeEdtCliConverter implements IEdtCliEngine { steps.deleteDir(configurationRoot) - def projectName = configurationRoot.getName() - def edtcliCommand = "1cedtcli -data \"$projectWorkspaceDir\" -command export --configuration-files \"$configurationRootFullPath\" --project-name \"$projectName\"" + def projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir").getRemote() + def edtcliCommand = "1cedtcli -data \"$projectWorkspaceDir\" -command export --configuration-files \"$configurationRootFullPath\" --project \"$projectDir\"" steps.cmd(edtcliCommand) @@ -48,8 +49,9 @@ class NativeEdtCliConverter implements IEdtCliEngine { Logger.println("Конвертация исходников расширения ${it.name} из формата EDT в формат Конфигуратора с помощью 1cedtcli") def currentExtensionWorkspaceDir = FileUtils.getFilePath("$workspaceDir/cfe/${it.name}") + def currentExtensionProjectDir = FileUtils.getFilePath("$env.WORKSPACE/${it.path}").getRemote() - def edtcliCommand = "1cedtcli -data \"$currentExtensionWorkspaceDir\" -command export --configuration-files \"$extensionRoot/${it.name}\" --project-name ${it.name}" + def edtcliCommand = "1cedtcli -data \"$currentExtensionWorkspaceDir\" -command export --configuration-files \"$extensionRoot/${it.name}\" --project \"$currentExtensionProjectDir\"" steps.cmd(edtcliCommand)