diff --git a/Documentation/meetings/20200316.md b/Documentation/meetings/20200316.md index 0db189c..fd1613d 100644 --- a/Documentation/meetings/20200316.md +++ b/Documentation/meetings/20200316.md @@ -23,4 +23,4 @@ Meeting notes: - Discussion about developing for Polycephaly project - Developing or adding to the Issue's log, with various tags, like #NewFeature, #Bug, etc - Added Meeting information to the README.md, along with information about how to contribute, get involved, etc. -- Clean up the various documentation +- Clean up the various documentation. diff --git a/Jenkinsfile b/Jenkinsfile index 4c20da5..9e85716 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,8 +18,9 @@ pipeline { srcGroovyPrgUtil = 'src/main/groovy/com/zos/program/utilities' javaHome = '/usr/lpp/java/J8.0_64/bin' - groovyHome = '/u/jerrye/bin' - groovyzHome = '/opt/lpp/IBM/dbb/bin' + groovyHome = '/opt/lpp/IBM/dbb/groovy-2.4.12/' + GROOVY_HOME = '/opt/lpp/IBM/dbb/groovy-2.4.12/' + groovyzHome = '/u/jerrye/bin' DBB_HOME = '/opt/lpp/IBM/dbb' DBB_CONF = "${WORKSPACE}/conf" @@ -29,6 +30,7 @@ pipeline { DBBhtmlJar = '/opt/lpp/IBM/dbb/lib/dbb.html_1.0.6.jar' ibmjzos = '/usr/lpp/java/J8.0_64/lib/ext/ibmjzos.jar' dbbJNI = '/opt/lpp/IBM/dbb/lib/libDBB_JNI64.so' + groovyJar = '/opt/lpp/IBM/dbb/groovy-2.4.12/lib/groovy-2.4.12.jar' polycephalyJar = "${WORKSPACE}/${env.libDir}/polycephaly.jar" javaClassPath = "${env.ibmjzos}:${env.DBBcoreJar}:${env.DBBhtmlJar}" @@ -37,7 +39,10 @@ pipeline { polyClassPath = "${env.polycephalyJar}:${env.ibmjzosJar}:${env.DBBLib}" polyBuildGroovy = "$WORKSPACE/build/build.groovy" polySrcPackage = "$WORKSPACE/conf/package.txt" - polyRuntime = "/u/jerrye" + polyRuntime = "/u/jerrye/polyRuntime" + + PolycephalyBuildDirectory = "$WORKSPACE/conf/" + PolycephalyBuildFile = "package.txt" } @@ -89,7 +94,9 @@ pipeline { } stage('Build Groovy zOS Utilities') { steps { - sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath} -d ${env.classesDir} ${env.srcGrovoyZosUtil}/*.groovy" + sh "env" + sh "export_BPXK_AUTOCVT=ON" + sh "${env.groovyzHome}/groovyc -cp .:${env.groovyClassPath} -d ${env.classesDir} ${env.srcGrovoyZosUtil}/*.groovy" } } stage('Add Groovy ZOS Utilities to JAR') { @@ -99,7 +106,7 @@ pipeline { } stage('Build Groovy Language Utilities') { steps { - sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath} -d ${env.classesDir} ${env.srcGroovyZosLang}/*.groovy" + sh "${env.groovyzHome}/groovyc -cp .:${env.groovyClassPath} -d ${env.classesDir} ${env.srcGroovyZosLang}/*.groovy" } } stage('Add Groovy Language Utilities to JAR') { @@ -109,7 +116,7 @@ pipeline { } stage('Build Groovy Program Utilities') { steps { - sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath} -d ${env.classesDir} ${env.srcGroovyPrgUtil}/*.groovy" + sh "${env.groovyzHome}/groovyc -cp .:${env.groovyClassPath} -d ${env.classesDir} ${env.srcGroovyPrgUtil}/*.groovy" } } stage('Add Groovy Program Utilities to JAR') { @@ -125,17 +132,19 @@ pipeline { steps { sh "export DBB_HOME=${env.DBB_HOME}" sh "export DBB_CONF=${env.DBB_CONF}" - sh "${env.groovyzHome}/groovyz --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy} --collection ${env.CollectionName} --debug --sourceDir ${env.polySrcPackage}" + sh "export GROOVY_HOME=${env.GROOVY_HOME}" + sh "${env.groovyzHome}/groovy --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy} --collection ${env.CollectionName} --debug --sourceDir ${env.polySrcPackage}" } } stage("Test") { when { expression { !env.Debug.toBoolean()} - } + steps { sh "export DBB_HOME=${env.DBB_HOME}" sh "export DBB_CONF=${env.DBB_CONF}" - sh "${env.groovyzHome}/groovyz --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy} --collection ${env.CollectionName} --sourceDir ${env.polySrcPackage}" + sh "export GROOVY_HOME=${env.GROOVY_HOME}" + sh "${env.groovyzHome}/groovy --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy} --collection ${env.CollectionName} --sourceDir ${env.polySrcPackage}" } } stage("Deploy") { @@ -156,7 +165,8 @@ pipeline { sh 'printf "running DBB delete collection"' sh "export DBB_HOME=${env.DBB_HOME}" sh "export DBB_CONF=${env.DBB_CONF}" - sh "${env.groovyzHome}/groovyz --classpath .:${env.polyClassPath} ${env.polyBuildGroovy} --clean --collection ${env.CollectionName}" + sh "export GROOVY_HOME=${env.GROOVY_HOME}" + sh "${env.groovyzHome}/groovy --classpath .:${env.polyClassPath} ${env.polyBuildGroovy} --clean --collection ${env.CollectionName}" } } } diff --git a/src/main/groovy/com/zos/groovy/utilities/Tools.groovy b/src/main/groovy/com/zos/groovy/utilities/Tools.groovy index 96738ba..785da93 100644 --- a/src/main/groovy/com/zos/groovy/utilities/Tools.groovy +++ b/src/main/groovy/com/zos/groovy/utilities/Tools.groovy @@ -142,15 +142,15 @@ class Tools { * get the Polcephaly Build Directory and File location * Load Polycephaly properties */ - def properties.PolycephalyBuildDirectory = System.getenv("PolycephalyBuildDirectory") + properties.PolycephalyBuildDirectory = System.getenv("PolycephalyBuildDirectory") if (properties.PolycephalyBuildDirectory == null) - new exception('Polycephaly Build Directory missing') + println('Polycephaly Build Directory missing') - def properties.PolycephalyBuildFile = System.getenv("PolycephalyBuildFile") + properties.PolycephalyBuildFile = System.getenv("PolycephalyBuildFile") if (properties.PolycephalyBuildFile == null) - new exception('Polycephaly Build File missing') + println('Polycephaly Build File missing') - def buildPolycephalyPropFile = new File("properties.PolycephalyBuildDirectory/properties.PolycephalyBuildFile") + buildPolycephalyPropFile = new File("properties.PolycephalyBuildDirectory/properties.PolycephalyBuildFile") if (properties.debug) println("buildPolycephalyPropFile = $buildPolycephalyPropFile") if (buildPolycephalyPropFile.exists()) { properties.load(new File("${buildPolycephalyPropFile}")) @@ -164,15 +164,15 @@ class Tools { * get the Project Build Directory and File location * Load Project properties */ - def properties.ProjectBuildDirectory = System.getenv("ProjectBuildDirectory") + properties.ProjectBuildDirectory = System.getenv("ProjectBuildDirectory") if (properties.ProjectBuildDirectory == null) - new exception('Project Build Directory missing') + println('Project Build Directory missing') - def properties.ProjectBuildFile = System.getenv("ProjectBuildFile") + properties.ProjectBuildFile = System.getenv("ProjectBuildFile") if (properties.ProjectBuildFile == null) - new exception('Project Build File missing') + println('Project Build File missing') - def buildProjectPropFile = new File("properties.ProjectBuildDirectory/properties.ProjectBuildFile") + buildProjectPropFile = new File("properties.ProjectBuildDirectory/properties.ProjectBuildFile") if (properties.debug) println("buildProjectPropFile = $buildProjectPropFile") if (buildProjectPropFile.exists()) { properties.load(new File("${buildProjectPropFile}"))