Commit 3b028003 authored by Jay Jay Billings's avatar Jay Jay Billings
Browse files

Reworked the build. Fixed many Maven and Tycho sins.



ICE now uses an aggregator pom instead of combining the list of modules
with the parent. Both the parent and the aggregrator are in their own
bundles. Every other bundle has been redirected to point to the new
parent and all ICE bundles are now Maven projects. It is no longer
necessary to install the build bundle. Now, just go into the
org.eclipse.ice.aggregator directory and run "mvn clean verify" from the
CLI or run the build with these goals from the Maven run configuration.
Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
parent d68a3fad
File deleted
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ice</name>
<name>org.eclipse.ice.aggregator</name>
<comment></comment>
<projects>
</projects>
......@@ -10,11 +10,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ds.core.builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
......
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ice.aggregator</groupId>
<artifactId>org.eclipse.ice.aggregator</artifactId>
<packaging>pom</packaging>
<name>Eclipse ICE Build Aggregator</name>
<description>Aggregator Bundle for building Eclipse ICE</description>
<parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.8.20160208</version>
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<modules>
<module>../org.eclipse.ice.caebat.batml</module>
<module>../org.eclipse.ice.caebat.batml.test</module>
<module>../org.eclipse.ice.client</module>
<module>../org.eclipse.ice.client.compatibility</module>
<module>../org.eclipse.ice.client.rcp</module>
<module>../org.eclipse.ice.client.test</module>
<module>../org.eclipse.ice.client.widgets</module>
<module>../org.eclipse.ice.client.widgets.moose</module>
<module>../org.eclipse.ice.client.widgets.moose.test</module>
<module>../org.eclipse.ice.client.widgets.test</module>
<module>../org.eclipse.ice.client.widgets.test.utils</module>
<module>../org.eclipse.ice.core</module>
<module>../org.eclipse.ice.core.test</module>
<module>../org.eclipse.ice.datastructures</module>
<module>../org.eclipse.ice.datastructures.test</module>
<module>../../ICEDeps/org.eclipse.ice.dependencies</module>
<module>../org.eclipse.ice.developer</module>
<module>../org.eclipse.ice.developer.moose</module>
<module>../org.eclipse.ice.io</module>
<module>../org.eclipse.ice.io.test</module>
<module>../org.eclipse.ice.item</module>
<module>../org.eclipse.ice.item.test</module>
<module>../org.eclipse.ice.materials</module>
<module>../org.eclipse.ice.materials.test</module>
<module>../org.eclipse.ice.materials.ui</module>
<module>../org.eclipse.ice.mesh</module>
<module>../org.eclipse.ice.mesh.test</module>
<module>../org.eclipse.ice.nek5000</module>
<module>../org.eclipse.ice.nek5000.test</module>
<module>../org.eclipse.ice.parent</module>
<module>../org.eclipse.ice.persistence.xml</module>
<module>../org.eclipse.ice.persistence.xml.test</module>
<module>../org.eclipse.ice.projectgeneration</module>
<module>../org.eclipse.ice.projectgeneration.test</module>
<module>../org.eclipse.ice.proteus</module>
<module>../org.eclipse.ice.proteus.test</module>
<module>../org.eclipse.ice.reactor.plant</module>
<module>../org.eclipse.ice.reactor.plant.test</module>
<module>../org.eclipse.ice.reflectivity</module>
<module>../org.eclipse.ice.reflectivity.test</module>
<module>../org.eclipse.ice.reflectivity.ui</module>
<module>../org.eclipse.ice.target.mars</module>
<module>../org.eclipse.ice.vibe</module>
<module>../org.eclipse.ice.vibe.test</module>
<module>../org.eclipse.ice.viz</module>
<module>../org.eclipse.ice.viz.service</module>
<module>../org.eclipse.ice.viz.service.geometry</module>
<module>../org.eclipse.ice.viz.service.geometry.test</module>
<module>../org.eclipse.ice.viz.service.javafx</module>
<module>../org.eclipse.ice.viz.service.javafx.geometry</module>
<module>
../org.eclipse.ice.viz.service.javafx.geometry.test
</module>
<module>../org.eclipse.ice.viz.service.javafx.mesh</module>
<module>../org.eclipse.ice.viz.service.javafx.test</module>
<module>../org.eclipse.ice.viz.service.mesh</module>
<module>../org.eclipse.ice.viz.service.mesh.test</module>
<module>../org.eclipse.ice.viz.service.paraview</module>
<module>../org.eclipse.ice.viz.service.paraview.test</module>
<module>../org.eclipse.ice.viz.service.paraview.web</module>
<module>../org.eclipse.ice.viz.service.test</module>
<module>../org.eclipse.ice.viz.service.visit</module>
<module>../org.eclipse.ice.viz.service.visit.test</module>
<module>../org.eclipse.ice.viz.test</module>
<module>../org.eclipse.ice.feature</module>
<module>../org.eclipse.ice.repository</module>
</modules>
</project>
\ No newline at end of file
......@@ -3,5 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
......@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
......
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
......@@ -4,12 +4,12 @@
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>ICE</groupId>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.8.20160208</version>
<relativePath>../${pom-filename}</relativePath>
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<groupId>ICE</groupId>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.caebat.batml.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
......
......@@ -2,6 +2,7 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="data/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
......@@ -25,8 +25,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
......
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
......@@ -4,12 +4,12 @@
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>ICE</groupId>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.8.20160208</version>
<relativePath>../${pom-filename}</relativePath>
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<groupId>ICE</groupId>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.caebat.batml</artifactId>
<version>2.1.8.20160208</version>
<packaging>eclipse-plugin</packaging>
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
......@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
......
#Sat Nov 24 17:09:12 EST 2012
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
......@@ -4,12 +4,12 @@
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>ICE</groupId>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.8.20160208</version>
<relativePath>../${pom-filename}</relativePath>
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<groupId>ICE</groupId>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.client.compatibility</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
......@@ -30,8 +30,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
......
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.7
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment