Permalink
Browse files

Only add a patch-level suffix if we actually need one.

  • Loading branch information...
1 parent 117d799 commit fdc8bb92e35cb02d32f52d2df614d3b450f5fb4a @milessabin milessabin committed Apr 4, 2011
@@ -83,6 +83,7 @@
<scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
<scala.compiler.version>${scala.version}</scala.compiler.version>
<maintenance.suffix></maintenance.suffix>
+ <patch.level.suffix></patch.level.suffix>
</properties>
</profile>
<profile>
@@ -91,6 +92,7 @@
<scala.compiler.groupid>org.scala-ide</scala.compiler.groupid>
<scala.compiler.version>2.8.0.final-maintenance</scala.compiler.version>
<maintenance.suffix>-sdt</maintenance.suffix>
+ <patch.level.suffix>-${patch.level}</patch.level.suffix>
</properties>
<repositories>
<repository>
@@ -121,7 +121,7 @@
<instructions>
<Bundle-SymbolicName>org.scala-ide.scala.compiler</Bundle-SymbolicName>
<Bundle-Name>Scala Compiler for Eclipse</Bundle-Name>
- <Bundle-Version>${version.number}${maintenance.suffix}-${patch.level}</Bundle-Version>
+ <Bundle-Version>${version.number}${maintenance.suffix}${patch.level.suffix}</Bundle-Version>
<Bundle-Vendor>scala-ide.org</Bundle-Vendor>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
<_exportcontents>scala.tools.*;version=${version.number},ch.epfl.lamp.*;version=${version.number}</_exportcontents>
@@ -135,7 +135,7 @@
<instructions>
<Bundle-SymbolicName>org.scala-ide.scala.library</Bundle-SymbolicName>
<Bundle-Name>Scala Library for Eclipse</Bundle-Name>
- <Bundle-Version>${version.number}-${patch.level}</Bundle-Version>
+ <Bundle-Version>${version.number}${patch.level.suffix}</Bundle-Version>
<Bundle-Vendor>scala-ide.org</Bundle-Vendor>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
<_exportcontents>scala.*;version=${version.number}</_exportcontents>

0 comments on commit fdc8bb9

Please sign in to comment.