Skip to content

Commit 7527814

Browse files
authored
Merge pull request #562 from IBM/develop
Release zAppBuild 3.10.0
2 parents f3dfad6 + 237fa4b commit 7527814

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+807
-624
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@
1818
*.mac zos-working-tree-encoding=ibm-1047 git-encoding=utf-8
1919
*.json zos-working-tree-encoding=utf-8 git-encoding=utf-8
2020
*.yaml zos-working-tree-encoding=utf-8 git-encoding=utf-8
21+
22+
# TAZ recording file
23+
*.rec binary

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ The zAppBuild sample provides the following *language* build scripts by default:
2727
* DBDgen.groovy
2828
* PSBgen.groovy
2929
* MFS.groovy
30-
* ZunitConfig.groovy
30+
* TazUnitTest.groovy
3131
* CRB.groovy
3232
* Transfer.groovy (for transport non-buildable files like JCL or PROC into build libraries and register them as build output)
3333
* Easytrieve.groovy
34+
* zCEE2.groovy
35+
* zCEE3.groovy (for z/OS Connect OpenAPI 3 specification)
3436

3537
All language scripts both compile and optionally link-edit programs. The language build scripts are intended to be useful out of the box but depending on the complexity of your applications' build requirements, may require modifications to meet your development team's needs. By following the examples used in the existing language build scripts of keeping all application specific references out of the build scripts and instead using configuration properties with strong default values, the zAppBuild sample can continue to be a generic build solution for all of your specific applications.
3638

build-conf/Easytrieve.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ easytrieve_printTempOptions=cyl space(5,5) unit(vio) blksize(133) lrecl(133) rec
4141

4242
#
4343
# List of output datasets to document deletions
44-
easytrievel_outputDatasets=${easytrieve_loadPDS}
44+
easytrieve_outputDatasets=${easytrieve_loadPDS}
4545

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Releng properties used by zAppBuild
2+
3+
# Default allocation options for in-stream DD statements
4+
global_instreamDataTempAllocation=tracks space(5,5) unit(vio) blksize(80) lrecl(80) recfm(f,b) new
5+

build-conf/README.md

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SCSQLOAD | MQ Load Library. Example: CSQ.V9R1M0.SCSQLOAD
3030
SDSNLOAD | DB2 Load Library. Example: DB2.V9R1M0.SDSNLOAD
3131
SDSNEXIT | DB2 Exit Library. Example: DBC0CFG.SDSNEXIT
3232
SFELLOAD | Optional IDz Load Library. Example: FEL.V14R0M0.SFELLOAD
33-
SBZUSAMP | Optional z/OS Dynamic Test Runner IDz zUnit / WAZI VTP library containing necessary copybooks. Example : FEL.V14R2.SBZUSAMP
33+
SEQASAMP | Optional IBM Debug Tool library containing necessary TAZ copybooks. Example : DEBUG.V16.SEQASAMP
3434
EZETLOAD | Easytrieve Load Library. Example for IBM Migration Utility: SYS1.SFSYLOAD
3535

3636
### build.properties
@@ -73,6 +73,13 @@ impactBuildOnBuildPropertyList | List of build property lists referencing which
7373
documentDeleteRecords | Option determine if the build framework should document deletions of outputs in DBB Build Report. Default: false.
7474
dbb.LinkEditScanner.excludeFilter | DBB configuration property used by the link edit scanner to exclude load module entries
7575

76+
### GlobalOptions.properties
77+
General options that are reused by multiple language scripts
78+
79+
Property | Description
80+
--- | ---
81+
global_instreamDataTempAllocation | Default allocation options for in-stream DD statements
82+
7683
### dependencyReport.properties
7784
Properties used by the impact utilities to generate a report of external impacted files
7885

@@ -277,21 +284,21 @@ acbgen_outputDatasets | List of output datasets to document deletions ** Can be
277284
acbgen_pgm | MVS program name of the acbgen pgm
278285
acbgen_deployType | Deploy Type of build outputs
279286

280-
### ZunitConfig.properties
281-
Build properties used by zAppBuild/language/ZunitConfig.groovy
287+
### TazUnitTest.properties
288+
Build properties used by zAppBuild/language/TazUnitTest.groovy
282289

