Skip to content
This repository was archived by the owner on Jan 11, 2019. It is now read-only.

Commit 3b02800

Browse files
author
Jay Jay Billings
committed
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: Jay Jay Billings <[email protected]>
1 parent d68a3fa commit 3b02800

File tree

284 files changed

+1433
-541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+1433
-541
lines changed

.DS_Store

-18 KB
Binary file not shown.

.project org.eclipse.ice.aggregator/.project

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>ice</name>
3+
<name>org.eclipse.ice.aggregator</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -10,11 +10,6 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.pde.ds.core.builder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
1813
</buildSpec>
1914
<natures>
2015
<nature>org.eclipse.m2e.core.maven2Nature</nature>

org.eclipse.ice.aggregator/pom.xml

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>org.eclipse.ice.aggregator</groupId>
4+
<artifactId>org.eclipse.ice.aggregator</artifactId>
5+
<packaging>pom</packaging>
6+
<name>Eclipse ICE Build Aggregator</name>
7+
<description>Aggregator Bundle for building Eclipse ICE</description>
8+
<parent>
9+
<groupId>org.eclipse.ice</groupId>
10+
<artifactId>org.eclipse.ice.build</artifactId>
11+
<version>2.1.8.20160208</version>
12+
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
13+
</parent>
14+
<modules>
15+
<module>../org.eclipse.ice.caebat.batml</module>
16+
<module>../org.eclipse.ice.caebat.batml.test</module>
17+
<module>../org.eclipse.ice.client</module>
18+
<module>../org.eclipse.ice.client.compatibility</module>
19+
<module>../org.eclipse.ice.client.rcp</module>
20+
<module>../org.eclipse.ice.client.test</module>
21+
<module>../org.eclipse.ice.client.widgets</module>
22+
<module>../org.eclipse.ice.client.widgets.moose</module>
23+
<module>../org.eclipse.ice.client.widgets.moose.test</module>
24+
<module>../org.eclipse.ice.client.widgets.test</module>
25+
<module>../org.eclipse.ice.client.widgets.test.utils</module>
26+
<module>../org.eclipse.ice.core</module>
27+
<module>../org.eclipse.ice.core.test</module>
28+
<module>../org.eclipse.ice.datastructures</module>
29+
<module>../org.eclipse.ice.datastructures.test</module>
30+
<module>../../ICEDeps/org.eclipse.ice.dependencies</module>
31+
<module>../org.eclipse.ice.developer</module>
32+
<module>../org.eclipse.ice.developer.moose</module>
33+
<module>../org.eclipse.ice.io</module>
34+
<module>../org.eclipse.ice.io.test</module>
35+
<module>../org.eclipse.ice.item</module>
36+
<module>../org.eclipse.ice.item.test</module>
37+
<module>../org.eclipse.ice.materials</module>
38+
<module>../org.eclipse.ice.materials.test</module>
39+
<module>../org.eclipse.ice.materials.ui</module>
40+
<module>../org.eclipse.ice.mesh</module>
41+
<module>../org.eclipse.ice.mesh.test</module>
42+
<module>../org.eclipse.ice.nek5000</module>
43+
<module>../org.eclipse.ice.nek5000.test</module>
44+
<module>../org.eclipse.ice.parent</module>
45+
<module>../org.eclipse.ice.persistence.xml</module>
46+
<module>../org.eclipse.ice.persistence.xml.test</module>
47+
<module>../org.eclipse.ice.projectgeneration</module>
48+
<module>../org.eclipse.ice.projectgeneration.test</module>
49+
<module>../org.eclipse.ice.proteus</module>
50+
<module>../org.eclipse.ice.proteus.test</module>
51+
<module>../org.eclipse.ice.reactor.plant</module>
52+
<module>../org.eclipse.ice.reactor.plant.test</module>
53+
<module>../org.eclipse.ice.reflectivity</module>
54+
<module>../org.eclipse.ice.reflectivity.test</module>
55+
<module>../org.eclipse.ice.reflectivity.ui</module>
56+
<module>../org.eclipse.ice.target.mars</module>
57+
<module>../org.eclipse.ice.vibe</module>
58+
<module>../org.eclipse.ice.vibe.test</module>
59+
<module>../org.eclipse.ice.viz</module>
60+
<module>../org.eclipse.ice.viz.service</module>
61+
<module>../org.eclipse.ice.viz.service.geometry</module>
62+
<module>../org.eclipse.ice.viz.service.geometry.test</module>
63+
<module>../org.eclipse.ice.viz.service.javafx</module>
64+
<module>../org.eclipse.ice.viz.service.javafx.geometry</module>
65+
<module>
66+
../org.eclipse.ice.viz.service.javafx.geometry.test
67+
</module>
68+
<module>../org.eclipse.ice.viz.service.javafx.mesh</module>
69+
<module>../org.eclipse.ice.viz.service.javafx.test</module>
70+
<module>../org.eclipse.ice.viz.service.mesh</module>
71+
<module>../org.eclipse.ice.viz.service.mesh.test</module>
72+
<module>../org.eclipse.ice.viz.service.paraview</module>
73+
<module>../org.eclipse.ice.viz.service.paraview.test</module>
74+
<module>../org.eclipse.ice.viz.service.paraview.web</module>
75+
<module>../org.eclipse.ice.viz.service.test</module>
76+
<module>../org.eclipse.ice.viz.service.visit</module>
77+
<module>../org.eclipse.ice.viz.service.visit.test</module>
78+
<module>../org.eclipse.ice.viz.test</module>
79+
<module>../org.eclipse.ice.feature</module>
80+
<module>../org.eclipse.ice.repository</module>
81+
</modules>
82+
</project>

