diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 6a17607ce0938197358038d301e1e6e6c4b325e2..a14fccdec12d5a0a1ff41b6bb8e2569b2d361d4b 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -90,7 +90,7 @@ is divided into following sections: </not> </condition> </fail> - <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/> + <j2seproject3:modulename property="module.name" sourcepath="${src.dir}:${src.src-generated.dir}"/> <condition property="named.module.internal"> <and> <isset property="module.name"/> @@ -186,6 +186,7 @@ is divided into following sections: <condition property="have.sources"> <or> <available file="${src.dir}"/> + <available file="${src.src-generated.dir}"/> </or> </condition> <condition property="netbeans.home+have.tests"> @@ -289,6 +290,7 @@ is divided into following sections: </target> <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check"> <fail unless="src.dir">Must set src.dir</fail> + <fail unless="src.src-generated.dir">Must set src.src-generated.dir</fail> <fail unless="test.src.dir">Must set test.src.dir</fail> <fail unless="build.dir">Must set build.dir</fail> <fail unless="dist.dir">Must set dist.dir</fail> @@ -310,7 +312,7 @@ is divided into following sections: </target> <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> - <attribute default="${src.dir}" name="srcdir"/> + <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> <attribute default="${javac.modulepath}" name="modulepath"/> @@ -322,7 +324,7 @@ is divided into following sections: <attribute default="${excludes}" name="excludes"/> <attribute default="${javac.debug}" name="debug"/> <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/> - <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/> + <attribute default="${src.dir}:${src.src-generated.dir}" if:set="named.module.internal" name="sourcepath"/> <attribute default="${empty.dir}" name="gensrcdir"/> <element name="customize" optional="true"/> <sequential> @@ -377,7 +379,7 @@ is divided into following sections: </target> <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> - <attribute default="${src.dir}" name="srcdir"/> + <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> <attribute default="${javac.modulepath}" name="modulepath"/> @@ -420,7 +422,7 @@ is divided into following sections: </target> <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> - <attribute default="${src.dir}" name="srcdir"/> + <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> <attribute default="${javac.modulepath}" name="modulepath"/> @@ -455,7 +457,7 @@ is divided into following sections: </target> <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> - <attribute default="${src.dir}" name="srcdir"/> + <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> <sequential> @@ -1090,12 +1092,13 @@ is divided into following sections: <include name="*"/> </dirset> </pathconvert> - <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/> + <j2seproject3:depend srcdir="${src.dir}:${src.src-generated.dir}:${build.generated.subdirs}"/> </target> <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile"> <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/> <copy todir="${build.classes.dir}"> <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + <fileset dir="${src.src-generated.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> </copy> </target> <target if="has.persistence.xml" name="-copy-persistence-xml"> @@ -1116,7 +1119,7 @@ is divided into following sections: <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile/> - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/> + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}:${src.src-generated.dir}"/> </target> <target name="-post-compile-single"> <!-- Empty placeholder for easier customization. --> @@ -1511,6 +1514,9 @@ is divided into following sections: <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> + <fileset dir="${src.src-generated.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> <include name="**/*.java"/> <exclude name="*.java"/> @@ -1522,6 +1528,9 @@ is divided into following sections: <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/doc-files/**"/> </fileset> + <fileset dir="${src.src-generated.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> <include name="**/doc-files/**"/> </fileset>