283290
Property | Description
284291
--- | ---
285-
zunit_bzucfgPDS | Dataset to move BZUCFG files to from USS
286-
zunit_bzureportPDS | Dataset where BZUCRPT files are stored
287-
zunit_bzuplayPDS | Dataset to move zUnit Playback files to from USS
288-
zunit_srcDatasets | Comma separated list of 'source' type data sets
289-
zunit_srcOptions | BPXWDYN creation options for creating 'source' type data sets
290-
zunit_loadDatasets | Comma separated list of 'load module' type data sets
291-
zunit_loadOptions | BPXWDYN creation options for creating 'load module' type data sets
292-
zunit_reportDatasets | Comma separated list of 'report' type data sets
293-
zunit_reportOptions | BPXWDYN creation options for creating 'report' type data sets
294-
zunit_dependenciesDatasetMapping | DBB property mapping to map dependencies to different target datasets
292+
tazunittest_bzucfgPDS | Dataset to move BZUCFG files to from USS
293+
tazunittest_bzureportPDS | Dataset where BZUCRPT files are stored
294+
tazunittest_bzuplayPDS | Dataset to move zUnit Playback files to from USS
295+
tazunittest_srcDatasets | Comma separated list of 'source' type data sets
296+
tazunittest_srcOptions | BPXWDYN creation options for creating 'source' type data sets
297+
tazunittest_loadDatasets | Comma separated list of 'load module' type data sets
298+
tazunittest_loadOptions | BPXWDYN creation options for creating 'load module' type data sets
299+
tazunittest_reportDatasets | Comma separated list of 'report' type data sets
300+
tazunittest_reportOptions | BPXWDYN creation options for creating 'report' type data sets
301+
tazunittest_dependenciesDatasetMapping | DBB property mapping to map dependencies to different target datasets
295302

296303
### zCEE3.properties
297304
Application properties used by zAppBuild/language/zCEE3.groovy
@@ -300,17 +307,16 @@ Property | Description
300307
--- | ---
301308
zcee3_shellEnvironment | Shell environment used to run the gradle command
302309
zcee3_gradlePath | Path to gradle executable
303-
zcee3_gradle_JAVA_OPTS | JAVA Options used with gradle
310+
zcee3_gradle_debug | Flag to indicate if debug option should be added
304311

305312
### zCEE2.properties
306313
Application properties used by zAppBuild/language/zCEE2.groovy
307314

308315
Property | Description
309316
--- | ---
310317
zcee2_zconbtPath | Absolute path to zconbt executable on z/OS UNIX System Services
311-
zcee2_JAVA_HOME | Java installation used by the zconbt utility
312-
zcee2_inputType | Mapping of input files with types of files
313-
zcee2_ARA_PackageArtifacts | Flag to indicate if artifacts produced for the ARA processing should be packaged
318+
zcee2_inputType | Mapping of input files with types of projects/files
319+
zcee2_ARA_packageArtifacts | Flag to indicate if artifacts produced for the ARA processing should be packaged
314320

315321
### CRB.properties
316322
Application properties used by zAppBuild/language/CRB.groovy

build-conf/REXX.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# Comma separated list of required build properties for REXX.groovy
55
rexx_requiredBuildProperties=rexx_srcPDS,rexx_objPDS,rexx_loadPDS,\
66
rexx_cexecPDS, rexx_compiler,rexx_linkEditor,rexx_tempOptions, \
7-
SFANLMD, \
8-
rexx_dependencySearch
7+
SFANLMD, rexx_dependencySearch, \
8+
rexx_compileMaxRC, rexx_linkEditMaxRC, rexx_linkEdit
99

