1.1 --- a/java/sql-dk/nbproject/build-impl.xml Mon Dec 16 20:20:54 2013 +0100
1.2 +++ b/java/sql-dk/nbproject/build-impl.xml Mon Dec 16 20:39:07 2013 +0100
1.3 @@ -141,6 +141,7 @@
1.4 <condition property="have.sources">
1.5 <or>
1.6 <available file="${src.dir}"/>
1.7 + <available file="${src.data.dir}"/>
1.8 </or>
1.9 </condition>
1.10 <condition property="netbeans.home+have.tests">
1.11 @@ -229,6 +230,7 @@
1.12 </target>
1.13 <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
1.14 <fail unless="src.dir">Must set src.dir</fail>
1.15 + <fail unless="src.data.dir">Must set src.data.dir</fail>
1.16 <fail unless="test.src.dir">Must set test.src.dir</fail>
1.17 <fail unless="build.dir">Must set build.dir</fail>
1.18 <fail unless="dist.dir">Must set dist.dir</fail>
1.19 @@ -250,7 +252,7 @@
1.20 </target>
1.21 <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
1.22 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.23 - <attribute default="${src.dir}" name="srcdir"/>
1.24 + <attribute default="${src.dir}:${src.data.dir}" name="srcdir"/>
1.25 <attribute default="${build.classes.dir}" name="destdir"/>
1.26 <attribute default="${javac.classpath}" name="classpath"/>
1.27 <attribute default="${javac.processorpath}" name="processorpath"/>
1.28 @@ -290,7 +292,7 @@
1.29 </target>
1.30 <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
1.31 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.32 - <attribute default="${src.dir}" name="srcdir"/>
1.33 + <attribute default="${src.dir}:${src.data.dir}" name="srcdir"/>
1.34 <attribute default="${build.classes.dir}" name="destdir"/>
1.35 <attribute default="${javac.classpath}" name="classpath"/>
1.36 <attribute default="${javac.processorpath}" name="processorpath"/>
1.37 @@ -322,7 +324,7 @@
1.38 </target>
1.39 <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
1.40 <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
1.41 - <attribute default="${src.dir}" name="srcdir"/>
1.42 + <attribute default="${src.dir}:${src.data.dir}" name="srcdir"/>
1.43 <attribute default="${build.classes.dir}" name="destdir"/>
1.44 <attribute default="${javac.classpath}" name="classpath"/>
1.45 <sequential>
1.46 @@ -920,12 +922,13 @@
1.47 <include name="*"/>
1.48 </dirset>
1.49 </pathconvert>
1.50 - <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
1.51 + <j2seproject3:depend srcdir="${src.dir}:${src.data.dir}:${build.generated.subdirs}"/>
1.52 </target>
1.53 <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
1.54 <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
1.55 <copy todir="${build.classes.dir}">
1.56 <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.57 + <fileset dir="${src.data.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.58 </copy>
1.59 </target>
1.60 <target if="has.persistence.xml" name="-copy-persistence-xml">
1.61 @@ -946,7 +949,7 @@
1.62 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
1.63 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.64 <j2seproject3:force-recompile/>
1.65 - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
1.66 + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}:${src.data.dir}"/>
1.67 </target>
1.68 <target name="-post-compile-single">
1.69 <!-- Empty placeholder for easier customization. -->
1.70 @@ -1210,6 +1213,9 @@
1.71 <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
1.72 <filename name="**/*.java"/>
1.73 </fileset>
1.74 + <fileset dir="${src.data.dir}" excludes="*.java,${excludes}" includes="${includes}">
1.75 + <filename name="**/*.java"/>
1.76 + </fileset>
1.77 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
1.78 <include name="**/*.java"/>
1.79 <exclude name="*.java"/>
1.80 @@ -1220,6 +1226,9 @@
1.81 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1.82 <filename name="**/doc-files/**"/>
1.83 </fileset>
1.84 + <fileset dir="${src.data.dir}" excludes="${excludes}" includes="${includes}">
1.85 + <filename name="**/doc-files/**"/>
1.86 + </fileset>
1.87 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
1.88 <include name="**/doc-files/**"/>
1.89 </fileset>