org.eclipse.ice.caebat.batml.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
6-
<classpathentry kind="output" path="bin"/>
6+
<classpathentry kind="output" path="target/classes"/>
77
</classpath>

org.eclipse.ice.caebat.batml.test/.project

+6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,14 @@
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
2328
</buildSpec>
2429
<natures>
30+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2531
<nature>org.eclipse.pde.PluginNature</nature>
2632
<nature>org.eclipse.jdt.core.javanature</nature>
2733
</natures>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

org.eclipse.ice.caebat.batml.test/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>ICE</groupId>
7+
<groupId>org.eclipse.ice</groupId>
88
<artifactId>org.eclipse.ice.build</artifactId>
99
<version>2.1.8.20160208</version>
10-
<relativePath>../${pom-filename}</relativePath>
10+
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
1111
</parent>
12-
<groupId>ICE</groupId>
12+
<groupId>org.eclipse.ice</groupId>
1313
<artifactId>org.eclipse.ice.caebat.batml.test</artifactId>
1414
<packaging>eclipse-test-plugin</packaging>
1515
<properties>

org.eclipse.ice.caebat.batml/.classpath

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src"/>
6-
<classpathentry kind="output" path="bin"/>
5+
<classpathentry kind="src" path="src/"/>
6+
<classpathentry kind="src" path="data/"/>
7+
<classpathentry kind="output" path="target/classes"/>
78
</classpath>

org.eclipse.ice.caebat.batml/.project

+6
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@
2525
<arguments>
2626
</arguments>
2727
</buildCommand>
28+
<buildCommand>
29+
<name>org.eclipse.m2e.core.maven2Builder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
2833
</buildSpec>
2934
<natures>
35+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3036
<nature>org.eclipse.pde.PluginNature</nature>
3137
<nature>org.eclipse.jdt.core.javanature</nature>
3238
</natures>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

org.eclipse.ice.caebat.batml/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>ICE</groupId>
7+
<groupId>org.eclipse.ice</groupId>
88
<artifactId>org.eclipse.ice.build</artifactId>
99
<version>2.1.8.20160208</version>
10-
<relativePath>../${pom-filename}</relativePath>
10+
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
1111
</parent>
12-
<groupId>ICE</groupId>
12+
<groupId>org.eclipse.ice</groupId>
1313
<artifactId>org.eclipse.ice.caebat.batml</artifactId>
1414
<version>2.1.8.20160208</version>
1515
<packaging>eclipse-plugin</packaging>
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src"/>
6-
<classpathentry kind="output" path="bin"/>
5+
<classpathentry kind="src" path="src/"/>
6+
<classpathentry kind="output" path="target/classes"/>
77
</classpath>

org.eclipse.ice.client.compatibility/.project

