1.1 --- a/src/Tools/jEdit/nbproject/build-impl.xml	Tue Mar 30 00:11:41 2010 +0200
     1.2 +++ b/src/Tools/jEdit/nbproject/build-impl.xml	Tue Mar 30 00:12:42 2010 +0200
     1.3 @@ -24,7 +24,7 @@
     1.4      <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
     1.5      <!--
     1.6                  ======================
     1.7 -                INITIALIZATION SECTION 
     1.8 +                INITIALIZATION SECTION
     1.9                  ======================
    1.10              -->
    1.11      <target name="-pre-init">
    1.12 @@ -40,9 +40,9 @@
    1.13              <isset property="env.SCALA_HOME"/>
    1.14          </condition>
    1.15          <fail unless="scala.home">
    1.16 -You must set SCALA_HOME or environment property and append "-J-Dscala.home=scalahomepath"
    1.17 -property to the end of "netbeans_default_options" in NetBeansInstallationPath/etc/netbeans.conf to point to
    1.18 -Scala installation directory.
    1.19 +                    You must set SCALA_HOME or environment property and append "-J-Dscala.home=scalahomepath"
    1.20 +                    property to the end of "netbeans_default_options" in NetBeansInstallationPath/etc/netbeans.conf to point to
    1.21 +                    Scala installation directory.
    1.22                  </fail>
    1.23          <property name="scala.compiler" value="${scala.home}/lib/scala-compiler.jar"/>
    1.24          <property name="scala.library" value="${scala.home}/lib/scala-library.jar"/>
    1.25 @@ -53,14 +53,13 @@
    1.26                  <pathelement location="${scala.library}"/>
    1.27              </classpath>
    1.28          </taskdef>
    1.29 -        <chmod dir="${scala.home}/bin" includes="**/*" perm="u+rx"/>
    1.30      </target>
    1.31      <target depends="-pre-init,-init-private" name="-init-user">
    1.32          <property file="${user.properties.file}"/>
    1.33          <!-- The two properties below are usually overridden -->
    1.34          <!-- by the active platform. Just a fallback. -->
    1.35 -        <property name="default.javac.source" value="1.4"/>
    1.36 -        <property name="default.javac.target" value="1.4"/>
    1.37 +        <property name="default.javac.source" value="1.5"/>
    1.38 +        <property name="default.javac.target" value="1.5"/>
    1.39      </target>
    1.40      <target depends="-pre-init,-init-private,-init-user" name="-init-project">
    1.41          <property file="nbproject/configs/${config}.properties"/>
    1.42 @@ -126,6 +125,7 @@
    1.43          <property name="javadoc.encoding.used" value="${source.encoding}"/>
    1.44          <property name="includes" value="**"/>
    1.45          <property name="excludes" value=""/>
    1.46 +        <property name="extdirs" value=" "/>
    1.47          <property name="do.depend" value="false"/>
    1.48          <condition property="do.depend.true">
    1.49              <istrue value="${do.depend}"/>
    1.50 @@ -191,7 +191,13 @@
    1.51              <sequential>
    1.52                  <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
    1.53                      <classpath>
    1.54 -                        <path path="@{classpath}"/>
    1.55 +                        <path>
    1.56 +                            <pathelement path="@{classpath}"/>
    1.57 +                            <fileset dir="${scala.lib}">
    1.58 +                                <include name="**/*.jar"/>
    1.59 +                            </fileset>
    1.60 +                            <pathelement location="${build.classes.dir}"/>
    1.61 +                        </path>
    1.62                      </classpath>
    1.63                  </depend>
    1.64              </sequential>
    1.65 @@ -217,33 +223,25 @@
    1.66              <attribute default="${src.dir}" name="srcdir"/>
    1.67              <attribute default="${build.classes.dir}" name="destdir"/>
    1.68              <attribute default="${javac.classpath}" name="classpath"/>
    1.69 +            <attribute default="${extdirs}" name="extdirs"/>
    1.70              <attribute default="${includes}" name="includes"/>
    1.71              <attribute default="${excludes}" name="excludes"/>
    1.72 -            <attribute default="${javac.compilerargs}" name="addparams"/>
    1.73 +            <attribute default="${scalac.compilerargs}" name="addparams"/>
    1.74              <attribute default="" name="sourcepath"/>
    1.75              <element name="customize" optional="true"/>
    1.76              <sequential>
    1.77 -                <fsc addparams="@{addparams}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="jvm-${javac.target}">
    1.78 +                <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}">
    1.79                      <classpath>
    1.80 -                        <path path="@{classpath}"/>
    1.81 -                        <fileset dir="${scala.lib}">
    1.82 -                            <include name="**/*.jar"/>
    1.83 -                        </fileset>
    1.84 +                        <path>
    1.85 +                            <pathelement path="@{classpath}"/>
    1.86 +                            <fileset dir="${scala.lib}">
    1.87 +                                <include name="**/*.jar"/>
    1.88 +                            </fileset>
    1.89 +                            <pathelement location="${build.classes.dir}"/>
    1.90 +                        </path>
    1.91                      </classpath>
    1.92                      <customize/>
    1.93 -                </fsc>
    1.94 -            </sequential>
    1.95 -        </macrodef>
    1.96 -        <macrodef name="depend" uri="http://www.netbeans.org/ns/scala-project/1">
    1.97 -            <attribute default="${src.dir}" name="srcdir"/>
    1.98 -            <attribute default="${build.classes.dir}" name="destdir"/>
    1.99 -            <attribute default="${javac.classpath}" name="classpath"/>
   1.100 -            <sequential>
   1.101 -                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
   1.102 -                    <classpath>
   1.103 -                        <path path="@{classpath}"/>
   1.104 -                    </classpath>
   1.105 -                </depend>
   1.106 +                </scalac>
   1.107              </sequential>
   1.108          </macrodef>
   1.109          <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/scala-project/1">
   1.110 @@ -551,14 +549,14 @@
   1.111              -->
   1.112      <target depends="init" name="-javadoc-build">
   1.113          <mkdir dir="${dist.javadoc.dir}"/>
   1.114 -        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
   1.115 +        <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}">
   1.116              <classpath>
   1.117                  <path path="${javac.classpath}"/>
   1.118 +                <fileset dir="${scala.lib}">
   1.119 +                    <include name="**/*.jar"/>
   1.120 +                </fileset>
   1.121              </classpath>
   1.122 -            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   1.123 -                <filename name="**/*.java"/>
   1.124 -            </fileset>
   1.125 -        </javadoc>
   1.126 +        </scaladoc>
   1.127      </target>
   1.128      <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
   1.129          <nbbrowse file="${dist.javadoc.dir}/index.html"/>
   1.130 @@ -580,7 +578,7 @@
   1.131          <scalaProject1:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/>
   1.132      </target>
   1.133      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
   1.134 -        <scalaProject1:scalac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/>
   1.135 +        <scalaProject1:scalac classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/>
   1.136          <copy todir="${build.test.classes.dir}"/>
   1.137      </target>
   1.138      <target name="-post-compile-test">
   1.139 @@ -595,7 +593,7 @@
   1.140      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   1.141          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.142          <scalaProject1:force-recompile destdir="${build.test.classes.dir}"/>
   1.143 -        <scalaProject1:scalac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/>
   1.144 +        <scalaProject1:scalac classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/>
   1.145          <copy todir="${build.test.classes.dir}"/>
   1.146      </target>
   1.147      <target name="-post-compile-test-single">

     2.1 --- a/src/Tools/jEdit/nbproject/genfiles.properties	Tue Mar 30 00:11:41 2010 +0200
     2.2 +++ b/src/Tools/jEdit/nbproject/genfiles.properties	Tue Mar 30 00:12:42 2010 +0200
     2.3 @@ -4,5 +4,5 @@
     2.4  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     2.5  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     2.6  nbproject/build-impl.xml.data.CRC32=8f41dcce
     2.7 -nbproject/build-impl.xml.script.CRC32=69f2059c
     2.8 -nbproject/build-impl.xml.stylesheet.CRC32=bc42a706@1.3.0
     2.9 +nbproject/build-impl.xml.script.CRC32=1c29c971
    2.10 +nbproject/build-impl.xml.stylesheet.CRC32=8c3c03dd@1.3.4