1010
#
1111
# rexx compiler name
@@ -53,5 +53,5 @@ rexx_outputDatasets=${rexx_cexecPDS},${rexx_loadPDS}
5353
# rexx_dependenciesDatasetMapping = rexx_macroPDS :: **/rexxmacros/*.rexx
5454
#
5555
# default copies all dependencies into the dependency dataset definition which was previously passed to the utilities/BuildUitilities.copySourceFiles method
56-
# rexx_dependenciesDatasetMapping = rexx_srcPDS :: **/*
56+
# rexx_dependenciesDatasetMapping = rexx_srcPDS :: **/*
5757
rexx_dependenciesDatasetMapping = rexx_srcPDS :: **/*

build-conf/TazUnitTest.properties

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Releng properties used by language/TazUnitTest.groovy
2+
3+
tazunittest_requiredBuildProperties=tazunittest_srcDatasets,tazunittest_loadDatasets,tazunittest_reportDatasets,tazunittest_bzucfgPDS,\
4+
tazunittest_bzureportPDS,tazunittest_bzuplayPDS,tazunittest_srcOptions,tazunittest_loadOptions,tazunittest_reportOptions,\
5+
tazunittest_jobCard,tazunittest_maxPassRC,tazunittest_maxWarnRC,tazunittest_playbackFileExtension,\
6+
tazunittest_eqaplayParms,tazunittest_userDebugSessionTestParm, \
7+
tazunittest_dependencySearch
8+
9+
tazunittest_bzucfgPDS=${hlq}.BZU.BZUCFG
10+
tazunittest_bzureportPDS=${hlq}.BZU.BZURPT
11+
tazunittest_bzuplayPDS=${hlq}.BZU.BZUPLAY
12+
13+
# List the data sets that need to be created and their creation options
14+
tazunittest_srcDatasets=${tazunittest_bzucfgPDS}
15+
tazunittest_srcOptions=cyl space(1,1) lrecl(27998) dsorg(PO) recfm(V,B) dsntype(library)
16+
17+
tazunittest_loadDatasets=${tazunittest_bzuplayPDS}
18+
tazunittest_loadOptions=cyl space(1,1) dsorg(PO) lrecl(256) recfm(F,B) blksize(32512) dsntype(library)
19+
20+
tazunittest_reportDatasets=${tazunittest_bzureportPDS}
21+
tazunittest_reportOptions=tracks space(200,40) dsorg(PO) blksize(32760) lrecl(16383) recfm(v,b) dsntype(library)
22+
23+
# tazunittest_dependenciesDatasetMapping - an optional dbb property mapping to map dependencies to different target datasets
24+
# this property is used when dependencies are copied to the different build libraries, e.q dclgens going into to a dedicated library
25+
# note, that a dependency file needs to match a single rule
26+
#
27+
# sample:
28+
# tazunittest_dependenciesDatasetMapping = tazunittest_bzuplayPDS :: **/bzuplay/*.rec
29+
# tazunittest_dependenciesDatasetMapping = tazunittest_bzuplayPDS :: **/bzuplay_vtp/*.rec
30+
#
31+
# default copies all dependencies into the dependency dataset definition which was previously passed to the utilities/BuildUitilities.copySourceFiles method
32+
# tazunittest_dependenciesDatasetMapping = tazunittest_bzuplayPDS :: **/*
33+
tazunittest_dependenciesDatasetMapping = tazunittest_bzuplayPDS :: **/*

build-conf/ZunitConfig.properties

Lines changed: 0 additions & 33 deletions
This file was deleted.

build-conf/build.properties

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
# These properties files expect to contain centrally managed defaults
1717
# such as system datasets, language script specific settings
1818
#
19-
buildPropFiles=${systemDatasets},dependencyReport.properties,Assembler.properties,BMS.properties,\
20-
MFS.properties,PSBgen.properties,DBDgen.properties,ACBgen.properties,Cobol.properties,\
21-
LinkEdit.properties,PLI.properties,REXX.properties,ZunitConfig.properties,Transfer.properties,\
19+
buildPropFiles=${systemDatasets},GlobalOptions.properties,dependencyReport.properties,\
20+
Assembler.properties,BMS.properties,Cobol.properties,Transfer.properties,\
21+
MFS.properties,PSBgen.properties,DBDgen.properties,ACBgen.properties,\
22+
LinkEdit.properties,PLI.properties,REXX.properties,TazUnitTest.properties,\
2223
CRB.properties,zCEE3.properties,zCEE2.properties,Easytrieve.properties
2324

2425
#
@@ -50,7 +51,7 @@ systemDatasets=datasets.properties
5051
# default-application-conf/PLI.properties,\
5152
# default-application-conf/Transfer.properties,\
5253
# default-application-conf/LinkEdit.properties,\
53-
# default-application-conf/ZunitConfig.properties
54+
# default-application-conf/TazUnitTest.properties
5455
#
5556
applicationDefaultPropFiles=defaultzAppBuildConf.properties
5657

@@ -110,7 +111,7 @@ createBuildOutputSubfolder=true
110111
#
111112
# Minimum required DBB ToolkitVersion to run this version of zAppBuild
112113
# Build initialization process validates the DBB Toolkit Version in use and matches that against this setting
113-
requiredDBBToolkitVersion=2.0.0
114+
requiredDBBToolkitVersion=2.0.2
114115

115116
#
116117
# Comma separated list of required build properties for zAppBuild/build.groovy
@@ -142,6 +143,7 @@ metadataStoreType=file
142143

143144
# The dbb.gateway.type property determines which gateway type is used for the entire build process
144145
# Possible values are 'legacy' and 'interactive'. Default if not indicated is 'legacy'
146+
# Please note that the ISPF client gateway is not used by language scripts provided by zAppBuild, but can be used in custom implementations.
145147
dbb.gateway.type=legacy
146148

147149
# Procedure Name - specified with the procname parameter

build-conf/datasets.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ SEQAMOD=
6969
# Optional IDz Load Library. Example: FEL.V14R0M0.SFELLOAD
7070
SFELLOAD=
7171

72-
# Optional IDZ zUnit / WAZI VTP library containing necessary copybooks. Example : FEL.V14R2.SBZUSAMP
73-
SBZUSAMP=
72+
# Optional IBM Debug Tool library containing necessary TAZ copybooks. Example : DEBUG.V16.SEQASAMP
73+
SEQASAMP=
7474

7575
# REXX Compiler Data Sets. Example: REXX.V1R4.SFANLMD
7676
SFANLMD=

0 commit comments

Comments
 (0)