Merge branch 'refs/heads/master' of ssh://jjohnston@git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools.git

Author: jjohnstn

libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/ChangeLog

@@ -1,3 +1,7 @@
+2011-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Fix name of feature description.
+
 2011-05-18  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* pom.xml: Fix id.

libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/feature.properties

@@ -9,7 +9,7 @@
 #      Red Hat Incorporated - initial API and implementation
 #################################################################################
 featureName=Library Hover help for devhelp documentation (Incubation)
-description=Plugins for creating hover help from installed C devhelp documentation.
+featureDescription=Plugins for creating hover help from installed C devhelp documentation.
 provider=Eclipse Linux Tools
 copyright=Copyright 2011 Red Hat, Inc.
 licenseURL=license.html

pom.xml

@@ -53,7 +53,7 @@
   <pluginRepositories>
     <pluginRepository>
       <id>maven.eclipse.org</id>
-      <url>http://maven.eclipse.org/nexus/content/repositories/nightly-indigo</url>
+      <url>http://maven.eclipse.org/nexus/content/repositories/milestone-indigo</url>
     </pluginRepository>
   </pluginRepositories>
 

releng/org.eclipse.linuxtools.releng-site/pom.xml

@@ -50,7 +50,7 @@
          <plugin>
            <groupId>org.eclipse.dash.maven</groupId>
            <artifactId>eclipse-maven-signing-plugin</artifactId>
-           <version>1.0.0.0-SNAPSHOT</version>
+           <version>1.0.0</version>
            <executions>
              <execution>
                <id>pack</id>
@@ -76,7 +76,7 @@
              <execution>
                <id>repack</id>
                <configuration>
-                 <inputFile>${project.build.directory}/org.eclipse.linuxtools.releng-site.zip</inputFile>
+                 <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
                </configuration>
                <phase>package</phase>
                <goals>
@@ -85,9 +85,6 @@
              </execution>
              <execution>
                <id>fixCheckSums</id>
-               <configuration>
-                 <inputFile>${project.build.directory}/org.eclipse.linuxtools.releng-site.zip</inputFile>
-               </configuration>
                <phase>package</phase>
                <goals>
                  <goal>fixCheckSums</goal>

rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java

@@ -134,7 +134,8 @@ public void testBuildPrepHelloWorld() throws Exception {
 		}
 		File foo = new File(FileLocator.toFileURL(url).getPath());
 		rpmProject.importSourceRPM(foo);
-		rpmProject.buildPrep();
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		rpmProject.buildPrep(bos);
 
 		// Make sure we got everything in the build directory
 		IFolder builddir = rpmProject.getConfiguration().getBuildFolder();

rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProject.java

@@ -13,8 +13,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 
 import org.eclipse.core.resources.IFile;
@@ -149,15 +147,9 @@ public void buildSourceRPM(OutputStream out) throws CoreException {
 				IResource.DEPTH_INFINITE, null);
 	}
 
-	public void buildPrep() throws CoreException {
+	public void buildPrep(OutputStream out) throws CoreException {
 		RPMBuild rpmbuild = new RPMBuild(getConfiguration());
-		InputStream in = rpmbuild.buildPrep(getSpecFile());
-		try {
-			in.close();
-		} catch (IOException e) {
-			// TODO Do we really need the input stream here?
-			e.printStackTrace();
-		}
+		rpmbuild.buildPrep(getSpecFile(), out);
 		getConfiguration().getBuildFolder().refreshLocal(
 				IResource.DEPTH_INFINITE, null);
 	}

rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java

@@ -11,7 +11,6 @@
 package org.eclipse.linuxtools.rpm.core.utils;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -69,18 +68,24 @@ public RPMBuild(RPMConfiguration config) {
 	 * 
 	 * @param specFile
 	 *            the spec file
-	 * @return The output of the `rpmbuild -bp` command.
 	 * @throws CoreException
 	 *             if the operation fails
 	 */
-	public InputStream buildPrep(IFile specFile) throws CoreException {
+	/**
+	 * Prepares the sources for a given spec file.
+	 * 
+	 * @param specFile the spec file
+	 * @param outStream The stream to write the output to.
+	 * @throws CoreException If the operation fails.
+	 */
+	public void buildPrep(IFile specFile, OutputStream outStream) throws CoreException {
 		List<String> command = new ArrayList<String>();
 		command.addAll(Arrays.asList(macroDefines));
 		command.add("-bp"); //$NON-NLS-1$
 		command.add(specFile.getLocation().toString());
 		try {
-			return Utils.runCommandToInputStream(command
-					.toArray(new String[command.size()]));
+			Utils.runCommand(outStream,
+					command.toArray(new String[command.size()]));
 		} catch (IOException e) {
 			throw new CoreException(new Status(IStatus.ERROR, RPMCorePlugin.ID,
 					e.getMessage(), e));

valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml

@@ -61,6 +61,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.linuxtools.valgrind.helgrind"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.linuxtools.valgrind.launch"
          download-size="0"