aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2013-05-13 10:36:49 (EDT)
committerThomas Watson2013-05-13 10:56:16 (EDT)
commit8f4dc6841991e7a9977e40c8bad5dd8bc39b641e (patch)
tree59ad4deb6b533810ea36cc8fa91e91ed0213c820
parentf31c03106dfcef1529c898c4255c30571e54836b (diff)
downloadrt.equinox.framework-8f4dc6841991e7a9977e40c8bad5dd8bc39b641e.zip
rt.equinox.framework-8f4dc6841991e7a9977e40c8bad5dd8bc39b641e.tar.gz
rt.equinox.framework-8f4dc6841991e7a9977e40c8bad5dd8bc39b641e.tar.bz2
Bug 407201 - Source bundles for org.eclipse.osgi.services and -.util broken
Fix root="" instead of root="." in sources
-rw-r--r--bundles/org.eclipse.osgi.services/build.properties2
-rw-r--r--bundles/org.eclipse.osgi.services/pom.xml11
-rw-r--r--bundles/org.eclipse.osgi.util/build.properties2
-rw-r--r--bundles/org.eclipse.osgi.util/pom.xml11
4 files changed, 26 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi.services/build.properties b/bundles/org.eclipse.osgi.services/build.properties
index 46cc6dc..93759ae 100644
--- a/bundles/org.eclipse.osgi.services/build.properties
+++ b/bundles/org.eclipse.osgi.services/build.properties
@@ -16,5 +16,7 @@ src.includes = plugin.properties,\
about.html,\
about_files/
customBuildCallbacks=customBuildCallbacks.xml
+source.. = .
+output.. = .
javacSource = 1.5
javacTarget = 1.5
diff --git a/bundles/org.eclipse.osgi.services/pom.xml b/bundles/org.eclipse.osgi.services/pom.xml
index 35a1e53..0b80fff 100644
--- a/bundles/org.eclipse.osgi.services/pom.xml
+++ b/bundles/org.eclipse.osgi.services/pom.xml
@@ -59,6 +59,17 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
diff --git a/bundles/org.eclipse.osgi.util/build.properties b/bundles/org.eclipse.osgi.util/build.properties
index 46cc6dc..a4fb373 100644
--- a/bundles/org.eclipse.osgi.util/build.properties
+++ b/bundles/org.eclipse.osgi.util/build.properties
@@ -15,6 +15,8 @@ bin.includes = plugin.properties,\
src.includes = plugin.properties,\
about.html,\
about_files/
+source.. = .
+output.. = .
customBuildCallbacks=customBuildCallbacks.xml
javacSource = 1.5
javacTarget = 1.5
diff --git a/bundles/org.eclipse.osgi.util/pom.xml b/bundles/org.eclipse.osgi.util/pom.xml
index 4e57146..4d8def4 100644
--- a/bundles/org.eclipse.osgi.util/pom.xml
+++ b/bundles/org.eclipse.osgi.util/pom.xml
@@ -44,6 +44,17 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>