Updates to the CRB.groovy script (#407)

* Updated CRB.groovy to adapt the generated USS_RECORD Signed-off-by: Mathieu <[email protected]>
IBM · Aug 29, 2023 · 569858f · 569858f
1 parent 1996c04
commit 569858f
Showing 1 changed file with 88 additions and 83 deletions.
diff --git a/languages/CRB.groovy b/languages/CRB.groovy
@@ -1,4 +1,3 @@
-
 @groovy.transform.BaseScript com.ibm.dbb.groovy.ScriptLoader baseScript
 import com.ibm.dbb.dependency.*
 import com.ibm.dbb.build.*
@@ -30,89 +29,95 @@ int currentBuildFileNumber = 1
 
 // iterate through build list
 buildList.each { buildFile ->
-	println "*** (${currentBuildFileNumber++}/${buildList.size()}) Building file $buildFile"
-
-	// Get the path to the zrb executable
-	String zrbPath = props.getFileProperty('crb_zrbLocation', buildFile)
-	// Set the model and appl constraint paths
-	String resourceModelFile = props.getFileProperty('crb_resourceModelFile', buildFile)
-	String applicationConstraintsFile = props.getFileProperty('crb_applicationConstraintsFile', buildFile)
-	// If maxRc is null or blank, set a default maxRC of 4
-	int maxRC = (props.getFileProperty('crb_maxRC', buildFile) ?: "4").toInteger()
-
-	// validate that zrb and model file exist at the provided location
-	if (fileExists(zrbPath) && fileExists(resourceModelFile)) {
-
-		// log file
-		String member = CopyToPDS.createMemberName(buildFile)
-		File logFile = new File("${props.buildOutDir}/${member}.zrb.log")
-		if (logFile.exists())
-			logFile.delete()
-
-		// Generate the file name for the CSD formatted file
-		def extIndex = buildFile.lastIndexOf('.')
-		def slashIndex = buildFile.lastIndexOf('/')
-		if (slashIndex < 0) slashIndex = 0
-		def outputFile = buildFile.substring(slashIndex + 1, extIndex) + ".csd"
-
-		// Build the shell command to execute
-		def applicationParm = ""
-		if (applicationConstraintsFile) {
-			fileExists(applicationConstraintsFile)
-			applicationParm = "--application $applicationConstraintsFile"
-		}
-		def commandString = zrbPath + " build --model $resourceModelFile $applicationParm --resources ${props.workspace}/${buildFile} --output ${props.buildOutDir}/$outputFile"
-		if (props.verbose)
-			println("*** Executing zrb command: $commandString")
-
-		// Execute the command and direct console output and error streams to buffer
-		def process = commandString.execute()
-		StringBuffer zrbOut = new StringBuffer()
-		StringBuffer zrbErr = new StringBuffer()
-		process.waitForProcessOutput(zrbOut, zrbErr)
-		def returnCode = process.exitValue()
-
-		// write outputs to log file
-		String enc = props.logEncoding ?: 'IBM-1047'
-		logFile.withWriter(enc) { writer ->
-			writer.append(zrbOut)
-			writer.append(zrbErr)
-		}
-
-		// evaluate return code
-		if (returnCode > maxRC) {
-			String errorMsg = "*! Error executing zrb: $returnCode"
-			println(errorMsg)
-			props.error = "true"
-			buildUtils.updateBuildResult(errorMsg:errorMsg,logs:["${member}.zrb.log":logFile])
-		} else {
-			if (props.verbose) println("*** zrb return code: $returnCode")
-			println("*** Output file is ${props.buildOutDir}/$outputFile.")
-
-			// Create a new record of type AnyTypeRecord
-			AnyTypeRecord CRBRecord = new AnyTypeRecord("USS_RECORD")
-			CRBRecord.setAttribute("file", buildFile)
-			CRBRecord.setAttribute("label", "CICS Resource Builder YAML file")
-			CRBRecord.setAttribute("outputs", "[${props.buildOutDir}/$outputFile, CSD]")
-			CRBRecord.setAttribute("command", commandString);
-
-			// Add new record to build report
-			if (props.verbose)
-				println("*** Adding USS_RECORD for $buildFile")
-			BuildReportFactory.getBuildReport().addRecord(CRBRecord)
-		}
-	}
+    println "*** (${currentBuildFileNumber++}/${buildList.size()}) Building file $buildFile"
+
+    // Get the path to the zrb executable
+    String zrbPath = props.getFileProperty('crb_zrbLocation', buildFile)
+    // Set the model and appl constraint paths
+    String resourceModelFile = props.getFileProperty('crb_resourceModelFile', buildFile)
+    String applicationConstraintsFile = props.getFileProperty('crb_applicationConstraintsFile', buildFile)
+    // If maxRc is null or blank, set a default maxRC of 4
+    int maxRC = (props.getFileProperty('crb_maxRC', buildFile) ?: "4").toInteger()
+
+    // validate that zrb and model file exist at the provided location
+    if (fileExists(zrbPath) && fileExists(resourceModelFile)) {
+
+        // log file
+        String member = CopyToPDS.createMemberName(buildFile)
+        File logFile = new File("${props.buildOutDir}/${member}.zrb.log")
+        if (logFile.exists())
+            logFile.delete()
+
+        // Generate the file name for the CSD formatted file
+        def extIndex = buildFile.lastIndexOf('.')
+        def slashIndex = buildFile.lastIndexOf('/')
+        if (slashIndex < 0) slashIndex = 0
+
+        def outputFile = "CICSResourceBuilder/" + buildFile.substring(slashIndex + 1, extIndex) + ".csd"
+
+        File outputDir = new File(props.buildOutDir + '/CICSResourceBuilder');
+        if (!outputDir.exists())
+            outputDir.mkdirs()
+
+
+        // Build the shell command to execute
+        def applicationParm = ""
+        if (applicationConstraintsFile) {
+            fileExists(applicationConstraintsFile)
+            applicationParm = "--application $applicationConstraintsFile"
+        }
+        def commandString = zrbPath + " build --model $resourceModelFile $applicationParm --resources ${props.workspace}/${buildFile} --output ${props.buildOutDir}/$outputFile"
+        if (props.verbose)
+            println("*** Executing zrb command: $commandString")
+
+        // Execute the command and direct console output and error streams to buffer
+        def process = commandString.execute()
+        StringBuffer zrbOut = new StringBuffer()
+        StringBuffer zrbErr = new StringBuffer()
+        process.waitForProcessOutput(zrbOut, zrbErr)
+        def returnCode = process.exitValue()
+
+        // write outputs to log file
+        String enc = props.logEncoding ?: 'IBM-1047'
+        logFile.withWriter(enc) { writer ->
+            writer.append(zrbOut)
+            writer.append(zrbErr)
+        }
+
+        // evaluate return code
+        if (returnCode > maxRC) {
+            String errorMsg = "*! Error executing zrb: $returnCode"
+            println(errorMsg)
+            props.error = "true"
+            buildUtils.updateBuildResult(errorMsg:errorMsg,logs:["${member}.zrb.log":logFile])
+        } else {
+            if (props.verbose) println("*** zrb return code: $returnCode")
+            println("*** Output file is ${props.buildOutDir}/$outputFile.")
+
+            // Create a new record of type AnyTypeRecord
+            AnyTypeRecord CRBRecord = new AnyTypeRecord("USS_RECORD")
+            CRBRecord.setAttribute("file", buildFile)
+            CRBRecord.setAttribute("label", "CSD file created with CICS Resource Builder")
+            CRBRecord.setAttribute("outputs", "[${props.buildOutDir}, $outputFile, CSD]")
+            CRBRecord.setAttribute("command", commandString);
+
+            // Add new record to build report
+            if (props.verbose)
+                println("*** Adding USS_RECORD for $buildFile")
+            BuildReportFactory.getBuildReport().addRecord(CRBRecord)
+        }
+    }
 }
 
 def fileExists(String fileLoc){
-	File file = new File(fileLoc)
-	if (!file.exists()) {
-		String errorMsg = "*! CICS Resource Builder process - $fileLoc not found."
-		println(errorMsg)
-		props.error = "true"
-		buildUtils.updateBuildResult(errorMsg:errorMsg)
-		return false
-	} else {
-		return true
-	}
+    File file = new File(fileLoc)
+    if (!file.exists()) {
+        String errorMsg = "*! CICS Resource Builder process - $fileLoc not found."
+        println(errorMsg)
+        props.error = "true"
+        buildUtils.updateBuildResult(errorMsg:errorMsg)
+        return false
+    } else {
+        return true
+    }
 }