Skip to content

Commit

Permalink
Issue NineWorlds#44 Migrate build to feature build for finer control
Browse files Browse the repository at this point in the history
  • Loading branch information
kingargyle committed Jun 22, 2017
1 parent 89a41a5 commit ba37c91
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 122 deletions.
17 changes: 17 additions & 0 deletions bundles/us.nineworlds.xstreamer.feature/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>us.nineworlds.xstreamer.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
1 change: 1 addition & 0 deletions bundles/us.nineworlds.xstreamer.feature/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin.includes = feature.xml
67 changes: 67 additions & 0 deletions bundles/us.nineworlds.xstreamer.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="us.nineworlds.xstreamer.feature"
label="XStreamer Feature"
version="0.6.0.qualifier"
plugin="us.nineworlds.xstreamer.branding">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
</license>

<plugin
id="us.nineworlds.xstreamer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="us.nineworlds.xstreamer.branding"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="us.nineworlds.xstreamer.browser"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="us.nineworlds.xstreamer.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="us.nineworlds.xstreamer.data"
download-size="0"
install-size="0"
version="0.0.0"/>

<plugin
id="us.nineworlds.xstreamer.lib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="us.nineworlds.xstreamer.templates"
download-size="0"
install-size="0"
version="0.0.0"/>

</feature>
16 changes: 16 additions & 0 deletions bundles/us.nineworlds.xstreamer.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?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>us.nineworlds.xstreamer</groupId>
<artifactId>xstreamer</artifactId>
<version>0.6.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>us.nineworlds.xstreamer</groupId>
<artifactId>us.nineworlds.xstreamer.feature</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<packaging>pom</packaging>
<modules>
<module>releng/us.nineworlds.xstreamer.target</module>
<module>bundles/us.nineworlds.xstreamer.feature</module>
<module>bundles/us.nineworlds.xstreamer</module>
<module>bundles/us.nineworlds.xstreamer.browser</module>
<module>bundles/us.nineworlds.xstreamer.core</module>
Expand Down
128 changes: 6 additions & 122 deletions releng/us.nineworlds.xstreamer.product/xstreamer.product
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="XStreamer" uid="us.nineworlds.xstreamer.xstreamer" id="us.nineworlds.xstreamer.product" application="us.nineworlds.xstreamer.application" version="0.6.0.qualifier" useFeatures="false" includeLaunchers="true">
<product name="XStreamer" uid="us.nineworlds.xstreamer.xstreamer" id="us.nineworlds.xstreamer.product" application="us.nineworlds.xstreamer.application" version="0.6.0.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="/us.nineworlds.xstreamer.branding/images/xstreamer_lg.png"/>
Expand Down Expand Up @@ -37,136 +37,20 @@ Version 0.5.0
</win>
</launcher>


<vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
</vm>

<plugins>
<plugin id="com.ibm.icu"/>
<plugin id="javax.inject"/>
<plugin id="javax.servlet"/>
<plugin id="javax.xml"/>
<plugin id="org.apache.batik.css"/>
<plugin id="org.apache.batik.util"/>
<plugin id="org.apache.batik.util.gui"/>
<plugin id="org.apache.commons.io"/>
<plugin id="org.apache.commons.jxpath"/>
<plugin id="org.apache.commons.lang"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.eclipse.ant.core"/>
<plugin id="org.eclipse.compare.core"/>
<plugin id="org.eclipse.core.commands"/>
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.databinding"/>
<plugin id="org.eclipse.core.databinding.observable"/>
<plugin id="org.eclipse.core.databinding.property"/>
<plugin id="org.eclipse.core.expressions"/>
<plugin id="org.eclipse.core.filebuffers"/>
<plugin id="org.eclipse.core.filesystem"/>
<plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.resources"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.variables"/>
<plugin id="org.eclipse.e4.core.commands"/>
<plugin id="org.eclipse.e4.core.contexts"/>
<plugin id="org.eclipse.e4.core.di"/>
<plugin id="org.eclipse.e4.core.di.annotations"/>
<plugin id="org.eclipse.e4.core.di.extensions"/>
<plugin id="org.eclipse.e4.core.services"/>
<plugin id="org.eclipse.e4.emf.xpath"/>
<plugin id="org.eclipse.e4.ui.bindings"/>
<plugin id="org.eclipse.e4.ui.css.core"/>
<plugin id="org.eclipse.e4.ui.css.swt"/>
<plugin id="org.eclipse.e4.ui.css.swt.theme"/>
<plugin id="org.eclipse.e4.ui.di"/>
<plugin id="org.eclipse.e4.ui.model.workbench"/>
<plugin id="org.eclipse.e4.ui.services"/>
<plugin id="org.eclipse.e4.ui.swt.gtk" fragment="true"/>
<plugin id="org.eclipse.e4.ui.widgets"/>
<plugin id="org.eclipse.e4.ui.workbench"/>
<plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
<plugin id="org.eclipse.e4.ui.workbench.swt"/>
<plugin id="org.eclipse.e4.ui.workbench3"/>
<plugin id="org.eclipse.emf.common"/>
<plugin id="org.eclipse.emf.ecore"/>
<plugin id="org.eclipse.emf.ecore.change"/>
<plugin id="org.eclipse.emf.ecore.xmi"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.bidi"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.ds"/>
<plugin id="org.eclipse.equinox.event"/>
<plugin id="org.eclipse.equinox.p2.core"/>
<plugin id="org.eclipse.equinox.p2.engine"/>
<plugin id="org.eclipse.equinox.p2.metadata"/>
<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
<plugin id="org.eclipse.equinox.p2.repository"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.region" fragment="true"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
<plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
<plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
<plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>
<plugin id="org.eclipse.equinox.util"/>
<plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.jface"/>
<plugin id="org.eclipse.jface.databinding"/>
<plugin id="org.eclipse.jface.text"/>
<plugin id="org.eclipse.ltk.core.refactoring"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.osgi.util"/>
<plugin id="org.eclipse.swt"/>
<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.aix.ppc" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.aix.ppc64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.hpux.ia64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.ppc" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.ppc64le" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.s390" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.s390x" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.solaris.sparcv9" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.solaris.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.team.core"/>
<plugin id="org.eclipse.text"/>
<plugin id="org.eclipse.ui"/>
<plugin id="org.eclipse.ui.cocoa" fragment="true"/>
<plugin id="org.eclipse.ui.console"/>
<plugin id="org.eclipse.ui.forms"/>
<plugin id="org.eclipse.ui.ide"/>
<plugin id="org.eclipse.ui.views"/>
<plugin id="org.eclipse.ui.workbench"/>
<plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.slf4j.api"/>
<plugin id="org.tukaani.xz"/>
<plugin id="org.w3c.css.sac"/>
<plugin id="org.w3c.dom.events"/>
<plugin id="org.w3c.dom.smil"/>
<plugin id="org.w3c.dom.svg"/>
<plugin id="us.nineworlds.xstreamer"/>
<plugin id="us.nineworlds.xstreamer.branding"/>
<plugin id="us.nineworlds.xstreamer.browser"/>
<plugin id="us.nineworlds.xstreamer.core"/>
<plugin id="us.nineworlds.xstreamer.data"/>
<plugin id="us.nineworlds.xstreamer.lib"/>
<plugin id="us.nineworlds.xstreamer.templates"/>
</plugins>

<features>
<feature id="us.nineworlds.xstreamer.feature"/>
<feature id="org.eclipse.rcp"/>
</features>

<configurations>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
Expand Down

0 comments on commit ba37c91

Please sign in to comment.