Merge branch 'master' of ssh://git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools

Author: akurtakov

autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog

@@ -1,3 +1,10 @@
+2011-05-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves: #312298
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java (createProject): 
+	New override method to add logic post project creation that causes Scanner info to be written to the .cproject
+	file.
+
 2011-04-27  Jeff Johnston  <jjohnstn@redhat.com>
 
 	Resolves: #343905

autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java

@@ -1,9 +1,23 @@
 package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
 
+import java.util.Map;
+
+import org.eclipse.cdt.build.core.scannerconfig.CfgInfoContext;
+import org.eclipse.cdt.build.core.scannerconfig.ICfgScannerConfigBuilderInfo2Set;
+import org.eclipse.cdt.build.internal.core.scannerconfig2.CfgScannerConfigProfileManager;
+import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
+import org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2;
+import org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2Set;
+import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
+import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IInputType;
 import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
 import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.ui.wizards.MBSWizardHandler;
 import org.eclipse.core.resources.IProject;
@@ -23,6 +37,46 @@ public AutotoolsBuildWizardHandler(IProjectType pt, Composite parent, IWizard wi
 		super(pt, parent, wizard);
 	}
 
+	@SuppressWarnings("restriction")
+	@Override
+	public void createProject(IProject project, boolean defaults, boolean onFinish, IProgressMonitor monitor) throws CoreException {
+		super.createProject(project, defaults, onFinish, monitor);
+		// Fix for bug #312298
+		// Following is required to get around the fact that the Scanner Discovery BuildInfo isn't
+		// created at this point.  This is due to some complications caused by us superclassing the
+		// gnu gcc compiler or gnu g++ compiler as tools in our toolchain.  We are essentially
+		// copying the logic from the Discovery Tab of the C/C++ Properties when the Ok button
+		// gets pushed.  We reset the project description and this causes the Scanner Discovery
+		// BuildInfo to be written to the .cproject file.  Without this fix, a new project
+		// will require rebuilding upon startup of Eclipse each time to recreate the Scanner
+		// Discovery info and avoid warnings regarding header files and errors regarding missing
+		// macro definitions.  This code will likely go away when the Scanner Discovery mechanism
+		// gets rewritten in CDT (post 8.0).
+		ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
+		ICProjectDescription des = mngr.getProjectDescription(project);
+		ICConfigurationDescription cfgd = des.getActiveConfiguration();
+		IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgd);
+		ICfgScannerConfigBuilderInfo2Set cbi = CfgScannerConfigProfileManager.getCfgScannerConfigBuildInfo(cfg);
+		IScannerConfigBuilderInfo2Set baseCbi = ScannerConfigProfileManager.createScannerConfigBuildInfo2Set(project);
+		Map<InfoContext, IScannerConfigBuilderInfo2> baseInfoMap = baseCbi.getInfoMap();
+		Map<CfgInfoContext, IScannerConfigBuilderInfo2> infoMap = cbi.getInfoMap();
+		for (CfgInfoContext cfgInfoContext : infoMap.keySet()) {
+			@SuppressWarnings("unused")
+			String s = null;
+			IResourceInfo rcInfo = cfgInfoContext.getResourceInfo();
+			if (rcInfo == null) { // per configuration
+				s = cfgInfoContext.getConfiguration().getName();
+			} else { // per resource
+				IInputType typ = cfgInfoContext.getInputType();
+				s = typ.getName();
+			}
+			IScannerConfigBuilderInfo2 bi2 = infoMap.get(cfgInfoContext);
+			String profileId = bi2.getSelectedProfileId();
+			bi2.setSelectedProfileId(profileId);
+		}
+		CoreModel.getDefault().setProjectDescription(project, des);
+	}
+
 	@Override
 	public void convertProject(IProject proj, IProgressMonitor monitor) throws CoreException {
 	    super.convertProject(proj, monitor);

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>

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"