Skip to content

Commit

Permalink
Leverage Tycho-pomless
Browse files Browse the repository at this point in the history
  • Loading branch information
HannesWell committed Nov 4, 2023
1 parent 21fdb0e commit 329c497
Show file tree
Hide file tree
Showing 24 changed files with 97 additions and 349 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
bin/
*.log
target/
.polyglot.*
pom.tycho
9 changes: 9 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<extensions>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>4.0.3</version>
</extension>
</extensions>
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt.tools.base/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ bin.includes = about.html,\
META-INF/,\
.
src.includes = about.html

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
24 changes: 0 additions & 24 deletions bundles/org.eclipse.swt.tools.base/pom.xml

This file was deleted.

3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt.tools.spies/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ bin.includes = about.html,\
output.. = bin/
source.. = src/
src.includes = about.html

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
24 changes: 0 additions & 24 deletions bundles/org.eclipse.swt.tools.spies/pom.xml

This file was deleted.

3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt.tools/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ source.. = src/,\
JavadocBasher/
src.includes = about.html
bin.excludes = META-INF/p2.inf

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
24 changes: 0 additions & 24 deletions bundles/org.eclipse.swt.tools/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ bin.includes = doc-html/,\
icons/,\
META-INF/
src.includes=about.html

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
24 changes: 0 additions & 24 deletions examples/org.eclipse.swt.examples.browser.demos/pom.xml

This file was deleted.

3 changes: 3 additions & 0 deletions examples/org.eclipse.swt.examples.launcher/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ bin.includes = doc/,\
src.includes = about.html

source.. = src/

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
24 changes: 0 additions & 24 deletions examples/org.eclipse.swt.examples.launcher/pom.xml

This file was deleted.

3 changes: 3 additions & 0 deletions examples/org.eclipse.swt.examples.views/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ bin.includes = doc-html/,\
src.includes = about.html

source.. = src/

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
24 changes: 0 additions & 24 deletions examples/org.eclipse.swt.examples.views/pom.xml

This file was deleted.

3 changes: 3 additions & 0 deletions examples/org.eclipse.swt.examples/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ src.includes = about.html,\
doc-html/

source.. = src/

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
24 changes: 0 additions & 24 deletions examples/org.eclipse.swt.examples/pom.xml

This file was deleted.

55 changes: 0 additions & 55 deletions features/org.eclipse.swt.tools.feature/pom.xml

This file was deleted.

41 changes: 40 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<environments>
<environment>
Expand All @@ -180,6 +179,46 @@
</plugins>
</build>
</profile>
<profile>
<id>generate-feature-source</id>
<activation>
<file>
<exists>feature.xml</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<phase>package</phase>
<id>feature-source</id>
<goals>
<goal>feature-source</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>


Expand Down
8 changes: 8 additions & 0 deletions tests/org.eclipse.swt.tests.cocoa/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@ source..=JUnit Tests/

bin.includes = .,\
META-INF/

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
pom.model.packaging = eclipse-test-plugin
pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines)
pom.model.property.skipNativeTests = true
pom.model.property.skipTests = ${skipNativeTests}
Loading

0 comments on commit 329c497

Please sign in to comment.