krak/jenkins-lib
1
0
Fork 0
forked from jenkins/jenkins-lib
Code Activity

Поменял хак на нормальный метод.

Browse Source
This commit is contained in:
ivanovEV
2024-01-22 07:30:18 +03:00
parent 7d16c50295
commit 276c54a4ee
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy
View File

@@ -30,14 +30,11 @@ class GetExtensions implements Serializable {
steps.installLocalDependencies(); steps.installLocalDependencies();
String vrunnerPath = initVRunnerPath(); String vrunnerPath = initVRunnerPath();
Logger.println("Сборка расширений") Logger.println("Сборка расширений")
String sourceDirName = "" String sourceDirName = ""
if (config.sourceFormat == SourceFormat.EDT) { if (config.sourceFormat == SourceFormat.EDT) {
sourceDirName = "$env.WORKSPACE/$EdtToDesignerFormatTransformation.EXTENSION_DIR" sourceDirName = "$env.WORKSPACE/$EdtToDesignerFormatTransformation.EXTENSION_DIR"
} }
@@ -46,6 +43,8 @@ class GetExtensions implements Serializable {
} }
extractConvertedExtensions(sourceDirName, steps) extractConvertedExtensions(sourceDirName, steps)
steps.createDir(EXTENSIONS_OUT_DIR)
config.initInfoBaseOptions.extensions.each { config.initInfoBaseOptions.extensions.each {
if (it.initMethod == InitMethod.SOURCE) { if (it.initMethod == InitMethod.SOURCE) {
Logger.println("Сборка расширения ${it.name} из исходников") Logger.println("Сборка расширения ${it.name} из исходников")
@@ -59,9 +58,6 @@ class GetExtensions implements Serializable {
} }
private void buildExtension(Extension extension, String srcDir, String vrunnerPath, IStepExecutor steps) { 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" def compileExtCommand = "$vrunnerPath compileexttocfe --src ${srcDir} --out $EXTENSIONS_OUT_DIR/${extension.name}.cfe"
List<String> logosConfig = ["LOGOS_CONFIG=$config.logosConfig"] List<String> logosConfig = ["LOGOS_CONFIG=$config.logosConfig"]