Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

* 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...
commit 163da90f33cd2738356091d5a297892ac0e4cf56 1 parent cab036f
Miles Sabin milessabin authored
39 org.scala-ide.build/pom.xml
@@ -64,14 +64,6 @@
64 64 <artifactId>maven-dependency-plugin</artifactId>
65 65 <version>2.1</version>
66 66 </plugin>
67   - <plugin>
68   - <groupId>org.sonatype.tycho</groupId>
69   - <artifactId>maven-osgi-packaging-plugin</artifactId>
70   - <version>${tycho.version}</version>
71   - <configuration>
72   - <target>${project.build.directory}/${update-site.name}</target>
73   - </configuration>
74   - </plugin>
75 67 </plugins>
76 68 </pluginManagement>
77 69 <plugins>
@@ -94,14 +86,6 @@
94 86 </build>
95 87 <repositories>
96 88 <repository>
97   - <id>jdt-weaving</id>
98   - <name>JDT Weaving p2 repository</name>
99   - <layout>p2</layout>
100   - <url>http://download.scala-ide.org/jdt-weaving</url>
101   - <!--url>http://download.eclipse.org/tools/ajdt/35/update</url-->
102   - <snapshots><enabled>false</enabled></snapshots>
103   - </repository>
104   - <repository>
105 89 <id>scala-refactoring</id>
106 90 <name>Scala Refactoring p2 repository</name>
107 91 <layout>p2</layout>
@@ -152,29 +136,38 @@
152 136 <activation>
153 137 <activeByDefault>true</activeByDefault>
154 138 </activation>
155   - <properties>
156   - <!--update-site.name>site-galileo</update-site.name-->
157   - <update-site.name>site</update-site.name>
158   - </properties>
159 139 <repositories>
160 140 <repository>
161 141 <id>galileo</id>
  142 + <name>Eclipse Galileo p2 repository</name>
  143 + <layout>p2</layout>
162 144 <url>http://download.eclipse.org/releases/galileo/</url>
  145 + <snapshots><enabled>false</enabled></snapshots>
  146 + </repository>
  147 + <repository>
  148 + <id>ajdt-galileo</id>
  149 + <name>AJDT for Eclipse Galileo p2 repository</name>
163 150 <layout>p2</layout>
  151 + <url>http://download.eclipse.org/tools/ajdt/35/update</url>
164 152 <snapshots><enabled>false</enabled></snapshots>
165 153 </repository>
166 154 </repositories>
167 155 </profile>
168 156 <profile>
169 157 <id>helios</id>
170   - <properties>
171   - <update-site.name>site-helios</update-site.name>
172   - </properties>
173 158 <repositories>
174 159 <repository>
175 160 <id>helios</id>
  161 + <name>Eclipse Helios p2 repository</name>
  162 + <layout>p2</layout>
176 163 <url>http://download.eclipse.org/releases/helios/</url>
  164 + <snapshots><enabled>false</enabled></snapshots>
  165 + </repository>
  166 + <repository>
  167 + <id>ajdt-helios</id>
  168 + <name>AJDT for Eclipse Helios p2 repository</name>
177 169 <layout>p2</layout>
  170 + <url>http://download.eclipse.org/tools/ajdt/36/update</url>
178 171 <snapshots><enabled>false</enabled></snapshots>
179 172 </repository>
180 173 </repositories>
4 org.scala-ide.sdt.feature/build.properties
... ... @@ -1 +1,3 @@
1   -bin.includes = feature.xml
  1 +bin.includes = \
  2 +feature.xml,\
  3 +p2.inf
29 org.scala-ide.sdt.feature/p2.inf
... ... @@ -0,0 +1,29 @@
  1 +#create a requirement on the fragment we are creating
  2 +requires.0.namespace=org.eclipse.equinox.p2.iu
  3 +requires.0.name=configure.org.eclipse.equinox.weaving.aspectj
  4 +requires.0.greedy=true
  5 +
  6 +#create a IU fragment named configure.org.eclipse.equinox.weaving.aspectj
  7 +units.0.id=configure.org.eclipse.equinox.weaving.aspectj
  8 +units.0.version=1.0.0
  9 +units.0.provides.1.namespace=org.eclipse.equinox.p2.iu
  10 +units.0.provides.1.name=configure.org.eclipse.equinox.weaving.aspectj
  11 +units.0.provides.1.version=1.0.0
  12 +units.0.instructions.install=org.eclipse.equinox.p2.touchpoint.eclipse.installBundle(bundle:${artifact});
  13 +units.0.instructions.uninstall=org.eclipse.equinox.p2.touchpoint.eclipse.uninstallBundle(bundle:${artifact});
  14 +units.0.instructions.unconfigure=\
  15 + org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel:-1); \
  16 + org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started:false);
  17 +units.0.instructions.configure=\
  18 + org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel:4); \
  19 + org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started:true);
  20 +units.0.hostRequirements.1.namespace=osgi.bundle
  21 +units.0.hostRequirements.1.name=org.eclipse.equinox.weaving.aspectj
  22 +units.0.hostRequirements.1.greedy=false
  23 +units.0.hostRequirements.2.namespace=org.eclipse.equinox.p2.eclipse.type
  24 +units.0.hostRequirements.2.name=bundle
  25 +units.0.hostRequirements.2.range=[1.0.0,2.0.0)
  26 +units.0.hostRequirements.2.greedy=false
  27 +units.0.requires.1.namespace=osgi.bundle
  28 +units.0.requires.1.name=org.eclipse.equinox.weaving.aspectj
  29 +units.0.requires.1.greedy=false

0 comments on commit 163da90

Please sign in to comment.
Something went wrong with that request. Please try again.