From fb9d8bcf17857a01d9f4846efeaa9cbc61c97d5b Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Tue, 28 Nov 2017 10:30:47 -0500
Subject: Rename class

---
 src/BuildConfig.groovy | 38 ++++++++++++++++++++++++++++++++++++++
 src/bconfig.groovy     | 38 --------------------------------------
 vars/utils.groovy      |  5 +----
 3 files changed, 39 insertions(+), 42 deletions(-)
 create mode 100644 src/BuildConfig.groovy
 delete mode 100644 src/bconfig.groovy

diff --git a/src/BuildConfig.groovy b/src/BuildConfig.groovy
new file mode 100644
index 0000000..20e75d5
--- /dev/null
+++ b/src/BuildConfig.groovy
@@ -0,0 +1,38 @@
+// src/BuildConfig.groovy
+package BuildConfig; 
+
+class BuildConfig implements Serializable {
+    def nodetype = ""
+    def build_mode = ""
+    def build_args = []
+    def env_vars = []
+    def configure_cmds = []
+    def build_cmds = []
+    def run_tests = true
+    //Boolean boolValue
+
+    // Constructors
+    BuildConfig() {
+        nodetype = ""
+    }
+    BuildConfig(nodetype) {
+        this.nodetype = nodetype
+    }
+    // createNewInstance method requires Jenkins script approval for the
+    // following signatures:
+    // method groovy.lang.MetaBeanProperty getSetter
+    // method groovy.lang.MetaObjectProtocol getProperties
+    // method groovy.lang.MetaProperty getProperty java.lang.Object
+    // method groovy.lang.MetaProperty setProperty java.lang.Object java.lang.Object
+    def BuildConfig copy(){
+        BuildConfig.metaClass.getProperties().findAll(){it.getSetter()!=null}.inject(new BuildConfig()){buildconfig,metaProp->
+            metaProp.setProperty(buildconfig,metaProp.getProperty(this))
+            buildconfig
+        }
+    }
+}
+
+//class bconfig implements Serializable {
+//    def name = "My name"
+//}
+
diff --git a/src/bconfig.groovy b/src/bconfig.groovy
deleted file mode 100644
index 3d070f6..0000000
--- a/src/bconfig.groovy
+++ /dev/null
@@ -1,38 +0,0 @@
-// src/bconfig.groovy
-package bconfig; 
-
-class BuildConfig implements Serializable {
-    def nodetype = ""
-    def build_mode = ""
-    def build_args = []
-    def env_vars = []
-    def configure_cmds = []
-    def build_cmds = []
-    def run_tests = true
-    //Boolean boolValue
-
-    // Constructors
-    BuildConfig() {
-        nodetype = ""
-    }
-    BuildConfig(nodetype) {
-        this.nodetype = nodetype
-    }
-    // createNewInstance method requires Jenkins script approval for the
-    // following signatures:
-    // method groovy.lang.MetaBeanProperty getSetter
-    // method groovy.lang.MetaObjectProtocol getProperties
-    // method groovy.lang.MetaProperty getProperty java.lang.Object
-    // method groovy.lang.MetaProperty setProperty java.lang.Object java.lang.Object
-    def BuildConfig copy(){
-        BuildConfig.metaClass.getProperties().findAll(){it.getSetter()!=null}.inject(new BuildConfig()){buildconfig,metaProp->
-            metaProp.setProperty(buildconfig,metaProp.getProperty(this))
-            buildconfig
-        }
-    }
-}
-
-class bconfig implements Serializable {
-    def name = "My name"
-}
-
diff --git a/vars/utils.groovy b/vars/utils.groovy
index e0b8d4b..4c3771d 100644
--- a/vars/utils.groovy
+++ b/vars/utils.groovy
@@ -1,5 +1,5 @@
 // Jenkinsfile utilities
-import bconfig.bconfig
+import BuildConfig.BuildConfig
 
 // Clone the source repository and examine the most recent commit message.
 // If a '[ci skip]' or '[skip ci]' directive is present, immediately
@@ -37,8 +37,6 @@ class TClass implements Serializable {
 def concurrent2(configs) {
     def tasks = [:]
     println("Size of configs = ${configs.size()}")
-    def myconf = new bconfig()
-    println("myconf.name = ${myconf.name}")
     for (config in configs) {
         t = new TClass()
         println("concurrent2: build.nodetype = ${config.nodetype}")
@@ -46,7 +44,6 @@ def concurrent2(configs) {
         println("concurrent2: build.build_args= ${config.build_args}")
         println("concurrent2: build.env_vars= ${config.env_vars}")
         def run_tests = config.run_tests
-        def tmp_config = new bconfig()
         tasks["${config.nodetype}/${config.build_mode}"] = {
             node(config.nodetype) {
                 //withEnv(config.env_vars) {
-- 
cgit