Skip to content

Commit

Permalink
work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@dragos
dragos committed Sep 5, 2011
1 parent 60bd0c7 commit 46cae1c
Show file tree
Hide file tree
Showing 16 changed files with 80 additions and 121 deletions.
9 changes: 0 additions & 9 deletions org.scala-ide.build-toolchain/build-toolchain-2.8.0.final.sh
View file

This file was deleted.

14 changes: 0 additions & 14 deletions org.scala-ide.build-toolchain/build-toolchain-2.8.1.final.sh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion org.scala-ide.build-toolchain/build-toolchain-2.9.x.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

. $(dirname $0)/env.sh

SCALA_VERSION=2.9.1-SNAPSHOT
SCALA_VERSION=2.9.2-SNAPSHOT
#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
SCALA_PRECOMPILED=2_9_1-SNAPSHOT
SBT_SCALA_VERSION=2.9.0-1
Expand Down
20 changes: 18 additions & 2 deletions org.scala-ide.build-toolchain/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
<version>2.10.0-SNAPSHOT</version>
<version>2.9.1</version>
<name>The Scala Toolchain for Eclipse</name>
<packaging>pom</packaging>

<properties>
<scala.version>2.8.0</scala.version>
<sbt.version>0.10.2-SNAPSHOT</sbt.version>
<sbt.version>0.10.3</sbt.version>
<patch.level>p0002</patch.level>
<encoding>UTF-8</encoding>
</properties>
Expand Down Expand Up @@ -108,7 +108,12 @@
<properties>
<scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
<scala.compiler.version>${scala.version}</scala.compiler.version>
<sbt.library.qualifier>2_10</sbt.library.qualifier>

<!-- Used as part of the artifact name for SBT cross-compiled modules. -->
<scala.major.minor.version>2.10</scala.major.minor.version>

<!-- Used as part of the artifact name for SBT cross-compiled modules. -->
<sbt.compiled.version>${sbt.scala.version}</sbt.compiled.version>
<maintenance.suffix></maintenance.suffix>
<patch.level.suffix></patch.level.suffix>
Expand All @@ -127,8 +132,14 @@
<properties>
<scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
<scala.compiler.version>${scala.version}</scala.compiler.version>
<sbt.library.qualifier>2_09</sbt.library.qualifier>

<!-- Used as part of the directory name for compiler-interface.jar. -->
<scala.major.minor.version>2.9</scala.major.minor.version>

<!-- Used as part of the artifact name for SBT cross-compiled modules. -->
<sbt.compiled.version>${sbt.scala.version}</sbt.compiled.version>

<maintenance.suffix></maintenance.suffix>
<patch.level.suffix></patch.level.suffix>
</properties>
Expand All @@ -146,7 +157,12 @@
<properties>
<scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
<scala.compiler.version>${scala.version}</scala.compiler.version>
<sbt.library.qualifier>2_08</sbt.library.qualifier>

<!-- Used as part of the directory name for compiler-interface.jar. -->
<scala.major.minor.version>2.8</scala.major.minor.version>

<!-- Used as part of the artifact name for SBT cross-compiled modules. -->
<sbt.compiled.version>${sbt.scala.version}</sbt.compiled.version>
<maintenance.suffix></maintenance.suffix>
<patch.level.suffix></patch.level.suffix>
Expand Down
8 changes: 0 additions & 8 deletions org.scala-ide.build/build-ide-2.8.0.final
View file

This file was deleted.

8 changes: 0 additions & 8 deletions org.scala-ide.build/build-ide-2.8.1.final
View file

This file was deleted.

2 changes: 1 addition & 1 deletion org.scala-ide.build/build-ide-trunk.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
. $(dirname $0)/env.sh

SCALA_VERSION=2.10.0-SNAPSHOT
SBT_VERSION=2.10.0-SNAPSHOT
SBT_VERSION=0.10.3

