From 74c662aee4a7b5a006a0c8cadd3287986823f4f4 Mon Sep 17 00:00:00 2001 From: Dennis Behm Date: Tue, 15 Feb 2022 16:59:39 +0100 Subject: [PATCH] Release zAppBuild 2.3.1 (#178) * fix additional datasets in syslib for ASM and REXX language scripts --- languages/Assembler.groovy | 8 +++++--- languages/REXX.groovy | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/languages/Assembler.groovy b/languages/Assembler.groovy index ab1941aa..45ce72da 100644 --- a/languages/Assembler.groovy +++ b/languages/Assembler.groovy @@ -272,9 +272,11 @@ def createAssemblerCommand(String buildFile, LogicalFile logicalFile, String mem assembler.dd(new DDStatement().name("SYSLIB").dsn(props.assembler_macroPDS).options("shr")) // add additional datasets with dependencies based on the dependenciesDatasetMapping - PropertyMapping dsMapping = new PropertyMappings('assembler_dependenciesDatasetMapping') - dsMapping.getProperties().values().each { targetDatasets -> - if (targetDatasets != 'assembler_macroPDS') assembler.dd(new DDStatement().dsn(props.getProperty(targetDatasets)).options("shr")) + PropertyMappings dsMapping = new PropertyMappings('assembler_dependenciesDatasetMapping') + dsMapping.getValues().each { targetDataset -> + // exclude the defaults assembler_macroPDS + if (targetDataset != 'assembler_macroPDS') + assembler.dd(new DDStatement().dsn(props.getProperty(targetDataset)).options("shr")) } // add custom external concatenations diff --git a/languages/REXX.groovy b/languages/REXX.groovy index 61318545..83c22de8 100644 --- a/languages/REXX.groovy +++ b/languages/REXX.groovy @@ -123,9 +123,11 @@ def createCompileCommand(String buildFile, LogicalFile logicalFile, String membe compile.dd(new DDStatement().name("SYSLIB").dsn(props.rexx_srcPDS).options("shr")) // add additional datasets with dependencies based on the dependenciesDatasetMapping - PropertyMapping dsMapping = new PropertyMappings('rexx_dependenciesDatasetMapping') - dsMapping.getProperties().values().each { targetDatasets -> - if (targetDatasets != 'rexx_srcPDS') rexx.dd(new DDStatement().dsn(props.getProperty(targetDatasets)).options("shr")) + PropertyMappings dsMapping = new PropertyMappings('rexx_dependenciesDatasetMapping') + dsMapping.getValues().each { targetDataset -> + // exclude the defaults rexx_srcPDS + if (targetDataset != 'rexx_srcPDS') + rexx.dd(new DDStatement().dsn(props.getProperty(targetDataset)).options("shr")) } // add custom concatenation