diff options
9 files changed, 21 insertions, 246 deletions
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.project b/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.project deleted file mode 100644 index 4c3114808bc..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.project +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.lsp4e.cpp.target</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> - <linkedResources> - <link> - <name>parent-pom.xml</name> - <type>1</type> - <locationURI>PARENT-1-PROJECT_LOC/pom.xml</locationURI> - </link> - </linkedResources> - <variableList> - <variable> - <name>copy_PARENT</name> - <value>$%7BPARENT-5-PROJECT_LOC%7D/git/lsp4e-cpp</value> - </variable> - </variableList> -</projectDescription> diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.settings/org.eclipse.core.resources.prefs b/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.settings/org.eclipse.core.runtime.prefs b/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2a7..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -line.separator=\n diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/cdt-plus-lsp4e.cpp.target b/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/cdt-plus-lsp4e.cpp.target deleted file mode 100644 index e09ad704d20..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/cdt-plus-lsp4e.cpp.target +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="cdt-plus-lsp4e.cpp" sequenceNumber="46"> -<locations> -<!-- This target is useful for using CDT in combination of the LSP --> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.antlr.runtime" version="0.0.0"/> -<unit id="org.apache.commons.compress" version="0.0.0"/> -<unit id="org.apache.log4j" version="0.0.0"/> -<unit id="org.apache.log4j.source" version="0.0.0"/> -<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/> -<unit id="org.junit" version="0.0.0"/> -<unit id="org.junit.source" version="0.0.0"/> -<unit id="org.mockito" version="0.0.0"/> -<unit id="org.slf4j.impl.log4j12" version="0.0.0"/> -<unit id="org.hamcrest" version="0.0.0"/> -<unit id="org.hamcrest.core" version="0.0.0"/> -<unit id="com.google.gson" version="0.0.0"/> -<unit id="org.freemarker" version="0.0.0"/> -<unit id="org.apache.commons.io" version="0.0.0"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170120205402/repository/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> -<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> -<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/technology/swtbot/snapshots/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> - <repository location="http://download.eclipse.org/tm/updates/4.2milestones/20161026"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.remote.feature.group" version="0.0.0"/> -<unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/> -<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<!-- Needed for org.eclipse.emf.edit --> -<!-- Need to pull in org.eclipse.cdt.utils.pty for org.eclipse.remote.core to build --> -<repository location="http://download.eclipse.org/releases/oxygen"/> -</location> - -<location includeAllPlatforms="false" includeConfigurePhase="false" 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="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.test.feature.group" version="0.0.0"/> -<unit id="org.eclipse.sdk.ide" version="0.0.0"/> -<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/eclipse/updates/4.7milestones/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/> -<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/> -<repository location="https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/linuxtools/updates-docker-nightly/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" 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> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M5-20170201000249/repository/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/> -<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/tm/terminal/updates/4.3milestones/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.tools.templates.core" version="0.0.0"/> -<unit id="org.eclipse.tools.templates.freemarker" version="0.0.0"/> -<unit id="org.eclipse.tools.templates.ui" version="0.0.0"/> -<repository location="https://hudson.eclipse.org/cdt/job/tools-templates-master/lastSuccessfulBuild/artifact/repo/target/repository/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/> -<unit id="org.eclipse.egit.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/releases/oxygen/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/mylyn/releases/latest"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.mylyn.wikitext.sdk.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/mylyn/docs/releases/3.0.13"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.lsp4e" version="0.0.0"/> -<repository location="http://download.eclipse.org/lsp4e/snapshots/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/lsp4j/updates/releases/0.2.0/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones"/> -</location> -</locations> -<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<launcherArgs> -<vmArgs>-Xms40m --Xmx512M --XX:MaxPermSize=256m --ea</vmArgs> -<programArgs>-consolelog</programArgs> -</launcherArgs> -</target> diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/lsp4e.cpp-staging.target b/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/lsp4e.cpp-staging.target deleted file mode 100644 index 1d87c359735..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/lsp4e.cpp-staging.target +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="lsp4e.cpp-staging" sequenceNumber="6"> -<locations> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.apache.commons.io" version="0.0.0"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170120205402/repository/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" 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="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.sdk.ide" version="0.0.0"/> -<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/releases/oxygen/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/mylyn/releases/latest"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.mylyn.wikitext.sdk.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/mylyn/docs/releases/3.0.13"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.lsp4e" version="0.0.0"/> -<repository location="http://download.eclipse.org/lsp4e/snapshots/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/> -<repository location="http://download.eclipse.org/lsp4j/updates/releases/0.2.0/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones"/> -</location> -</locations> -<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<launcherArgs> -<vmArgs>-Xms40m --Xmx512M --XX:MaxPermSize=256m --ea</vmArgs> -<programArgs>-consolelog</programArgs> -</launcherArgs> -</target> diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/pom.xml b/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/pom.xml deleted file mode 100644 index 398c49b0afd..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.target/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.lsp4e.cpp.group</groupId> - <artifactId>org.eclipse.lsp4e.cpp.parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <artifactId>org.eclipse.lsp4e.cpp.target</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.9</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>lsp4e.cpp-staging.target</file> - <type>target</type> - <classifier>lsp4e.cpp-staging</classifier> - </artifact> - <!-- More targets could be added here --> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/lsp4e-cpp/pom.xml b/lsp4e-cpp/pom.xml index 0ed376d920d..b2a6ccd6364 100644 --- a/lsp4e-cpp/pom.xml +++ b/lsp4e-cpp/pom.xml @@ -48,7 +48,6 @@ <module>org.eclipse.lsp4e.cpp</module> <module>org.eclipse.lsp4e.cpp.language</module> <module>org.eclipse.lsp4e.cpp.site</module> - <module>org.eclipse.lsp4e.cpp.target</module> </modules> <build> diff --git a/releng/CDT.setup b/releng/CDT.setup index a072994b476..ac85650053f 100644 --- a/releng/CDT.setup +++ b/releng/CDT.setup @@ -169,6 +169,8 @@ name="org.eclipse.ui.trace"/> <requirement name="tm-feature.feature.group"/> + <requirement + name="org.eclipse.lsp4e"/> <sourceLocator rootFolder="${git.clone.cdt.location}" locateNestedProjects="true"/> @@ -198,6 +200,8 @@ url="https://hudson.eclipse.org/cdt/job/tools-templates-master/lastSuccessfulBuild/artifact/repo/target/repository/"/> <repository url="http://download.eclipse.org/tm4e/snapshots/"/> + <repository + url="http://download.eclipse.org/lsp4e/snapshots/"/> </repositoryList> </targlet> </setupTask> diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index 427a1e7f462..a99e60aa6b2 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="cdt" sequenceNumber="25"> +<?pde version="3.8"?><target name="cdt" sequenceNumber="29"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="com.google.gson" version="0.0.0"/> +<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/> <unit id="org.antlr.runtime" version="0.0.0"/> <unit id="org.apache.commons.compress" version="0.0.0"/> <unit id="org.apache.log4j" version="0.0.0"/> <unit id="org.apache.log4j.source" version="0.0.0"/> -<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/> +<unit id="org.assertj" version="0.0.0"/> +<unit id="org.freemarker" version="0.0.0"/> +<unit id="org.hamcrest" version="0.0.0"/> +<unit id="org.hamcrest.core" version="0.0.0"/> <unit id="org.junit" version="0.0.0"/> <unit id="org.junit.source" version="0.0.0"/> <unit id="org.mockito" version="0.0.0"/> <unit id="org.slf4j.impl.log4j12" version="0.0.0"/> -<unit id="org.hamcrest" version="0.0.0"/> -<unit id="org.hamcrest.core" version="0.0.0"/> -<unit id="com.google.gson" version="0.0.0"/> -<unit id="org.freemarker" version="0.0.0"/> -<unit id="org.assertj" version="0.0.0"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/repository/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -24,14 +24,14 @@ </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> -<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> +<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> <repository location="http://download.eclipse.org/technology/swtbot/snapshots/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/> <unit id="org.eclipse.remote.feature.group" version="0.0.0"/> <unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/> -<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/> <repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -39,15 +39,14 @@ <!-- Need to pull in org.eclipse.cdt.utils.pty for org.eclipse.remote.core to build --> <repository location="http://download.eclipse.org/releases/photon"/> </location> - <location includeAllPlatforms="false" includeConfigurePhase="false" 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="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.test.feature.group" version="0.0.0"/> -<unit id="org.eclipse.sdk.ide" version="0.0.0"/> <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/> +<unit id="org.eclipse.sdk.ide" version="0.0.0"/> +<unit id="org.eclipse.test.feature.group" version="0.0.0"/> <repository location="http://download.eclipse.org/eclipse/updates/4.8milestones/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -63,10 +62,10 @@ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/I-3.10.0-20180201205936/repository"/> </location> -<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.tm.terminal.control" version="0.0.0"/> <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/> -<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/> <repository location="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -82,6 +81,10 @@ <unit id="tm-feature.feature.group" version="0.0.0"/> <repository location="http://download.eclipse.org/tm4e/snapshots/"/> </location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.lsp4e" version="0.0.0"/> +<repository location="http://download.eclipse.org/lsp4e/snapshots/"/> +</location> </locations> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <launcherArgs> |