mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-30 21:55:31 +02:00
Code Issues Wiki Activity

Merge remote-tracking branch 'origin/R3_0_maintenance'

Browse source 
Signed-off-by: Greg Watson <g.watson@computer.org>
This commit is contained in:
Greg Watson 2019-06-03 11:19:10 -04:00
commit 2ae26637c6
32 changed files with 49 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/org.eclipse.remote.console/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.doc.isv/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.jsch.core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

22
bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
View file

@ -74,6 +74,7 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC
public static final boolean DEFAULT_IS_PASSWORD = false;
public static final boolean DEFAULT_USE_LOGIN_SHELL = true;
public static final String DEFAULT_LOGIN_SHELL_COMMAND = "/bin/bash -l -c '{0}'"; //$NON-NLS-1$
public static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
public static final String EMPTY_STRING = ""; //$NON-NLS-1$
private String fWorkingDir;
@ -693,14 +694,18 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC
String osVersion;
String osArch;
String encoding;
String encoding = DEFAULT_ENCODING;
String osName = executeCommand("uname", subMon.newChild(10)); //$NON-NLS-1$
switch (osName.toLowerCase()) {
case "linux": //$NON-NLS-1$
osArch = executeCommand("uname -m", subMon.newChild(10)); //$NON-NLS-1$
osVersion = executeCommand("uname -r", subMon.newChild(10)); //$NON-NLS-1$
encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
try {
encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
} catch (RemoteConnectionException e) {
// Use default
}
break;
case "darwin": //$NON-NLS-1$
@ -713,7 +718,11 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC
osArch = "x86_64"; //$NON-NLS-1$
}
}
encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
try {
encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
} catch (RemoteConnectionException e) {
// Use default
}
break;
case "aix": //$NON-NLS-1$
@ -728,13 +737,16 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC
osArch += "64"; //$NON-NLS-1$
}
}
encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
try {
encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
} catch (RemoteConnectionException e) {
// Use default
}
break;
case "qnx": //$NON-NLS-1$
osArch = executeCommand("uname -p", subMon.newChild(10)); //$NON-NLS-1$
osVersion = executeCommand("uname -r", subMon.newChild(10)); //$NON-NLS-1$
encoding = "UTF-8"; //$NON-NLS-1$
break;
default:

2
bundles/org.eclipse.remote.jsch.ui/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.proxy.core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.proxy.protocol.core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.proxy.server.core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.proxy.ui/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.serial.core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.serial.ui/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.telnet.core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.telnet.ui/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
bundles/org.eclipse.remote.ui/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
features/org.eclipse.remote-feature/feature.xml
View file

@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote"
label="%featureName"
version="3.0.0.qualifier"
version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

2
features/org.eclipse.remote-feature/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
features/org.eclipse.remote.console-feature/feature.xml
View file

@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote.console"
label="%featureName"
version="3.0.0.qualifier"
version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

2
features/org.eclipse.remote.console-feature/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
features/org.eclipse.remote.proxy-feature/feature.xml
View file

@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote.proxy"
label="%featureName"
version="3.0.0.qualifier"
version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

2
features/org.eclipse.remote.proxy-feature/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
features/org.eclipse.remote.serial-feature/feature.xml
View file

@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote.serial"
label="%featureName"
version="3.0.0.qualifier"
version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

2
features/org.eclipse.remote.serial-feature/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
features/org.eclipse.remote.telnet-feature/feature.xml
View file

@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote.telnet"
label="%featureName"
version="3.0.0.qualifier"
version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

2
features/org.eclipse.remote.telnet-feature/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

4
releng/org.eclipse.remote.build/pom.xml
View file

@ -10,7 +10,7 @@
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Remote Parent</name>
@ -151,7 +151,7 @@
<artifact>
<groupId>org.eclipse.remote</groupId>
<artifactId>org.eclipse.remote.target</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<classifier>photon</classifier>
</artifact>
</target>

2
releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
releng/org.eclipse.remote.proxy.server.product/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
releng/org.eclipse.remote.repo/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>

2
releng/org.eclipse.remote.target/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
</parent>