--- a/src/Tools/jEdit/README_BUILD Mon May 10 22:27:58 2010 +0200
+++ b/src/Tools/jEdit/README_BUILD Mon May 10 22:29:27 2010 +0200
@@ -8,10 +8,10 @@
* Netbeans 6.8
http://www.netbeans.org/downloads/index.html
-* Scala for Netbeans: version 6.8v1.1
- http://sourceforge.net/project/showfiles.php?group_id=192439&package_id=256544
+* Scala for Netbeans: version 6.8v1.1.0rc2
+ http://wiki.netbeans.org/Scala
+ http://sourceforge.net/projects/erlybird/files/nb-scala/6.8v1.1.0rc2
http://blogtrader.net/dcaoyuan/category/NetBeans
- http://wiki.netbeans.org/Scala
* jEdit 4.3.1 or 4.3.2
http://www.jedit.org/
--- a/src/Tools/jEdit/nbproject/build-impl.xml Mon May 10 22:27:58 2010 +0200
+++ b/src/Tools/jEdit/nbproject/build-impl.xml Mon May 10 22:29:27 2010 +0200
@@ -230,7 +230,7 @@
<attribute default="" name="sourcepath"/>
<element name="customize" optional="true"/>
<sequential>
- <scalac addparams="-make:transitive -dependencyfile ${basedir}/${build.dir}/.scala_dependencies @{addparams}" deprecation="${scalac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" extdirs="@{extdirs}" force="yes" fork="true" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="jvm-${javac.target}" unchecked="${scalac.unchecked}">
+ <scalac addparams="-make:transitive -dependencyfile "${basedir}/${build.dir}/.scala_dependencies" @{addparams}" deprecation="${scalac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" extdirs="@{extdirs}" force="yes" fork="true" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="jvm-${javac.target}" unchecked="${scalac.unchecked}">
<classpath>
<path>
<pathelement path="@{classpath}"/>
@@ -549,7 +549,7 @@
-->
<target depends="init" name="-javadoc-build">
<mkdir dir="${dist.javadoc.dir}"/>
- <scaladoc addparams="${javadoc.additionalparam}" deprecation="yes" destdir="${dist.javadoc.dir}" doctitle="${javadoc.windowtitle}" encoding="${javadoc.encoding.used}" srcdir="${src.dir}" unchecked="yes" windowtitle="${javadoc.windowtitle}">
+ <scaladoc addparams="${javadoc.additionalparam}" deprecation="yes" destdir="${dist.javadoc.dir}" doctitle="${javadoc.windowtitle}" encoding="${javadoc.encoding.used}" srcdir="${src.dir}" unchecked="yes">
<classpath>
<path path="${javac.classpath}"/>
<fileset dir="${scala.lib}">
--- a/src/Tools/jEdit/nbproject/genfiles.properties Mon May 10 22:27:58 2010 +0200
+++ b/src/Tools/jEdit/nbproject/genfiles.properties Mon May 10 22:29:27 2010 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=8f41dcce
-nbproject/build-impl.xml.script.CRC32=1c29c971
-nbproject/build-impl.xml.stylesheet.CRC32=8c3c03dd@1.3.4
+nbproject/build-impl.xml.script.CRC32=e3e2a5d5
+nbproject/build-impl.xml.stylesheet.CRC32=5220179f@1.3.5