mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-03 14:25:37 +02:00
Bug 536800 remove org.eclipse.tm.terminal.connector.serial.sdk.feature, org.eclipse.tm.terminal.connector.serial.feature, and org.eclipse.tm.terminal.connector.serial from Terminal as it can't be built while it depends on gnu.io.rxtx
Change-Id: I25322e0dc118b11859dc7fa56b6a186ca4cbc1ba Signed-off-by: nickboldt <nboldt@redhat.com>
This commit is contained in:
parent
3deec2d5e4
commit
d7b288becd
6 changed files with 28 additions and 22 deletions
7
pom.xml
7
pom.xml
|
@ -37,8 +37,6 @@
|
|||
<!-- TODO: remove dep on simrel site -->
|
||||
<platform-release-site>http://download.eclipse.org/staging/2018-09/</platform-release-site>
|
||||
|
||||
<!-- provides gnu.io for the update site -->
|
||||
<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
|
||||
</properties>
|
||||
|
||||
<repositories>
|
||||
|
@ -77,11 +75,6 @@
|
|||
<url>${remote-site}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>rxtx</id>
|
||||
<url>${rxtx-site}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<pluginRepositories>
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
<feature id="org.eclipse.tm.terminal.connector.local.sdk.feature"><category name="terminal_sdk"/></feature>
|
||||
<feature id="org.eclipse.tm.terminal.connector.cdtserial.feature"><category name="terminal_main"/></feature>
|
||||
<feature id="org.eclipse.tm.terminal.connector.cdtserial.sdk.feature"><category name="terminal_sdk"/></feature>
|
||||
<feature id="org.eclipse.tm.terminal.connector.serial.feature"><category name="terminal_main"/></feature>
|
||||
<feature id="org.eclipse.tm.terminal.connector.serial.sdk.feature"><category name="terminal_sdk"/></feature>
|
||||
<!-- Bug 536800 remove <feature id="org.eclipse.tm.terminal.connector.serial.feature"><category name="terminal_main"/></feature> -->
|
||||
<!-- Bug 536800 remove <feature id="org.eclipse.tm.terminal.connector.serial.sdk.feature"><category name="terminal_sdk"/></feature> -->
|
||||
<feature id="org.eclipse.tm.terminal.connector.ssh.feature"><category name="terminal_main"/></feature>
|
||||
<feature id="org.eclipse.tm.terminal.connector.ssh.sdk.feature"><category name="terminal_sdk"/></feature>
|
||||
<feature id="org.eclipse.tm.terminal.connector.telnet.feature"><category name="terminal_main"/></feature>
|
||||
|
@ -38,7 +38,8 @@
|
|||
|
||||
<bundle id="org.eclipse.tm.terminal.test"><category name="terminal_optional"/></bundle>
|
||||
<bundle id="org.apache.commons.net"><category name="deps"/></bundle>
|
||||
<bundle id="gnu.io.rxtx"><category name="deps"/></bundle>
|
||||
<!-- Bug 536800 gnu.io.rxtx is a workswith dep we are not allowed to redistribute -->
|
||||
<!-- <bundle id="gnu.io.rxtx"><category name="deps"/></bundle> -->
|
||||
|
||||
<category-def name="terminal_main" label="Terminal Features">
|
||||
<description>
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
<import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
|
||||
<!-- Bug 536800 depends on gnu.io.rxtx which is a workswith dep we are not allowed to redistribute -->
|
||||
<plugin
|
||||
id="org.eclipse.tm.terminal.connector.serial"
|
||||
download-size="0"
|
||||
|
|
|
@ -58,18 +58,23 @@
|
|||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<!-- Bug 536800 depends on gnu.io.rxtx which is a workswith dep we are not allowed to redistribute -->
|
||||
<!-- The rxtxserial connector doesn't build on MacOSX. -->
|
||||
<id>rxtxserial</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
<property>
|
||||
<name>!norxtx</name>
|
||||
</property>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<!-- Bug 536800 remove from reactor <modules>
|
||||
<module>org.eclipse.tm.terminal.connector.serial.feature</module>
|
||||
<module>org.eclipse.tm.terminal.connector.serial.sdk.feature</module>
|
||||
</modules>
|
||||
</modules> -->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>rxtx</id>
|
||||
<url>http://archive.eclipse.org/tm/updates/rxtx</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
<relativePath>../../admin/pom-build.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<!-- Bug 536800 depends on gnu.io.rxtx which is a workswith dep we are not allowed to redistribute -->
|
||||
<artifactId>org.eclipse.tm.terminal.connector.serial</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
</project>
|
||||
|
|
|
@ -50,17 +50,22 @@
|
|||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<!-- Bug 536800 depends on gnu.io.rxtx which is a workswith dep we are not allowed to redistribute -->
|
||||
<!-- The rxtxserial connector doesn't build on MacOSX. -->
|
||||
<id>rxtxserial</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
<property>
|
||||
<name>!norxtx</name>
|
||||
</property>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<!-- Bug 536800 remove from reactor <modules>
|
||||
<module>org.eclipse.tm.terminal.connector.serial</module>
|
||||
</modules>
|
||||
</modules> -->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>rxtx</id>
|
||||
<url>http://archive.eclipse.org/tm/updates/rxtx</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
Loading…
Add table
Reference in a new issue