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

Author: akurtakov

autotools/org.eclipse.linuxtools.cdt.autotools-feature/feature.xml

@@ -59,7 +59,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.linuxtools.cdt.autotools_docs"
+         id="org.eclipse.linuxtools.cdt.autotools.docs"
          download-size="0"
          install-size="0"
          version="0.0.0"/>

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

@@ -1,3 +1,9 @@
+2011-05-26  Jeff Johnston  <[email protected]>
+
+	Resolves #343879
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (runScript): 
+	For Windows/Mac targets, do not pass PWD environment variable forward.
+
 2011-05-19  Jeff Johnston  <[email protected]>
 
 	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/ErrorParserManager.java (outputLine): Fix

autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java

@@ -942,6 +942,7 @@ private int runScript(IPath commandPath, IPath runPath, String[] args,
 			NullPointerException, IOException {
 
 		int rc = IStatus.OK;
+		boolean removePWD = false;
 
 		removeAllMarkers(project);
 
@@ -960,6 +961,7 @@ private int runScript(IPath commandPath, IPath runPath, String[] args,
         // Fix for bug #343731
         if (Platform.getOS().equals(Platform.OS_WIN32)
                 || Platform.getOS().equals(Platform.OS_MACOSX)) {
+        	removePWD = true;
             // Neither Mac or Windows support calling scripts directly.
             String command = null;
             for (String arg : configTargets) {
@@ -1023,8 +1025,12 @@ private int runScript(IPath commandPath, IPath runPath, String[] args,
 		ArrayList<String> envList = new ArrayList<String>();
 		if (variables != null) {
 			for (int i = 0; i < variables.length; i++) {
-				envList.add(variables[i].getName()
-						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+				// For Windows/Mac, check for PWD environment variable being passed.
+				// Remove it for now as it is causing errors in configuration.
+				// Fix for bug #343879
+				if (!removePWD || !variables[i].getName().equals("PWD")) // $NON-NLS-1$
+					envList.add(variables[i].getName()
+							+ "=" + variables[i].getValue()); //$NON-NLS-1$
 			}
 			if (additionalEnvs != null)
 				envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script

autotools/org.eclipse.linuxtools.cdt.autotools-docs/.classpath autotools/org.eclipse.linuxtools.cdt.autotools.docs/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.cdt.autotools-docs</name>
+	<name>org.eclipse.linuxtools.cdt.autotools.docs</name>
 	<comment></comment>
 	<projects>
 	</projects>

autotools/org.eclipse.linuxtools.cdt.autotools-docs/.gitignore autotools/org.eclipse.linuxtools.cdt.autotools.docs/.gitignore

@@ -1,3 +1,9 @@
+2011-06-01  Jeff Johnston  <[email protected]>
+
+	Resolves: #347979
+	* build.properties: Add images directory.
+	* images/*.gif: New files.
+
 2011-03-22  Jeff Johnston  <[email protected]>
 
 	* build.properties: Add tools.xml to bin list.

autotools/org.eclipse.linuxtools.cdt.autotools-docs/.project autotools/org.eclipse.linuxtools.cdt.autotools.docs/.project

@@ -25,7 +25,6 @@
 				<td style="width: 20%" align="right" valign="top">Supported Environments</td>
 			</tr>
 		</table><hr/>
-		<p>{{#eclipseproject:technology.linux-distros}}</p>
 		<h1 id="Introduction">Introduction</h1>
 		<p>The Autotools plug-in for Eclipse extends the CDT (C/C++ Development Tools) to add support for maintaining and
 			building C/C++ projects that use GNU Autotools.</p>

autotools/org.eclipse.linuxtools.cdt.autotools-docs/ChangeLog autotools/org.eclipse.linuxtools.cdt.autotools.docs/ChangeLog

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools_docs;singleton:=true
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.docs;singleton:=true
 Bundle-Version: 2.0.2.qualifier
 Bundle-Vendor: %provider
 Bundle-Localization: plugin

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/Building.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/Building.html

@@ -6,6 +6,7 @@ bin.includes = META-INF/,\
                plugin.properties,\
                doc/,\
                Linux_Tools_Project/,\
-               tools.xml
+               tools.xml,\
+               images/
 jars.compile.order = .
 

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/Configuration.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/Configuration.html

@@ -22,7 +22,7 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.eclipse.linuxtools.cdt.autotools_docs</artifactId>
+  <artifactId>org.eclipse.linuxtools.cdt.autotools.docs</artifactId>
   <version>2.0.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/Creating-an-Autotools-Project.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/Creating-an-Autotools-Project.html

@@ -63,7 +63,7 @@
   <modules>
     <module>org.eclipse.linuxtools.cdt.autotools.core</module>
     <module>org.eclipse.linuxtools.cdt.autotools.ui</module>
-    <module>org.eclipse.linuxtools.cdt.autotools-docs</module>
+    <module>org.eclipse.linuxtools.cdt.autotools.docs</module>
     <module>org.eclipse.linuxtools.cdt.autotools-feature</module>
 
     <module>org.eclipse.linuxtools.cdt.autotools.tests</module>

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/Invoking-Autotools.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/Invoking-Autotools.html

@@ -1,3 +1,8 @@
+2011-05-31  Jeff Johnston  <[email protected]>
+
+	* plugin.xml: Add back key bindings for CTRL+ALT+P in text editor and
+	compare editor which reverts previous change.
+
 2011-04-01  Jeff Johnston  <[email protected]>
 
  	Bug #341534

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/Make-Targets.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/Make-Targets.html

@@ -193,6 +193,16 @@
              contextId="org.eclipse.ui.contexts.window"
              schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
              sequence="Ctrl+Alt+P"/>
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+             contextId="org.eclipse.ui.textEditorScope"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="Ctrl+Alt+P" />
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+             contextId="org.eclipse.compare.compareEditorScope"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="Ctrl+Alt+P"/>
        <key
              commandId="org.eclipse.linuxtools.changelog.core.prepareCommit"
              contextId="org.eclipse.ui.textEditorScope"

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/Special-Editors.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/Special-Editors.html

@@ -25,7 +25,6 @@
 				<td style="width: 20%" align="right" valign="top">ChangeLog Preferences</td>
 			</tr>
 		</table><hr/>
-		<p>{{#eclipseproject:technology.linux-distros}}</p>
 		<h1 id="Overview">Overview</h1>
 		<p>The ChangeLog plug-in for Eclipse is a basic set of extensions to enable ChangeLog functionality for projects in Eclipse.</p>
 		<p>Before using the plug-in, you should set the ChangeLog preferences. These preferences include the name and e-mail address you wish to use in a ChangeLog entry. </p>

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/Supported-Environments.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/Supported-Environments.html

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.gcov"
       label="%featureName"
-      version="0.4.1.qualifier"
+      version="0.5.0.qualifier"
       provider-name="%featureProvider">
 
    <description>
@@ -28,6 +28,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.linuxtools.gcov.docs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.linuxtools.binutils"
          download-size="0"

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/Updating-This-Document.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/Updating-This-Document.html

@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gcov-feature</artifactId>
-  <version>0.4.1-SNAPSHOT</version>
+  <version>0.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools GCov Feature</name>

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/User-Guide.html autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/User-Guide.html

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.cdt.libhover.library-docs</name>
+	<name>org.eclipse.linuxtools.gcov.docs</name>
 	<comment></comment>
 	<projects>
 	</projects>

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/images/Linuxtool-AutotoolsMakeTargetsMenu.png autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/images/Linuxtool-AutotoolsMakeTargetsMenu.png

@@ -0,0 +1,38 @@
+2011-06-03  Jeff Johnston  <[email protected]>
+
+	Regenerate from updated wiki-page.
+	* Linux_Tools_Project/GCov/User_Guide/Installation-and-Set-Up.html: Regenerated.
+	* Linux_Tools_Project/GCov/User_Guide/Troubleshooting.html: Ditto.
+
+2011-06-02  Jeff Johnston  <[email protected]>
+
+	Regenerate from updated wiki-page.
+	* Linux_Tools_Project/GCov/User_Guide/images/gcov-binary-file.png: Removed.
+	* Linux_Tools_Project/GCov/User_Guide/images/Gcov-binary-file.png: Added.
+	* Linux_Tools_Project/GCov/User_Guide/images/gcov-sort-per-folder.png: Removed.
+	* Linux_Tools_Project/GCov/User_Guide/images/Gcov-sort-per-folder.png: Added.
+	* Linux_Tools_Project/GCov/User_Guide/images/gcovAnnotatedSource.png: Removed.
+	* Linux_Tools_Project/GCov/User_Guide/images/GcovAnnotatedSource.png: Added.
+	* Linux_Tools_Project/GCov/User_Guide/images/gcovView.png: Removed.
+	* Linux_Tools_Project/GCov/User_Guide/images/GcovView.png: Added.
+	* Linux_Tools_Project/GCov/User_Guide/Gcov-main-view.html: Regenerated.
+	* Linux_Tools_Project/GCov/User_Guide/Opening-gcov-result.html: Ditto.
+
+2011-05-31  Jeff Johnston  <[email protected]>
+
+	* META-INF/MANIFEST.MF: Add bundle localization plugin. 
+
+2011-05-31  Jeff Johnston  <[email protected]>
+
+	* plugin.xml: New file.
+	* toc.xml: Ditto.
+	* META-INF/MANIFEST.MF: Ditto.
+	* images/*.gif: Ditto.
+	* Linux_Tools_Project/*: Ditto.
+	* about.html: Ditto.
+	* build-helper.xml: Ditto.
+	* build.properties: Ditto.
+	* extract-markup.xsl: Ditto.
+	* pom.xml: Ditto.
+	* toc.xml: Ditto.
+	* plugin.properties: Ditto.

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/images/Linuxtools-AutotoolsAclocal.png autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/images/Linuxtools-AutotoolsAclocal.png

@@ -0,0 +1,88 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>GCov Plug-in User Guide - Gcov main view</title>
+		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Gcov main view</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Opening-gcov-result.html" title="Opening gcov result">
+						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Troubleshooting.html" title="Troubleshooting">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Opening gcov result</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Troubleshooting</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Gcov_main_view">Gcov main view</h1>
+		<p>The Gcov view displays an overview of coverage information for the whole project.</p>
+		<p>
+			<img border="0" src="images/GcovView.png"/>
+		</p>
+		<p>
+			<br/> Several buttons are available in the toolbar. 
+		</p>
+		<ul>
+			<li>
+				<img border="0" src="images/Gprof-export-to-csv.gif"/> : "Export to CSV" button allows you to export the gcov result as a CSV text file, suitable for any spreadsheet.
+			</li>
+			<li>
+				<img border="0" src="images/Gcov-sort-per-folder.gif"/> : "Sort coverage per folder" button displays gcov result sorted by folder.
+			</li>
+			<li>
+				<img border="0" src="images/Gprof-sort-per-file.gif"/> : "Sort coverage per file" button displays gcov result sorted by file.
+			</li>
+			<li>
+				<img border="0" src="images/Gprof-sort-per-function.gif"/> : "Sort coverage per function" button displays gcov result sorted by function.
+			</li>
+		</ul>
+		<ul>
+			<li>
+				<img border="0" src="images/Gprof-birt-chart.gif"/> : "Create Chart..." button allows you to create a BIRT chart, with the current lines selected in the gcov result view.
+			</li>
+		</ul>
+		<p>Double-clicking on a item in the result view will open the corresponding source location, annotated with coverage informations.</p>
+		<p>
+			<img border="0" src="images/GcovAnnotatedSource.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Opening-gcov-result.html" title="Opening gcov result">
+						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="User-Guide.html" title="GCov Plug-in User Guide">
+						<img alt="GCov Plug-in User Guide" border="0" src="../../../images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Troubleshooting.html" title="Troubleshooting">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Opening gcov result</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Troubleshooting</td>
+			</tr>
+		</table>
+	</body>
+</html>

autotools/org.eclipse.linuxtools.cdt.autotools-docs/Linux_Tools_Project/Autotools/User_Guide/images/Linuxtools-AutotoolsAutoconfEditor.png autotools/org.eclipse.linuxtools.cdt.autotools.docs/Linux_Tools_Project/Autotools/User_Guide/images/Linuxtools-AutotoolsAutoconfEditor.png

@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>GCov Plug-in User Guide - Installation and Set-Up</title>
+		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Installation and Set-Up</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="User-Guide.html" title="GCov Plug-in User Guide">
+						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Opening-gcov-result.html" title="Opening gcov result">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">GCov Plug-in User Guide</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Opening gcov result</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Installation_and_Set-Up">Installation and Set-Up</h1>
+		<p>Gprof plugin depends on binutils (such as addr2line, c++filt and nm). Gprof can be used on any platform as soon as these binutils are in PATH. For example, you can use it on Windows with Cygwin.</p>
+		<p>First of all, the user has to compile the C/C++ program with profiling enabled using "-ftest-coverage -fprofile-arcs" options prior to running the tool.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="User-Guide.html" title="GCov Plug-in User Guide">
+						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="User-Guide.html" title="GCov Plug-in User Guide">
+						<img alt="GCov Plug-in User Guide" border="0" src="../../../images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Opening-gcov-result.html" title="Opening gcov result">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">GCov Plug-in User Guide</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Opening gcov result</td>
+			</tr>
+		</table>
+	</body>
+</html>