Permalink
Browse files

Updated build scripts to use scala-compiler/library 2.10-SNAPSHOT, ad…

…ded build scripts for 2.9.x and bumped major version number to 2.0.0 to differentiate vs. backport.
  • Loading branch information...
1 parent 3bcdbe5 commit 316ca330c70908dc0129d9df1741e2e08aeb99ab @dragos dragos committed Mar 28, 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
<artifactId>ch.epfl.lamp.sdt</artifactId>
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.contribution.weaving</artifactId>
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+SCALA_VERSION=2.9.0-SNAPSHOT
+
+set_version ${SCALA_VERSION}
+
+build $*
@@ -2,7 +2,7 @@
. $(dirname $0)/env.sh
-SCALA_VERSION=2.9.0-SNAPSHOT
+SCALA_VERSION=2.10.0-SNAPSHOT
set_version ${SCALA_VERSION}
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+SCALA_VERSION=2.9.0-SNAPSHOT
+PROFILE_NAME="-P local-scala-2.9.x,!scala-trunk"
+
+build $*
@@ -2,7 +2,7 @@
. $(dirname $0)/env.sh
-SCALA_VERSION=2.9.0-SNAPSHOT
+SCALA_VERSION=2.10.0-SNAPSHOT
PROFILE_NAME="-P local-scala-trunk,!scala-trunk"
build $*
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>The Scala IDE for Eclipse</name>
<packaging>pom</packaging>
@@ -93,7 +93,7 @@
<artifactId>maven-osgi-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
- <format>yyyyMMddHHmm'-${git.hash}'</format
+ <format>yyyyMMddHHmm'-beta1-${git.hash}'</format
<archiveSite>true</archiveSite>
</configuration>
</plugin>
@@ -270,7 +270,7 @@
<activation>
<property>
<name>scala.version</name>
- <value>2.9.0-SNAPSHOT</value>
+ <value>2.10.0-SNAPSHOT</value>
</property>
</activation>
<repositories>
@@ -354,6 +354,38 @@
</repository>
</repositories>
</profile>
+ <!-- local 2.9.0-SNAPSHOT -->
+ <profile>
+ <id>local-scala-2.9.x</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>org.scala-ide.scala.library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>org.scala-ide.scala.compiler</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>scala-refactoring-2.9.x</id>
+ <name>Scala Refactoring Scala 2.9.0.final p2 repository</name>
+ <layout>p2</layout>
+ <url>http://download.scala-ide.org/scala-refactoring-trunk</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ </repository>
+ <repository>
+ <id>scalariform-2.9.x</id>
+ <name>Scalariform Scala 2.9.0.final p2 repo</name>
+ <layout>p2</layout>
+ <url>http://download.scala-ide.org/scalariform-trunk</url>
+ </repository>
+ </repositories>
+ </profile>
+
<profile>
<id>local-scala-trunk</id>
<dependencies>
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Scala JDT Weaving
Bundle-SymbolicName: org.scala-ide.sdt.aspects;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: scala-ide.org
Bundle-Activator: scala.tools.eclipse.contribution.weaving.jdt.ScalaJDTWeavingPlugin
Require-Bundle:
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sdt.aspects</artifactId>
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Scala Plugin
Bundle-SymbolicName: org.scala-ide.sdt.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: scala-ide.org
Bundle-ActivationPolicy: lazy
Bundle-Activator:
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sdt.core</artifactId>
@@ -2,7 +2,7 @@
<feature
id="org.scala-ide.sdt.feature"
label="Scala IDE for Eclipse"
- version="1.0.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="scala-ide.org"
plugin="org.scala-ide.sdt.core">
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sdt.feature</artifactId>
@@ -2,7 +2,7 @@
<feature
id="org.scala-ide.sdt.source.feature"
label="Scala IDE for Eclipse Source"
- version="1.0.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="scala-ide.org">
<description url="http://scala-ide.org/">
@@ -4,7 +4,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sdt.source.feature</artifactId>
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sdt.update-site</artifactId>
@@ -2,7 +2,7 @@
<feature
id="org.scala-ide.sdt.weaving.feature"
label="JDT Weaving for Scala"
- version="1.0.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="scala-ide.org">
<license url="http://scala-lang.org/downloads/license.html">
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-ide-for-eclipse</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sdt.weaving.feature</artifactId>

0 comments on commit 316ca33

Please sign in to comment.