mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

merge terminal and rse update sites; remove unneeded config, unneeded repos

Browse source 
Change-Id: If909e03926c013b8b99af3585db83c21c981422d
Signed-off-by: nickboldt <nboldt@redhat.com>
This commit is contained in:
nickboldt 2018-08-28 16:28:36 -04:00
parent fa7889d89d
commit ebe114fa71
8 changed files with 52 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pom.xml
View file

@ -34,10 +34,6 @@
<!-- <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/photon/milestones/</remote-site> --> <!-- <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/photon/milestones/</remote-site> -->
<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site> <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
<!-- TODO remove dep on terminal and tm since in the same reactor now -->
<terminal-site>http://download.eclipse.org/tm/terminal/builds/development/nightly</terminal-site>
<tm-site>http://download.eclipse.org/tm/updates/3.7.100/repository/</tm-site>
<!-- TODO: remove dep on simrel site --> <!-- TODO: remove dep on simrel site -->
<!-- <platform-release-site>http://download.eclipse.org/staging/photon/</platform-release-site> --> <!-- <platform-release-site>http://download.eclipse.org/staging/photon/</platform-release-site> -->
<platform-release-site>http://download.eclipse.org/staging/2018-09/</platform-release-site> <platform-release-site>http://download.eclipse.org/staging/2018-09/</platform-release-site>
@ -59,6 +55,11 @@
<url>${platform-site}</url> <url>${platform-site}</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
<repository>
<id>platform-release</id>
<url>${platform-release-site}</url>
<layout>p2</layout>
</repository>
<repository> <repository>
<id>orbit</id> <id>orbit</id>
<url>${orbit-site}</url> <url>${orbit-site}</url>
@ -70,8 +71,13 @@
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
<repository> <repository>
<id>terminal</id> <id>swtbot</id>
<url>${terminal-site}</url> <url>${swtbot-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>remote</id>
<url>${remote-site}</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
<repository> <repository>
@ -349,5 +355,6 @@
<module>rse</module> <module>rse</module>
<!-- Windows CE subsystem and support for RSE --> <!-- Windows CE subsystem and support for RSE -->
<module>wince</module> <module>wince</module>
<module>site</module>
</modules> </modules>
</project> </project>

1
rse/pom.xml
View file

@ -31,6 +31,5 @@
<module>features</module> <module>features</module>
<module>plugins</module> <module>plugins</module>
<module>tests</module> <module>tests</module>
<module>site</module>
</modules> </modules>
</project> </project>

32
rse/site/category.xml
View file

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature id="org.eclipse.rse">
<category name="rse_38_main"/>
</feature>
<feature id="org.eclipse.rse.sdk">
<category name="rse_38_main"/>
</feature>
<feature id="org.eclipse.rse.terminals">
<category name="rse_38_main"/>
</feature>
<feature id="org.eclipse.rse.useractions">
<category name="rse_38_main"/>
</feature>
<feature id="org.eclipse.rse.examples">
<category name="rse_38_optional"/>
</feature>
<feature id="org.eclipse.rse.scp">
<category name="rse_38_optional"/>
</feature>
<category-def name="rse_38_main" label="RSE 3.8 Main Features">
<description>
RSE Main Features
</description>
</category-def>
<category-def name="rse_38_optional" label="RSE 3.8 Optional Add-Ons">
<description>
RSE Examples, Tests and Incubation Plug-ins.
</description>
</category-def>
</site>

28
terminal/repos/org.eclipse.tm.terminal.repo/category.xml → site/category.xml
View file

@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<site> <site>
<feature id="org.eclipse.rse"><category name="rse_main"/></feature>
<feature id="org.eclipse.rse.sdk"><category name="rse_main"/></feature>
<feature id="org.eclipse.rse.terminals"><category name="rse_main"/></feature>
<feature id="org.eclipse.rse.useractions"><category name="rse_main"/></feature>
<feature id="org.eclipse.rse.examples"><category name="rse_optional"/></feature>
<feature id="org.eclipse.rse.scp"><category name="rse_optional"/></feature>
<!-- Terminal Control Features --> <!-- Terminal Control Features -->
<feature id="org.eclipse.tm.terminal.control.feature"><category name="terminal_main"/></feature> <feature id="org.eclipse.tm.terminal.control.feature"><category name="terminal_main"/></feature>
<feature id="org.eclipse.tm.terminal.control.sdk.feature"><category name="terminal_main"/></feature> <feature id="org.eclipse.tm.terminal.control.sdk.feature"><category name="terminal_main"/></feature>
@ -28,9 +36,27 @@
<feature id="org.eclipse.tm.terminal.feature"><category name="terminal_main"/></feature> <feature id="org.eclipse.tm.terminal.feature"><category name="terminal_main"/></feature>
<feature id="org.eclipse.tm.terminal.sdk.feature"><category name="terminal_main"/></feature> <feature id="org.eclipse.tm.terminal.sdk.feature"><category name="terminal_main"/></feature>
<category-def name="terminal_main" label="TM Terminal Features"> <bundle id="org.eclipse.tm.terminal.test"><category name="terminal_optional"/></bundle>
<category-def name="terminal_main" label="Terminal Features">
<description> <description>
TM Terminal Features TM Terminal Features
</description> </description>
</category-def> </category-def>
<category-def name="terminal_optional" label="Terminal Optional Add-Ons">
<description>
TM Terminal Examples, Tests, etc.
</description>
</category-def>
<category-def name="rse_main" label="RSE Features">
<description>
RSE Features
</description>
</category-def>
<category-def name="rse_optional" label="RSE Optional Add-Ons">
<description>
RSE Examples, Tests and Incubation Plug-ins.
</description>
</category-def>
</site> </site>

8
rse/site/pom.xml → site/pom.xml
View file

@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.eclipse.tm.rse</groupId> <groupId>org.eclipse.tm</groupId>
<artifactId>org.eclipse.tm.rse</artifactId> <artifactId>tm-parent</artifactId>
<version>3.8.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.eclipse.tm.rse</groupId> <groupId>org.eclipse.tm.rse</groupId>
<artifactId>org.eclipse.tm.rse.site</artifactId> <artifactId>org.eclipse.tm.site</artifactId>
<packaging>eclipse-repository</packaging> <packaging>eclipse-repository</packaging>
</project> </project>

67
terminal/admin/pom-config.xml
View file

@ -51,74 +51,9 @@
<terminal-stream>development</terminal-stream> <terminal-stream>development</terminal-stream>
<terminal-zipfile>${project.artifactId}.zip</terminal-zipfile> <terminal-zipfile>${project.artifactId}.zip</terminal-zipfile>
<terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install> <terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
</properties> </properties>
<repositories>
<repository>
<id>license-feature</id>
<url>${license-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>platform</id>
<url>${platform-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>platform-release</id>
<url>${platform-release-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>orbit</id>
<url>${orbit-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>cdt</id>
<url>${cdt-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>tm</id>
<url>${tm-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>swtbot</id>
<url>${swtbot-site}</url>
<layout>p2</layout>
</repository>
<repository>
<id>remote</id>
<url>${remote-site}</url>
<layout>p2</layout>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/public</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>cbi</id>
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
<pluginRepository>
<id>cbi-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
</pluginRepository>
</pluginRepositories>
<profiles> <profiles>
<profile> <profile>
<!-- Eclipse 3.8.2 (Juno), CDT 8.4.0 (Luna SR0) --> <!-- Eclipse 3.8.2 (Juno), CDT 8.4.0 (Luna SR0) -->

11
terminal/repos/org.eclipse.tm.terminal.repo/.project
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.tm.terminal.repo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>

63
terminal/repos/org.eclipse.tm.terminal.repo/pom.xml
View file

@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.tm.terminal</groupId>
<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
<version>4.4.0-SNAPSHOT</version>
<relativePath>../../admin/pom-build.xml</relativePath>
</parent>
<version>4.4.0-SNAPSHOT</version>
<artifactId>org.eclipse.tm.terminal.repo</artifactId>
<packaging>eclipse-repository</packaging>
<profiles>
<profile>
<id>deploy</id>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>deploy</id>
<phase>install</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<delete includeemptydirs="true">
<fileset dir="${terminal-install}">
<include name="**" />
</fileset>
</delete>
<mkdir dir="${terminal-install}/common" />
<mkdir dir="${terminal-install}/remote" />
<copy includeemptydirs="false" todir="${terminal-install}">
<fileset dir="target/repository">
<include name="**" />
</fileset>
<fileset dir="target">
<include name="${terminal-zipfile}" />
</fileset>
</copy>
<chmod perm="g+w">
<fileset dir="${terminal-install}">
<include name="**" />
</fileset>
</chmod>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>