build $*
24 changes: 13 additions & 11 deletions org.scala-ide.build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
<properties>
<scala.version>2.8.0</scala.version>
<version.tag>nightly</version.tag>
<version.suffix>210</version.suffix>
<version.suffix>2_10</version.suffix>
<scala.version.short>2.10</scala.version.short>
<sbt.version>0.10.3</sbt.version>
<tycho.version>0.12.0</tycho.version>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
Expand Down Expand Up @@ -157,7 +159,7 @@
</property>
</activation>
<properties>
<version.suffix>28</version.suffix>
<version.suffix>2_08</version.suffix>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -190,7 +192,7 @@
</property>
</activation>
<properties>
<version.suffix>28</version.suffix>
<version.suffix>2_08</version.suffix>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -223,7 +225,7 @@
</property>
</activation>
<properties>
<version.suffix>28</version.suffix>
<version.suffix>2_08</version.suffix>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -255,7 +257,7 @@
</property>
</activation>
<properties>
<version.suffix>29</version.suffix>
<version.suffix>2_09</version.suffix>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -288,7 +290,7 @@
</property>
</activation>
<properties>
<version.suffix>29</version.suffix>
<version.suffix>2_09</version.suffix>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -321,7 +323,7 @@
</property>
</activation>
<properties>
<version.suffix>29</version.suffix>
<version.suffix>2_09</version.suffix>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -408,7 +410,7 @@
<profile>
<id>local-scala-2.8.0</id>
<properties>
<version.suffix>28</version.suffix>
<version.suffix>2_08</version.suffix>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -441,7 +443,7 @@
<profile>
<id>local-scala-2.8.1</id>
<properties>
<version.suffix>28</version.suffix>
<version.suffix>2_08</version.suffix>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -475,7 +477,7 @@
<profile>
<id>local-scala-2.9.x</id>
<properties>
<version.suffix>29</version.suffix>
<version.suffix>2_09</version.suffix>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -509,7 +511,7 @@
<profile>
<id>local-scala-trunk</id>
<properties>
<version.suffix>210</version.suffix>
<version.suffix>2_10</version.suffix>
</properties>
<dependencies>
<dependency>
Expand Down
53 changes: 27 additions & 26 deletions org.scala-ide.sbt/.classpath
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="lib" path="lib/actions_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/api_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/cache_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/classfile_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/classpath_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/collections_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/compile_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/completion_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/control_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/discovery_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/incremental-compiler_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/interface_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/io_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/ivy_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/scala-2.9/lib/compiler-interface.jar"/>
<classpathentry kind="lib" path="lib/actions_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/api_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/cache_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/classfile_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/classpath_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/collections_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/compile_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/completion_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/control_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/discovery_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/incremental-compiler_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/interface_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/io_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/ivy_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/ivy.jar"/>
<classpathentry kind="lib" path="lib/jline.jar"/>
<classpathentry kind="lib" path="lib/launcher_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/launcher-interface_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/logging_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/main_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/persist_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/precompiled-2.10.0-SNAPSHOT-2_10_0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/process_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/run_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/sbinary_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/sbt_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/task-system_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/tasks_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/launcher_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/launcher-interface_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/logging_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/main_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/persist_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/precompiled-2.9.0-1-2_9_1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/process_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/run_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/sbinary_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/sbt_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/task-system_2.9.0-1.jar"/>
<classpathentry kind="lib" path="lib/tasks_2.9.0-1.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
5 changes: 3 additions & 2 deletions org.scala-ide.sbt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
<version>2.10.0-SNAPSHOT</version>
<version>2.9.1</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sbt.full.library</artifactId>
<version>${sbt.version}.${sbt.library.qualifier}</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
Expand Down Expand Up @@ -447,7 +448,7 @@
<instructions>
<Bundle-SymbolicName>org.scala-ide.sbt.full.library</Bundle-SymbolicName>
<Bundle-Name>Sbt ${sbt.version} Library for Eclipse</Bundle-Name>
<Bundle-Version>${scala.version}${patch.level.suffix}</Bundle-Version>
<Bundle-Version>${sbt.version}.${sbt.library.qualifier}</Bundle-Version>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
<_exportcontents>sbt.*;version=${sbt.version},xsbt.*;version=${sbt.version},xsbti.*;version=${sbt.version},sbinary.*;version=${sbinary.version},jline.*;version=0.9.94,org.apache.ivy.*;version=2.2.0</_exportcontents>
<Embed-Directory>lib</Embed-Directory>
Expand Down
2 changes: 1 addition & 1 deletion org.scala-ide.scala.compiler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
<version>2.10.0-SNAPSHOT</version>
<version>2.9.1</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.scala.compiler</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.scala-ide.scala.library/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
<version>2.10.0-SNAPSHOT</version>
<version>2.9.1</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.scala.library</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.scala-ide.sdt.core.tests/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/mockito-all-1.8.5.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
36 changes: 3 additions & 33 deletions org.scala-ide.sdt.core/.classpath
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="lib/miglayout-3.7.4-swt.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/miglayout-3.7.4-swt.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/actions_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/api_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/cache_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/classfile_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/classpath_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/collections_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/compile_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/completion_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/control_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/discovery_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/incremental-compiler_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/interface_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/io_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/ivy_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/ivy.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/jline.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/launcher_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/launcher-interface_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/logging_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/main_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/persist_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/precompiled-2.10.0-SNAPSHOT-2_10_0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/process_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/run_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/sbinary_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/sbt_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/task-system_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/org.scala-ide.sbt/lib/tasks_2.10.0-SNAPSHOT.jar"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
6 changes: 3 additions & 3 deletions org.scala-ide.sdt.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ Require-Bundle:
org.eclipse.ui.workbench.texteditor,
org.eclipse.pde.core;resolution:=optional,
org.eclipse.pde.ui;resolution:=optional,
org.scala-ide.scala.library,
org.scala-ide.scala.compiler,
org.scala-ide.scala.library;bundle-version="[2.9.0,2.10)",
org.scala-ide.scala.compiler;bundle-version="[2.9.0,2.10)",
org.scala-refactoring.library,
org.scala-ide.sbt.full.library,
org.scala-ide.sbt.full.library;bundle-version="[0.10.3.2_09,0.10.4]",
scalariform,
org.junit4;bundle-version="4.5.0",
org.eclipse.ui.browser;bundle-version="3.3.0"
Expand Down
Loading

0 comments on commit 46cae1c

Please sign in to comment.