Support archived p2-repositories in API Analysis ANT task

Author: HannesWell

apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/CommonUtilsTask.java

@@ -97,7 +97,9 @@ protected IApiBaseline createBaseline(String baselineName, String installLocatio
 	 */
 	protected void deleteBaseline(String referenceLocation, File folder) {
 		if (Util.isArchive(referenceLocation)) {
-			Util.delete(folder.getParentFile());
+			boolean isEclipseInstallation = ECLIPSE_FOLDER_NAME.equals(folder.getName())
+					&& folder.getParentFile().list().length == 1;
+			Util.delete(isEclipseInstallation ? folder.getParentFile() : folder);
 		}
 	}
 
@@ -138,7 +140,8 @@ protected File extractSDK(String installDirName, String location) {
 			} catch (CoreException e) {
 				throw new BuildException(e.getMessage());
 			}
-			return new File(installDir, ECLIPSE_FOLDER_NAME);
+			File eclipseFolder = new File(installDir, ECLIPSE_FOLDER_NAME);
+			return eclipseFolder.exists() ? eclipseFolder : installDir;
 		} else {
 			return locationFile;
 		}