[eclipse-poky] [PATCH 20/23] org.yocto.sdk.releng: change target to be pokywithrse
Tim Orling
timothy.t.orling at linux.intel.com
Thu Feb 8 23:17:54 PST 2018
The Tycho plugin prevents us from having target files in
other than the root of the target project. Since the file
that we were using "poky.target" was just a copy of the
"pokywithrse.target", make it obvious that is what is
being used.
Signed-off-by: Tim Orling <timothy.t.orling at linux.intel.com>
---
pom.xml | 4 +-
releng/org.yocto.sdk.releng/poky.target | 85 ----------------------
.../{targets => }/pokywithrse.target | 0
releng/org.yocto.sdk.releng/pom.xml | 6 +-
4 files changed, 5 insertions(+), 90 deletions(-)
delete mode 100644 releng/org.yocto.sdk.releng/poky.target
rename releng/org.yocto.sdk.releng/{targets => }/pokywithrse.target (100%)
diff --git a/pom.xml b/pom.xml
index 67397df55b4..8d3fc46e9e0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<properties>
<tycho-version>1.0.0</tycho-version>
<tycho-extras-version>1.0.0</tycho-extras-version>
- <target-platform>poky</target-platform>
+ <target-platform>pokywithrse</target-platform>
<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.7</help-docs-eclipserun-repo>
<tycho.scmUrl>scm:git:https://github.com/crops/eclipse-poky.git</tycho.scmUrl>
<base.test.vmargs>-Xms256m -Xmx512m -ea</base.test.vmargs>
@@ -349,7 +349,7 @@
<target>
<artifact>
<groupId>org.yocto.releng</groupId>
- <artifactId>poky</artifactId>
+ <artifactId>pokywithrse</artifactId>
<classifier>${target-platform}</classifier>
<version>${project.version}</version>
</artifact>
diff --git a/releng/org.yocto.sdk.releng/poky.target b/releng/org.yocto.sdk.releng/poky.target
deleted file mode 100644
index c44a275e58b..00000000000
--- a/releng/org.yocto.sdk.releng/poky.target
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="Poky With RSE" sequenceNumber="28">
-<locations>
-<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.remote.serial.feature.group" version="3.0.0.201706052031"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.autotools.feature.group" version="9.4.0.201712020452"/>
-<unit id="org.eclipse.cdt.autotools.source.feature.group" version="9.4.0.201712020452"/>
-<unit id="org.eclipse.cdt.docker.launcher.feature.group" version="9.4.0.201712020452"/>
-<unit id="org.eclipse.cdt.docker.launcher.source.feature.group" version="9.4.0.201712020452"/>
-<unit id="org.eclipse.cdt.launch.remote.feature.group" version="9.4.0.201712020452"/>
-<unit id="org.eclipse.cdt.launch.remote.source.feature.group" version="9.4.0.201712020452"/>
-<unit id="org.eclipse.cdt.sdk.feature.group" version="9.4.0.201712020452"/>
-<unit id="org.eclipse.launchbar.feature.group" version="2.2.0.201711162100"/>
-<unit id="org.eclipse.launchbar.remote.feature.group" version="2.2.0.201711162100"/>
-<repository location="http://download.eclipse.org/tools/cdt/releases/9.4"/>
-</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.linuxtools.docker.feature.feature.group" version="3.2.0.201712060514"/>
-<unit id="org.eclipse.linuxtools.docker.feature.source.feature.group" version="3.2.0.201712060514"/>
-<repository location="http://download.eclipse.org/linuxtools/update-docker-3.2.0"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tracecompass.btf.feature.group" version="3.2.0.201712061002"/>
-<unit id="org.eclipse.tracecompass.gdbtrace.feature.group" version="3.2.0.201712061002"/>
-<unit id="org.eclipse.tracecompass.lttng2.kernel.feature.group" version="3.2.0.201712061002"/>
-<unit id="org.eclipse.tracecompass.lttng2.ust.feature.group" version="3.2.0.201712061002"/>
-<unit id="org.eclipse.tracecompass.tmf.pcap.feature.group" version="3.2.0.201712061002"/>
-<repository location="http://download.eclipse.org/tracecompass/oxygen/stable/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.6.0.201706141832"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.6.0.201706141832"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.6.0.201706141832"/>
-<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.9.1.v201707252002"/>
-<repository location="http://download.eclipse.org/releases/oxygen"/>
-</location>
-<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="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"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<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.7/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/>
-<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201505221634"/>
-<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201505221634"/>
-<unit id="org.eclipse.rse.terminals.source.feature.group" version="3.8.0.201505221634"/>
-<unit id="org.eclipse.rse.useractions.feature.group" version="3.7.0.201505221634"/>
-<repository location="http://download.eclipse.org/tm/updates/4.0"/>
-</location>
-</locations>
-<environment>
-<os>linux</os>
-<ws>gtk</ws>
-<arch>x86_64</arch>
-<nl>en_US</nl>
-</environment>
-</target>
diff --git a/releng/org.yocto.sdk.releng/targets/pokywithrse.target b/releng/org.yocto.sdk.releng/pokywithrse.target
similarity index 100%
rename from releng/org.yocto.sdk.releng/targets/pokywithrse.target
rename to releng/org.yocto.sdk.releng/pokywithrse.target
diff --git a/releng/org.yocto.sdk.releng/pom.xml b/releng/org.yocto.sdk.releng/pom.xml
index 32a5eb1922c..2fc9d4001c6 100755
--- a/releng/org.yocto.sdk.releng/pom.xml
+++ b/releng/org.yocto.sdk.releng/pom.xml
@@ -11,7 +11,7 @@
</parent>
<groupId>org.yocto.releng</groupId>
- <artifactId>poky</artifactId>
+ <artifactId>pokywithrse</artifactId>
<packaging>eclipse-target-definition</packaging>
<name>Yocto Project Eclipse Poky Target</name>
@@ -31,9 +31,9 @@
<configuration>
<artifacts>
<artifact>
- <file>targets/pokywithrse.target</file>
+ <file>pokywithrse.target</file>
<type>target</type>
- <classifier>poky</classifier>
+ <classifier>pokywithrse</classifier>
</artifact>
</artifacts>
</configuration>
--
2.13.6
More information about the eclipse-yocto
mailing list