Update to latest versions of Eclipse and CDT.
Change-Id: I445f42e64fd2b86b09c2c7977d6464335bb3cda7
Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/pom.xml b/pom.xml
index 929fb48..d3fbca1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,10 +17,16 @@
<properties>
<ptp-version>nightly</ptp-version>
<remote-version>nightly</remote-version>
- <tycho-version>1.4.0</tycho-version>
+ <!-- Maven 3.6.1 and 3.6.2 do not work with Tycho, see Bug 551674
+ CDT enforces a minimum of 3.6.3 because that is what CDT's CI
+ runs with. It may work with older versions, but this is not
+ tested or supported. -->
+ <required-maven-version>3.6.3</required-maven-version>
+ <tycho-version>2.3.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
+ <cbi-plugins.version>1.3.1</cbi-plugins.version>
<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.11</help-docs-eclipserun-repo>
- <required-maven-version>3.3.1</required-maven-version>
+ <required-maven-version>3.6.3</required-maven-version>
<!-- The following property is used by the production profile to install the final repo and -->
<!-- associated components. It should be overridden if installing into a different location. -->
<ptp-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/${ptp-version}</ptp-install-dir>
@@ -185,7 +191,7 @@
<groupId>org.eclipse.ptp</groupId>
<artifactId>org.eclipse.ptp.target</artifactId>
<version>9.4.0-SNAPSHOT</version>
- <classifier>photon</classifier>
+ <classifier>ptp</classifier>
</artifact>
</target>
</configuration>
@@ -293,7 +299,7 @@
<version>${required-maven-version}</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>1.8</version>
+ <version>11</version>
</requireJavaVersion>
</rules>
<fail>true</fail>
@@ -309,11 +315,11 @@
<profile>
<id>eclipse-sign</id>
<pluginRepositories>
- <pluginRepository>
- <id>m2e-cbi</id>
- <url>http://download.eclipse.org/technology/m2e/maven/</url>
+ <pluginRepository>
+ <id>cbi</id>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories>
<build>
<plugins>
@@ -325,49 +331,20 @@
<includePackedArtifacts>true</includePackedArtifacts>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200a-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>pack200-normalize</id>
- <goals>
- <goal>normalize</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${cbi-plugins.version}</version>
<executions>
<execution>
<id>sign</id>
+ <phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>pack200-pack</id>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
@@ -378,7 +355,7 @@
<goals>
<goal>p2-metadata</goal>
</goals>
- <phase>package</phase>
+ <phase>verify</phase>
</execution>
</executions>
<configuration>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.cdt.ui/build.properties b/rdt/org.eclipse.ptp.rdt.sync.cdt.ui/build.properties
index b3fc50f..ef1623f 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.cdt.ui/build.properties
+++ b/rdt/org.eclipse.ptp.rdt.sync.cdt.ui/build.properties
@@ -15,4 +15,8 @@
plugin.xml,\
plugin.properties,\
icons/,\
- about.html
+ about.html,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ ptp_logo_icon32.png
diff --git a/rdt/org.eclipse.ptp.rdt.sync.git.core/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.sync.git.core/META-INF/MANIFEST.MF
index e2452f4..df5371e 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.git.core/META-INF/MANIFEST.MF
+++ b/rdt/org.eclipse.ptp.rdt.sync.git.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ptp.rdt.sync.git.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
Bundle-Activator: org.eclipse.ptp.internal.rdt.sync.git.core.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
@@ -11,7 +11,7 @@
org.eclipse.remote.core,
org.eclipse.jgit
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
Export-Package: org.eclipse.ptp.internal.rdt.sync.git.core;x-friends:="org.eclipse.ptp.rdt.sync.git.ui,org.eclipse.ptp.rdt.sync.core.tests,org.eclipse.ptp.rdt.sync.git.core.tests",
diff --git a/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/JGitRepo.java b/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/JGitRepo.java
index 8b63095..96ccfcf 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/JGitRepo.java
+++ b/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/JGitRepo.java
@@ -744,6 +744,11 @@
throws TransportException {
return new PTPSession(remoteLoc);
}
+
+ @Override
+ public String getType() {
+ return "ptp"; //$NON-NLS-1$
+ }
});
transport.applyConfig(remoteConfig);
diff --git a/releng/org.eclipse.ptp.target/mars.target b/releng/org.eclipse.ptp.target/mars.target
deleted file mode 100644
index edde8a4..0000000
--- a/releng/org.eclipse.ptp.target/mars.target
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="ptp-mars" sequenceNumber="0">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.5/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.mockito" version="0.0.0"/>
-<unit id="org.hamcrest" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
-<unit id="org.eclipse.cdt.core" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.ptp.target/neon.target b/releng/org.eclipse.ptp.target/neon.target
deleted file mode 100644
index 4c1afd6..0000000
--- a/releng/org.eclipse.ptp.target/neon.target
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="ptp-neon" sequenceNumber="17">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/launchbar/neon.2/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.gson" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/cbi/updates/license/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.control.sdk.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.view.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.2milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.photran.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.photran.intel.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.photran.xlf.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/hudson/ptp-nightly-photran/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.core.parser.upc.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/neon/milestones/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.ptp.target/oxygen.target b/releng/org.eclipse.ptp.target/oxygen.target
deleted file mode 100644
index a7d05c2..0000000
--- a/releng/org.eclipse.ptp.target/oxygen.target
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="ptp-oxygen" sequenceNumber="19">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/launchbar/oxygen.2/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.gson" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170818183741/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/cbi/updates/license/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/egit/updates-nightly/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.control.sdk.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.view.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.2milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.photran.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.photran.intel.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.photran.xlf.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/hudson/ptp-release-photran/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.core.parser.upc.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/oxygen/milestones/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.ptp.target/pom.xml b/releng/org.eclipse.ptp.target/pom.xml
index f5e9214..9571112 100644
--- a/releng/org.eclipse.ptp.target/pom.xml
+++ b/releng/org.eclipse.ptp.target/pom.xml
@@ -19,7 +19,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>attach-artifacts</id>
@@ -30,9 +30,9 @@
<configuration>
<artifacts>
<artifact>
- <file>photon.target</file>
+ <file>ptp.target</file>
<type>target</type>
- <classifier>ptp-photon</classifier>
+ <classifier>ptp</classifier>
</artifact>
</artifacts>
</configuration>
diff --git a/releng/org.eclipse.ptp.target/photon.target b/releng/org.eclipse.ptp.target/ptp.target
similarity index 67%
rename from releng/org.eclipse.ptp.target/photon.target
rename to releng/org.eclipse.ptp.target/ptp.target
index dbc69fc..7ef3a38 100644
--- a/releng/org.eclipse.ptp.target/photon.target
+++ b/releng/org.eclipse.ptp.target/ptp.target
@@ -1,8 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="ptp-photon" sequenceNumber="21">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="ptp" sequenceNumber="21">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/>
+ <unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
+ <unit id="javax.activation" version="1.2.2.v20201119-1642"/>
+ <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
+ <unit id="javax.xml.stream" version="0.0.0"/>
+ <unit id="com.google.gson" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -10,11 +16,17 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
- <repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2020-03-M2/"/>
+ <repository location="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.15milestones/"/>
+ <unit id="org.eclipse.photran.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.photran.intel.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.photran.xlf.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/tools/ptp/builds/photran/9.4.1/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>
@@ -24,19 +36,20 @@
<repository location="https://download.eclipse.org/tm/updates/4.5.103-SNAPSHOT/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.photran.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.photran.intel.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.photran.xlf.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/tools/ptp/builds/hudson/ptp-nightly-photran/"/>
- </location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
- <repository location="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.0-2020-03-rc2/"/>
+ <repository location="https://download.eclipse.org/tools/cdt/releases/10.3/cdt-10.3.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
- <repository location="https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/egit/org.eclipse.egit.repository/5.7.0.202003110725-r/org.eclipse.egit.repository-5.7.0.202003110725-r.zip-unzip/"/>
+ <repository location="https://download.eclipse.org/egit/updates"/>
</location>
</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+<launcherArgs>
+<vmArgs>-Xms40m
+-Xmx512M
+-ea</vmArgs>
+<programArgs>-consolelog</programArgs>
+</launcherArgs>
</target>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.lml.monitor.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.lml.monitor.ui/META-INF/MANIFEST.MF
index 932d381..539e6f9 100644
--- a/rms/org.eclipse.ptp.rm.lml.monitor.ui/META-INF/MANIFEST.MF
+++ b/rms/org.eclipse.ptp.rm.lml.monitor.ui/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@
org.eclipse.core.filesystem,
org.eclipse.core.expressions,
org.eclipse.ui,
+ org.eclipse.ui.ide,
org.eclipse.ui.console,
org.eclipse.ptp.core,
org.eclipse.remote.core,
diff --git a/tools/etfw/org.eclipse.ptp.etfw.tau/META-INF/MANIFEST.MF b/tools/etfw/org.eclipse.ptp.etfw.tau/META-INF/MANIFEST.MF
index 5b77e6e..6bc15fb 100644
--- a/tools/etfw/org.eclipse.ptp.etfw.tau/META-INF/MANIFEST.MF
+++ b/tools/etfw/org.eclipse.ptp.etfw.tau/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ptp.etfw.tau;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.ptp.etfw.tau.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff --git a/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/OptionSplash.java b/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/OptionSplash.java
index 1e44998..854f1e3 100644
--- a/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/OptionSplash.java
+++ b/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/OptionSplash.java
@@ -75,7 +75,7 @@
autobuild.setToolTipText(Messages.OptionSplash_TauSugOff);
autobuild.setSelection(service.getBoolean(Activator.PLUGIN_ID, ResourcesPlugin.PREF_AUTO_BUILDING, false, null));
- final boolean isAIX = org.eclipse.cdt.utils.Platform.getOS().toLowerCase().trim().indexOf("aix") >= 0; //$NON-NLS-1$
+ final boolean isAIX = Platform.getOS().toLowerCase().trim().indexOf("aix") >= 0; //$NON-NLS-1$
if (isAIX)
{
fixAix = new Button(composite, SWT.CHECK);
diff --git a/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPrefPage.java b/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPrefPage.java
index 181447c..fb9c39c 100644
--- a/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPrefPage.java
+++ b/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPrefPage.java
@@ -97,7 +97,7 @@
gridData.horizontalSpan = 3;
gridData.horizontalAlignment = GridData.FILL;
- if (org.eclipse.cdt.utils.Platform.getOS().toLowerCase().trim().indexOf("aix") >= 0) //$NON-NLS-1$
+ if (Platform.getOS().toLowerCase().trim().indexOf("aix") >= 0) //$NON-NLS-1$
{
checkAixOpts = createCheckButton(parent, Messages.TAUPrefPage_AutoEclipseInternal);
checkAixOpts.setLayoutData(gridData);
diff --git a/tools/etfw/org.eclipse.ptp.etfw/META-INF/MANIFEST.MF b/tools/etfw/org.eclipse.ptp.etfw/META-INF/MANIFEST.MF
index 8799563..98ce620 100644
--- a/tools/etfw/org.eclipse.ptp.etfw/META-INF/MANIFEST.MF
+++ b/tools/etfw/org.eclipse.ptp.etfw/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ptp.etfw;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 7.1.1.qualifier
Bundle-Activator: org.eclipse.ptp.internal.etfw.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff --git a/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/BuildLaunchUtils.java b/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/BuildLaunchUtils.java
index 50613b4..52fbd91 100644
--- a/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/BuildLaunchUtils.java
+++ b/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/BuildLaunchUtils.java
@@ -37,6 +37,7 @@
import org.eclipse.core.filesystem.IFileInfo;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ptp.etfw.IBuildLaunchUtils;
import org.eclipse.ptp.etfw.IToolLaunchConfigurationConstants;
@@ -97,7 +98,7 @@
*
*/
public static String checkLocalToolEnvPath(String toolname) {
- if (org.eclipse.cdt.utils.Platform.getOS().toLowerCase().trim().indexOf("win") >= 0) {
+ if (Platform.getOS().toLowerCase().trim().indexOf("win") >= 0) {
return null;
}
String pPath = null;
diff --git a/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/RemoteBuildLaunchUtils.java b/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/RemoteBuildLaunchUtils.java
index 306aa4d..28928ac 100644
--- a/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/RemoteBuildLaunchUtils.java
+++ b/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/RemoteBuildLaunchUtils.java
@@ -35,6 +35,7 @@
import org.eclipse.core.filesystem.IFileInfo;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
@@ -235,7 +236,7 @@
*
*/
public String checkToolEnvPath(String toolname) {
- if (org.eclipse.cdt.utils.Platform.getOS().toLowerCase().trim().indexOf("win") >= 0 && !this.isRemote()) {//$NON-NLS-1$
+ if (Platform.getOS().toLowerCase().trim().indexOf("win") >= 0 && !this.isRemote()) {//$NON-NLS-1$
return null;
}
String pPath = null;
diff --git a/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/ui/ToolRecompMainTab.java b/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/ui/ToolRecompMainTab.java
index ce0eb70..5527009 100644
--- a/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/ui/ToolRecompMainTab.java
+++ b/tools/etfw/org.eclipse.ptp.etfw/src/org/eclipse/ptp/internal/etfw/ui/ToolRecompMainTab.java
@@ -21,7 +21,7 @@
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.cdt.launch.ui.CMainTab;
+import org.eclipse.cdt.launch.ui.CMainTab2;
import org.eclipse.cdt.launch.ui.ICDTLaunchHelpContextIds;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
@@ -61,7 +61,7 @@
*
*/
@SuppressWarnings("restriction")
-public class ToolRecompMainTab extends CMainTab implements ILaunchConfigurationTab {
+public class ToolRecompMainTab extends CMainTab2 implements ILaunchConfigurationTab {
protected Combo projectCombo = null;
protected Combo buildConfCombo = null;
@@ -74,10 +74,6 @@
super();
}
- public ToolRecompMainTab(boolean x) {
- super(x);
- }
-
/**
* Defines the area of the tab where the project's build configuration is
* selected
@@ -124,9 +120,6 @@
createBuildConfGroup(comp, 1);
createExeFileGroup(comp, 1);
createVerticalSpacer(comp, 1);
- if (wantsTerminalOption() /* && ProcessFactory.supportesTerminal() */) {
- createTerminalOption(comp, 1);
- }
LaunchUIPlugin.setDialogShell(parent.getShell());
}
@@ -169,10 +162,12 @@
Button fBrowseForBinaryButton;
fBrowseForBinaryButton = createPushButton(exeComp, "B&rowse...", null); //$NON-NLS-1$
fBrowseForBinaryButton.addSelectionListener(new SelectionAdapter() {
-
@Override
public void widgetSelected(SelectionEvent evt) {
- handleBinaryBrowseButtonSelected();
+ String text = handleBrowseButtonSelected(LaunchMessages.CMainTab2_Application_Selection);
+ if (text != null) {
+ fProgText.setText(text);
+ }
updateLaunchConfigurationDialog();
}
});
@@ -396,9 +391,6 @@
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, fProgText.getText());
config.setAttribute(IToolLaunchConfigurationConstants.ATTR_PERFORMANCEBUILD_CONFIGURATION_NAME, buildConfCombo.getText());
- if (fTerminalButton != null) {
- config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, fTerminalButton.getSelection());
- }
}
/**
