diff --git a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy index 7ae969df..8ff00731 100644 --- a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy @@ -6,6 +6,7 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.utils.Constants import ru.pulsar.jenkins.library.utils.EDT +import ru.pulsar.jenkins.library.utils.FileUtils import ru.pulsar.jenkins.library.utils.Logger class DesignerToEdtFormatTransformation implements Serializable { @@ -33,10 +34,11 @@ class DesignerToEdtFormatTransformation implements Serializable { def env = steps.env(); - def workspaceDir = "$env.WORKSPACE/$WORKSPACE" - def configurationRoot = new File(env.WORKSPACE, config.srcDir).getAbsolutePath() + def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE") + def srcDir = config.srcDir + def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") def edtVersionForRing = EDT.ringModule(config) - + steps.deleteDir(workspaceDir) Logger.println("Конвертация исходников из формата конфигуратора в формат EDT") diff --git a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy index 65d67e8f..f80acf22 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy @@ -7,6 +7,7 @@ import ru.pulsar.jenkins.library.configuration.SourceFormat import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.utils.Constants import ru.pulsar.jenkins.library.utils.EDT +import ru.pulsar.jenkins.library.utils.FileUtils import ru.pulsar.jenkins.library.utils.Logger class EdtToDesignerFormatTransformation implements Serializable { @@ -35,9 +36,9 @@ class EdtToDesignerFormatTransformation implements Serializable { def env = steps.env(); def srcDir = config.srcDir - def projectDir = new File("$env.WORKSPACE/$srcDir").getCanonicalPath() - def workspaceDir = "$env.WORKSPACE/$WORKSPACE" - def configurationRoot = "$env.WORKSPACE/$CONFIGURATION_DIR" + def projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") + def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE") + def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$CONFIGURATION_DIR") def edtVersionForRing = EDT.ringModule(config) steps.deleteDir(workspaceDir) diff --git a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy index 98c8f6d8..c24f812a 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy @@ -6,6 +6,7 @@ import ru.pulsar.jenkins.library.configuration.SourceFormat import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.utils.Constants import ru.pulsar.jenkins.library.utils.EDT +import ru.pulsar.jenkins.library.utils.FileUtils import ru.pulsar.jenkins.library.utils.Logger class EdtValidate implements Serializable { @@ -40,7 +41,8 @@ class EdtValidate implements Serializable { projectList = "--project-name-list $DesignerToEdtFormatTransformation.PROJECT_NAME" } else { - String projectDir = new File("$env.WORKSPACE/$config.srcDir").getCanonicalPath() + def srcDir = config.srcDir + def projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") projectList = "--project-list \"$projectDir\"" }