Remove obsolete "-activetarget" flag

rodrigc · rodrigc · commit b970f5280a9c · 2015-05-11T16:56:08.000-05:00
It is not longer supported by XCode.

[FIXED JENKINS-23008]
diff --git a/src/main/java/jenkins/plugins/clangscanbuild/ClangScanBuildDescriptor.java b/src/main/java/jenkins/plugins/clangscanbuild/ClangScanBuildDescriptor.java
@@ -64,11 +64,17 @@ public void setInstallations( ClangScanBuildToolInstallation[] clangInstallation
         save();
     }
 
+    public FormValidation doCheckTarget( @QueryParameter String value ) throws IOException, ServletException {
+    	if( value.length() == 0 ) return FormValidation.error( "You must provide a target." );
+        return FormValidation.ok();
+    }
+
+
     public FormValidation doCheckTargetSdk( @QueryParameter String value ) throws IOException, ServletException {
     	if( value.length() == 0 ) return FormValidation.error( "You must provide a target SDK.  You can execute 'xcodebuild -showsdks' from Terminal.app to see allowed values." );
         return FormValidation.ok();
     }
-	
+
     // CONFIG
     public FormValidation doCheckConfig( @QueryParameter String value ) throws IOException, ServletException {
         if( value.length() == 0 ) return FormValidation.warning( "If no build configuration is provided, the project's 'active' build configuration will be used automatically." );
diff --git a/src/main/java/jenkins/plugins/clangscanbuild/commands/ScanBuildCommand.java b/src/main/java/jenkins/plugins/clangscanbuild/commands/ScanBuildCommand.java
@@ -1,6 +1,7 @@
 package jenkins.plugins.clangscanbuild.commands;
 
 import hudson.FilePath;
+import hudson.model.Failure;
 import hudson.util.ArgumentListBuilder;
 import jenkins.plugins.clangscanbuild.CommandExecutor;
 
@@ -68,11 +69,10 @@ public int execute( BuildContext context ) throws Exception {
 			}
 		}else{
 			// Xcode standalone project
-			if( isNotBlank( getTarget() ) ){
-				args.add( "-target", getTarget() );
-			}else{
-				args.add( "-activetarget" );
+			if( isBlank( getTarget() ) ){
+				throw new Failure("No target specified");
 			}
+			args.add( "-target", getTarget() );
 		}
 
 		//These items can be provided with a target or can be used to override a workspace/scheme
diff --git a/src/test/java/jenkins/plugins/clangscanbuild/commands/ScanBuildCommandTest.java b/src/test/java/jenkins/plugins/clangscanbuild/commands/ScanBuildCommandTest.java
@@ -21,10 +21,11 @@ public void onlyRequiredOptionsSet() throws Exception{
 		command.setClangOutputFolder( new FilePath( new File( "OutputFolder" ) ) );
 		command.setClangScanBuildPath( "/ScanBuild" );
 		command.setProjectDirectory( new FilePath( new File( "/ProjectDir" ) ) );
+		command.setTarget( "myTarget" );
 
 		String actual = buildCommandAndReturn( command );
 		
-		String expected = "/ScanBuild -k -v -v -o OutputFolder xcodebuild -activetarget -configuration Debug clean analyze";
+		String expected = "/ScanBuild -k -v -v -o OutputFolder xcodebuild -target myTarget -configuration Debug clean analyze";
 		Assert.assertEquals( expected, actual );
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package jenkins.plugins.clangscanbuild.commands;`
`2`	`2`
`3`	`3`	`import hudson.FilePath;`
	`4`	`+import hudson.model.Failure;`
`4`	`5`	`import hudson.util.ArgumentListBuilder;`
`5`	`6`	`import jenkins.plugins.clangscanbuild.CommandExecutor;`
`6`	`7`
`@@ -68,11 +69,10 @@ public int execute( BuildContext context ) throws Exception {`
`68`	`69`	`}`
`69`	`70`	`}else{`
`70`	`71`	`// Xcode standalone project`
`71`		`- if( isNotBlank( getTarget() ) ){`
`72`		`- args.add( "-target", getTarget() );`
`73`		`- }else{`
`74`		`- args.add( "-activetarget" );`
	`72`	`+ if( isBlank( getTarget() ) ){`
	`73`	`+ throw new Failure("No target specified");`
`75`	`74`	`}`
	`75`	`+ args.add( "-target", getTarget() );`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`//These items can be provided with a target or can be used to override a workspace/scheme`