summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-18 04:54:04 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-18 04:54:04 -0700
commit5f075927202a8d2f8e522e13736b8b02df85f216 (patch)
tree399fcccc302b78386dd23da80b51349c9870d4dc
parent4f07a12b3f4ce1595d4976123e5cfe34e186d4ba (diff)
parent27aaaa4fce743acf92c78849c37899a0f83ccd46 (diff)
downloadscala-5f075927202a8d2f8e522e13736b8b02df85f216.tar.gz
scala-5f075927202a8d2f8e522e13736b8b02df85f216.tar.bz2
scala-5f075927202a8d2f8e522e13736b8b02df85f216.zip
Merge pull request #916 from gkossakowski/eclipse-project
Eclipse project updates
-rw-r--r--src/eclipse/partest/.classpath14
-rw-r--r--src/eclipse/partest/.project35
-rw-r--r--src/eclipse/reflect/.classpath1
-rw-r--r--src/eclipse/scala-compiler/.classpath1
-rw-r--r--src/eclipse/scalap/.classpath12
-rw-r--r--src/eclipse/scalap/.project35
6 files changed, 96 insertions, 2 deletions
diff --git a/src/eclipse/partest/.classpath b/src/eclipse/partest/.classpath
new file mode 100644
index 0000000000..b14e465aa6
--- /dev/null
+++ b/src/eclipse/partest/.classpath
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="partest"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/reflect"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/scalap"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/ant/ant.jar"/>
+ <classpathentry kind="lib" path="lib/jline.jar"/>
+ <classpathentry kind="lib" path="lib/msil.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/asm"/>
+ <classpathentry kind="output" path="build-quick-partest"/>
+</classpath>
diff --git a/src/eclipse/partest/.project b/src/eclipse/partest/.project
new file mode 100644
index 0000000000..45c24332ba
--- /dev/null
+++ b/src/eclipse/partest/.project
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>partest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.scala-ide.sdt.core.scalabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.scala-ide.sdt.core.scalanature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>build-quick-partest</name>
+ <type>2</type>
+ <locationURI>SCALA_BASEDIR/build/quick/classes/partest</locationURI>
+ </link>
+ <link>
+ <name>lib</name>
+ <type>2</type>
+ <locationURI>SCALA_BASEDIR/lib</locationURI>
+ </link>
+ <link>
+ <name>partest</name>
+ <type>2</type>
+ <locationURI>SCALA_BASEDIR/src/partest</locationURI>
+ </link>
+ </linkedResources>
+</projectDescription>
diff --git a/src/eclipse/reflect/.classpath b/src/eclipse/reflect/.classpath
index 3fb1d08d4d..57a3928dc3 100644
--- a/src/eclipse/reflect/.classpath
+++ b/src/eclipse/reflect/.classpath
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="reflect"/>
<classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>
- <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="build-quick-reflect"/>
</classpath>
diff --git a/src/eclipse/scala-compiler/.classpath b/src/eclipse/scala-compiler/.classpath
index e0264b9856..40a4ed9996 100644
--- a/src/eclipse/scala-compiler/.classpath
+++ b/src/eclipse/scala-compiler/.classpath
@@ -5,7 +5,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>
<classpathentry combineaccessrules="false" kind="src" path="/fjbg"/>
<classpathentry combineaccessrules="false" kind="src" path="/asm"/>
- <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/ant/ant.jar"/>
<classpathentry kind="lib" path="lib/jline.jar"/>
diff --git a/src/eclipse/scalap/.classpath b/src/eclipse/scalap/.classpath
new file mode 100644
index 0000000000..2b44ad19b2
--- /dev/null
+++ b/src/eclipse/scalap/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="scalap"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/reflect"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/ant/ant.jar"/>
+ <classpathentry kind="lib" path="lib/jline.jar"/>
+ <classpathentry kind="lib" path="lib/msil.jar"/>
+ <classpathentry kind="output" path="build-quick-scalap"/>
+</classpath>
diff --git a/src/eclipse/scalap/.project b/src/eclipse/scalap/.project
new file mode 100644
index 0000000000..3599168e32
--- /dev/null
+++ b/src/eclipse/scalap/.project
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>scalap</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.scala-ide.sdt.core.scalabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.scala-ide.sdt.core.scalanature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>build-quick-scalap</name>
+ <type>2</type>
+ <locationURI>SCALA_BASEDIR/build/quick/classes/scalap</locationURI>
+ </link>
+ <link>
+ <name>lib</name>
+ <type>2</type>
+ <locationURI>SCALA_BASEDIR/lib</locationURI>
+ </link>
+ <link>
+ <name>scalap</name>
+ <type>2</type>
+ <locationURI>SCALA_BASEDIR/src/scalap</locationURI>
+ </link>
+ </linkedResources>
+</projectDescription>