Allow to backslash spaces in Custom xcodebuild arguments. Derived fro…

…m pull jenkinsci#7 from tkirby:escape_custom_build_args
jwb · Nov 27, 2012 · 4a12a66 · 4a12a66
1 parent ba8b687
commit 4a12a66
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/au/com/rayh/XCodeBuilder.java b/src/main/java/au/com/rayh/XCodeBuilder.java
@@ -534,7 +534,12 @@ else if (StringUtils.isEmpty(cfBundleVersion))
     }
 
     static List<String> splitXcodeBuildArguments(String xcodebuildArguments) {
-        return Arrays.asList(xcodebuildArguments.split("[ ]"));
+        String[] parts = xcodebuildArguments.split("(?<!\\\\)\\s+");
+        List<String> result = new ArrayList<String>(parts.length);
+        for(String arg : parts) {
+            result.add(arg.replaceAll("\\\\ ", " "));
+        }
+        return result;
     }
 
     @Override

diff --git a/src/test/java/au/com/rayh/XCodeBuilderTest.java b/src/test/java/au/com/rayh/XCodeBuilderTest.java
@@ -52,4 +52,12 @@ public void shouldSplitXcodeBuildArgumentsWithoutEscapedSpaces() throws Exceptio
         assertEquals(asList("GCC_SYMBOLS_PRIVATE_EXTERN=NO", "COPY_PHASE_STRIP=NO"),
             XCodeBuilder.splitXcodeBuildArguments("GCC_SYMBOLS_PRIVATE_EXTERN=NO COPY_PHASE_STRIP=NO"));
     }
+
+    @Test
+    public void shouldSplitXcodeBuildArgumentsWithEscapedSpaces() throws Exception {
+        assertEquals(asList("CODE_SIGN_IDENTITY=iPhone Developer: Todd Kirby"),
+            XCodeBuilder.splitXcodeBuildArguments("CODE_SIGN_IDENTITY=iPhone\\ Developer:\\ Todd\\ Kirby"));
+        assertEquals(asList("A=B", "CODE_SIGN_IDENTITY=iPhone Developer: Todd Kirby"),
+            XCodeBuilder.splitXcodeBuildArguments("A=B CODE_SIGN_IDENTITY=iPhone\\ Developer:\\ Todd\\ Kirby"));
+    }
 }