Fixed Helium 2.9 nightly

* Compile against 2.9.3-SNAPSHOT. * Removed automatci activation of profiles based on scala.version. * Adapted build scripts to pass the right profile.
scala-ide · Apr 20, 2012 · b4ce4d8 · b4ce4d8
1 parent eab02ae
commit b4ce4d8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/org.scala-ide.build/build-ide-2.9.x.sh b/org.scala-ide.build/build-ide-2.9.x.sh
@@ -2,6 +2,8 @@
 
 . $(dirname $0)/env.sh
 
-SCALA_VERSION=2.9.2-SNAPSHOT
+SCALA_VERSION=2.9.3-SNAPSHOT
+
+PROFILE="-P scala-2.9.x"
 
 build $*
diff --git a/org.scala-ide.build/build-ide-trunk.sh b/org.scala-ide.build/build-ide-trunk.sh
@@ -4,4 +4,6 @@
 
 SCALA_VERSION=2.10.0-SNAPSHOT
 
+PROFILE="-P scala-trunk"
+
 build $*
diff --git a/org.scala-ide.build/pom.xml b/org.scala-ide.build/pom.xml
@@ -167,47 +167,35 @@
     </profile>
 
     <profile>
-      <id>scala-2.9.2-SNAPSHOT</id>
-      <activation>
-        <property>
-          <name>scala.version</name>
-          <value>2.9.2-SNAPSHOT</value>
-        </property>
-      </activation>
+      <id>scala-2.9.x</id>
       <properties>
         <version.suffix>2_09</version.suffix>
       </properties>
       <repositories>
         <repository>
-          <id>scala-refactoring-trunk</id>
-          <name>Scala Refactoring Scala 2.9.2-SNAPSHOT p2 repository</name>
+          <id>scala-refactoring-29x</id>
+          <name>Scala Refactoring Scala 2.9.x p2 repository</name>
           <layout>p2</layout>
-          <url>${repo.scala-ide}/scala-refactoring-2.9.2-SNAPSHOT</url>
+          <url>${repo.scala-ide}/scala-refactoring-29x</url>
         </repository>
         <repository>
-          <id>scalariform-trunk</id>
-          <name>Scalariform Scala 2.9.2-SNAPSHOT p2 repo</name>
+          <id>scalariform-29x</id>
+          <name>Scalariform Scala 2.9.x p2 repo</name>
           <layout>p2</layout>
-          <url>${repo.scala-ide}/scalariform-2.9.2-SNAPSHOT</url>
+          <url>${repo.scala-ide}/scalariform-29x</url>
         </repository>
         <repository>
-          <id>scala-toolchain-2.9.2-SNAPSHOT</id>
-          <name>Scala Toolchain 2.9.2-SNAPSHOT p2 repository</name>
+          <id>scala-toolchain-29x</id>
+          <name>Scala Toolchain 2.9.x p2 repository</name>
           <layout>p2</layout>
-          <url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</url>
+          <url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-29x</url>
           <!-- <url>file:/absolute/path/to/org.scala-ide.build-toolchain/mkrepo/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</url> -->
         </repository>
       </repositories>
     </profile>
 
     <profile>
       <id>scala-trunk</id>
-      <activation>
-        <property>
-          <name>scala.version</name>
-          <value>2.10.0-SNAPSHOT</value>
-        </property>
-      </activation>
       <repositories>
         <repository>
           <id>scala-refactoring-trunk</id>
@@ -229,6 +217,7 @@
         </repository>
       </repositories>
     </profile>
+
     <!-- local 2.9.x-SNAPSHOT -->
     <profile>
       <id>local-scala-2.9.x</id>