Permalink
Browse files

* Enabled Equinox weaving at the feature-level so we can avoid having to

  modify the org.eclipse.equinox.weaving.aspectj bundle, and hence use
  the AJDT p2 repositories directly rather than using our own locally
  modified repository.
* Tidied up the Galileo/Helios Maven profiles slightly. Helios has it's
  own branch, so there's no need for a variant name for the update site
  output.
  • Loading branch information...
1 parent cab036f commit 163da90f33cd2738356091d5a297892ac0e4cf56 @milessabin milessabin committed Jul 29, 2010
Showing with 48 additions and 24 deletions.
  1. +16 −23 org.scala-ide.build/pom.xml
  2. +3 −1 org.scala-ide.sdt.feature/build.properties
  3. +29 −0 org.scala-ide.sdt.feature/p2.inf
View
39 org.scala-ide.build/pom.xml
@@ -64,14 +64,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
</plugin>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <target>${project.build.directory}/${update-site.name}</target>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -94,14 +86,6 @@
</build>
<repositories>
<repository>
- <id>jdt-weaving</id>
- <name>JDT Weaving p2 repository</name>
- <layout>p2</layout>
- <url>http://download.scala-ide.org/jdt-weaving</url>
- <!--url>http://download.eclipse.org/tools/ajdt/35/update</url-->
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
<id>scala-refactoring</id>
<name>Scala Refactoring p2 repository</name>
<layout>p2</layout>
@@ -152,29 +136,38 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <properties>
- <!--update-site.name>site-galileo</update-site.name-->
- <update-site.name>site</update-site.name>
- </properties>
<repositories>
<repository>
<id>galileo</id>
+ <name>Eclipse Galileo p2 repository</name>
+ <layout>p2</layout>
<url>http://download.eclipse.org/releases/galileo/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ </repository>
+ <repository>
+ <id>ajdt-galileo</id>
+ <name>AJDT for Eclipse Galileo p2 repository</name>
<layout>p2</layout>
+ <url>http://download.eclipse.org/tools/ajdt/35/update</url>
<snapshots><enabled>false</enabled></snapshots>
</repository>
</repositories>
</profile>
<profile>
<id>helios</id>
- <properties>
- <update-site.name>site-helios</update-site.name>
- </properties>
<repositories>
<repository>
<id>helios</id>
+ <name>Eclipse Helios p2 repository</name>
+ <layout>p2</layout>
<url>http://download.eclipse.org/releases/helios/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ </repository>
+ <repository>
+ <id>ajdt-helios</id>
+ <name>AJDT for Eclipse Helios p2 repository</name>
<layout>p2</layout>
+ <url>http://download.eclipse.org/tools/ajdt/36/update</url>
<snapshots><enabled>false</enabled></snapshots>
</repository>
</repositories>
View
4 org.scala-ide.sdt.feature/build.properties
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = \
+feature.xml,\
+p2.inf
View
29 org.scala-ide.sdt.feature/p2.inf
@@ -0,0 +1,29 @@
+#create a requirement on the fragment we are creating
+requires.0.namespace=org.eclipse.equinox.p2.iu
+requires.0.name=configure.org.eclipse.equinox.weaving.aspectj
+requires.0.greedy=true
+
+#create a IU fragment named configure.org.eclipse.equinox.weaving.aspectj
+units.0.id=configure.org.eclipse.equinox.weaving.aspectj
+units.0.version=1.0.0
+units.0.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.0.provides.1.name=configure.org.eclipse.equinox.weaving.aspectj
+units.0.provides.1.version=1.0.0
+units.0.instructions.install=org.eclipse.equinox.p2.touchpoint.eclipse.installBundle(bundle:${artifact});
+units.0.instructions.uninstall=org.eclipse.equinox.p2.touchpoint.eclipse.uninstallBundle(bundle:${artifact});
+units.0.instructions.unconfigure=\
+ org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel:-1); \
+ org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started:false);
+units.0.instructions.configure=\
+ org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel:4); \
+ org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started:true);
+units.0.hostRequirements.1.namespace=osgi.bundle
+units.0.hostRequirements.1.name=org.eclipse.equinox.weaving.aspectj
+units.0.hostRequirements.1.greedy=false
+units.0.hostRequirements.2.namespace=org.eclipse.equinox.p2.eclipse.type
+units.0.hostRequirements.2.name=bundle
+units.0.hostRequirements.2.range=[1.0.0,2.0.0)
+units.0.hostRequirements.2.greedy=false
+units.0.requires.1.namespace=osgi.bundle
+units.0.requires.1.name=org.eclipse.equinox.weaving.aspectj
+units.0.requires.1.greedy=false

0 comments on commit 163da90

Please sign in to comment.