updated version of nbproject, as produced by build in Netbeans 6.5;
authorwenzelm
Wed, 19 Nov 2008 20:51:27 +0100
changeset 34380 b74b5e0ff66a
parent 34379 c80f42933ac6
child 34381 a94d2fb96fd5
updated version of nbproject, as produced by build in Netbeans 6.5;
src/Tools/jEdit/nbproject/build-impl.xml
src/Tools/jEdit/nbproject/genfiles.properties
--- a/src/Tools/jEdit/nbproject/build-impl.xml	Wed Nov 19 20:46:54 2008 +0100
+++ b/src/Tools/jEdit/nbproject/build-impl.xml	Wed Nov 19 20:51:27 2008 +0100
@@ -45,6 +45,7 @@
 </fail>
         <property name="scala.compiler" value="${scala.home}/lib/scala-compiler.jar"/>
         <property name="scala.library" value="${scala.home}/lib/scala-library.jar"/>
+        <property name="scala.lib" value="${scala.home}/lib"/>
         <taskdef resource="scala/tools/ant/antlib.xml">
             <classpath>
                 <pathelement location="${scala.compiler}"/>
@@ -214,13 +215,16 @@
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="jvm-${javac.debug}" name="debug"/>
+            <attribute default="${javac.compilerargs}" name="addparams"/>
             <attribute default="" name="sourcepath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <scalac destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="jvm-${javac.target}">
+                <scalac addparams="@{addparams}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="jvm-${javac.target}">
                     <classpath>
                         <path path="@{classpath}"/>
-                        <pathelement location="${scala.library}"/>
+                        <fileset dir="${scala.lib}">
+                            <include name="**/*.jar"/>
+                        </fileset>
                     </classpath>
                     <customize/>
                 </scalac>
@@ -268,7 +272,9 @@
                     </batchtest>
                     <classpath>
                         <path path="${run.test.classpath}"/>
-                        <pathelement location="${scala.library}"/>
+                        <fileset dir="${scala.lib}">
+                            <include name="**/*.jar"/>
+                        </fileset>
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -329,7 +335,9 @@
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
-                        <pathelement location="${scala.library}"/>
+                        <fileset dir="${scala.lib}">
+                            <include name="**/*.jar"/>
+                        </fileset>
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="run-sys-prop."/>
@@ -349,7 +357,9 @@
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="${run.classpath}"/>
-                        <pathelement location="${scala.library}"/>
+                        <fileset dir="${scala.lib}">
+                            <include name="**/*.jar"/>
+                        </fileset>
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="run-sys-prop."/>
--- a/src/Tools/jEdit/nbproject/genfiles.properties	Wed Nov 19 20:46:54 2008 +0100
+++ b/src/Tools/jEdit/nbproject/genfiles.properties	Wed Nov 19 20:51:27 2008 +0100
@@ -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=d2379ac2
-nbproject/build-impl.xml.script.CRC32=234fa40f
-nbproject/build-impl.xml.stylesheet.CRC32=411eee22
+nbproject/build-impl.xml.script.CRC32=2f754fcd
+nbproject/build-impl.xml.stylesheet.CRC32=2aa5193a