+6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,14 @@
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
2328
</buildSpec>
2429
<natures>
30+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2531
<nature>org.eclipse.pde.PluginNature</nature>
2632
<nature>org.eclipse.jdt.core.javanature</nature>
2733
</natures>
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#Sat Nov 24 17:09:12 EST 2012
2-
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
41
eclipse.preferences.version=1
52
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.compliance=1.7
65
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.6
8-
org.eclipse.jdt.core.compiler.compliance=1.6
6+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7+
org.eclipse.jdt.core.compiler.source=1.7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

org.eclipse.ice.client.compatibility/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>ICE</groupId>
7+
<groupId>org.eclipse.ice</groupId>
88
<artifactId>org.eclipse.ice.build</artifactId>
99
<version>2.1.8.20160208</version>
10-
<relativePath>../${pom-filename}</relativePath>
10+
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
1111
</parent>
12-
<groupId>ICE</groupId>
12+
<groupId>org.eclipse.ice</groupId>
1313
<artifactId>org.eclipse.ice.client.compatibility</artifactId>
1414
<packaging>eclipse-plugin</packaging>
1515
</project>

org.eclipse.ice.client.rcp/.classpath

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src"/>
6-
<classpathentry kind="output" path="bin"/>
5+
<classpathentry kind="src" path="src/"/>
6+
<classpathentry kind="output" path="target/classes"/>
77
</classpath>

org.eclipse.ice.client.rcp/.project

+6
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,14 @@
3030
<arguments>
3131
</arguments>
3232
</buildCommand>
33+
<buildCommand>
34+
<name>org.eclipse.m2e.core.maven2Builder</name>
35+
<arguments>
36+
</arguments>
37+
</buildCommand>
3338
</buildSpec>
3439
<natures>
40+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3541
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
3642
<nature>org.eclipse.pde.PluginNature</nature>
3743
<nature>org.eclipse.jdt.core.javanature</nature>
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4-
org.eclipse.jdt.core.compiler.compliance=1.6
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.compliance=1.7
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.6
7+
org.eclipse.jdt.core.compiler.source=1.7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

org.eclipse.ice.client.rcp/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>ICE</groupId>
7+
<groupId>org.eclipse.ice</groupId>
88
<artifactId>org.eclipse.ice.build</artifactId>
99
<version>2.1.8.20160208</version>
10-
<relativePath>../${pom-filename}</relativePath>
10+
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
1111
</parent>
12-
<groupId>ICE</groupId>
12+
<groupId>org.eclipse.ice</groupId>
1313
<artifactId>org.eclipse.ice.client.rcp</artifactId>
1414
<packaging>eclipse-plugin</packaging>
1515
</project>
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4-
<classpathentry kind="src" path="src"/>
53
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6-
<classpathentry kind="output" path="bin"/>
4+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5+
<classpathentry kind="src" path="src/"/>
6+
<classpathentry kind="output" path="target/classes"/>
77
</classpath>

org.eclipse.ice.client.test/.project

+6
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@
2525
<arguments>
2626
</arguments>
2727
</buildCommand>
28+
<buildCommand>
29+
<name>org.eclipse.m2e.core.maven2Builder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
2833
</buildSpec>
2934
<natures>
35+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3036
<nature>org.eclipse.pde.PluginNature</nature>
3137
<nature>org.eclipse.jdt.core.javanature</nature>
3238
<nature>net.sourceforge.metrics.nature</nature>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

org.eclipse.ice.client.test/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>ICE</groupId>
7+
<groupId>org.eclipse.ice</groupId>
88
<artifactId>org.eclipse.ice.build</artifactId>
99
<version>2.1.8.20160208</version>
10-
<relativePath>../${pom-filename}</relativePath>
10+
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
1111
</parent>
12-
<groupId>ICE</groupId>
12+
<groupId>org.eclipse.ice</groupId>
1313
<artifactId>org.eclipse.ice.client.test</artifactId>
1414
<packaging>eclipse-test-plugin</packaging>
1515

org.eclipse.ice.client.widgets.moose.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
6-
<classpathentry kind="output" path="bin"/>
6+
<classpathentry kind="output" path="target/classes"/>
77
</classpath>

org.eclipse.ice.client.widgets.moose.test/.project

+6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,14 @@
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
2328
</buildSpec>
2429
<natures>
30+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2531
<nature>org.eclipse.pde.PluginNature</nature>
2632
<nature>org.eclipse.jdt.core.javanature</nature>
2733
</natures>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

0 commit comments

Comments
 (0)