FIXED JENKINS-32657: (Reopened) Existing build steps will loose their

cmake-argument and working directory settings.
jenkinsci · Feb 24, 2016 · 7d54888 · 7d54888
1 parent fa5b10a
commit 7d54888
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/cmake/AbstractCmakeBuilder.java b/src/main/java/hudson/plugins/cmake/AbstractCmakeBuilder.java
@@ -40,19 +40,19 @@ public String getInstallationName() {
         return this.installationName;
     }
 
-    public void setWorkingDir(String workingDir) {
+    protected void setWorkingDir(String workingDir) {
         this.workingDir = Util.fixEmptyAndTrim(workingDir);
     }
 
-    public String getWorkingDir() {
+    protected String getWorkingDir() {
         return this.workingDir;
     }
 
-    public void setArguments(String toolArgs) {
+    protected void setArguments(String toolArgs) {
         this.toolArgs = Util.fixEmptyAndTrim(toolArgs);
     }
 
-    public String getArguments() {
+    protected String getArguments() {
         return this.toolArgs;
     }
 

diff --git a/src/main/java/hudson/plugins/cmake/CmakeBuilder.java b/src/main/java/hudson/plugins/cmake/CmakeBuilder.java
@@ -45,6 +45,12 @@ public class CmakeBuilder extends AbstractCmakeBuilder {
     private String preloadScript;
     private boolean cleanBuild;
 
+    // for backward compatibility with < 2.4.9
+    // see
+    // https://wiki.jenkins-ci.org/display/JENKINS/Hint+on+retaining+backward+compatibility
+    private transient String buildDir;
+    private transient String cmakeArgs;
+
     private List<BuildToolStep> toolSteps = new ArrayList<BuildToolStep>(0);
 
     /**
@@ -63,6 +69,18 @@ public CmakeBuilder(String installationName, String generator) {
         this.generator = Util.fixNull(generator);
     }
 
+    // for backward compatibility with < 2.4.
+    protected Object readResolve() {
+        // convert to new format
+        if (buildDir != null) {
+            super.setWorkingDir(buildDir);
+        }
+        if (cmakeArgs != null) {
+            super.setArguments(cmakeArgs);
+        }
+        return this;
+    }
+
     public String getGenerator() {
         return this.generator;
     }