jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00
Code Issues Releases Activity

Merge pull request #156 from firstBitMarksistskaya/develop

Browse Source 
v0.15.2
This commit is contained in:
Nikita Fedkin
2025-03-19 21:49:00 +01:00
committed by GitHub
parent 3233ada828 2c511c6daf
commit 89bf634958
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy
View File

@@ -15,6 +15,7 @@ class NativeEdtCliConverter implements IEdtCliEngine {
void edtToDesignerTransformConfiguration(IStepExecutor steps, JobConfiguration config) { void edtToDesignerTransformConfiguration(IStepExecutor steps, JobConfiguration config) {
def env = steps.env() def env = steps.env()
def srcDir = config.srcDir
String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.WORKSPACE").getRemote() String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.WORKSPACE").getRemote()
String projectWorkspaceDir = FileUtils.getFilePath("$workspaceDir/cf").getRemote() String projectWorkspaceDir = FileUtils.getFilePath("$workspaceDir/cf").getRemote()
@@ -25,8 +26,8 @@ class NativeEdtCliConverter implements IEdtCliEngine {
steps.deleteDir(configurationRoot) steps.deleteDir(configurationRoot)
def projectName = configurationRoot.getName() def projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir").getRemote()
def edtcliCommand = "1cedtcli -data \"$projectWorkspaceDir\" -command export --configuration-files \"$configurationRootFullPath\" --project-name \"$projectName\"" def edtcliCommand = "1cedtcli -data \"$projectWorkspaceDir\" -command export --configuration-files \"$configurationRootFullPath\" --project \"$projectDir\""
steps.cmd(edtcliCommand) steps.cmd(edtcliCommand)
@@ -48,8 +49,9 @@ class NativeEdtCliConverter implements IEdtCliEngine {
Logger.println("Конвертация исходников расширения ${it.name} из формата EDT в формат Конфигуратора с помощью 1cedtcli") Logger.println("Конвертация исходников расширения ${it.name} из формата EDT в формат Конфигуратора с помощью 1cedtcli")
def currentExtensionWorkspaceDir = FileUtils.getFilePath("$workspaceDir/cfe/${it.name}") 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) steps.cmd(edtcliCommand)