1.1 --- a/java/alt2xml-out-xml/nbproject/build-impl.xml	Sat Jun 14 22:56:51 2014 +0200
     1.2 +++ b/java/alt2xml-out-xml/nbproject/build-impl.xml	Sun Jun 15 14:50:49 2014 +0200
     1.3 @@ -127,6 +127,7 @@
     1.4          </condition>
     1.5          <condition property="have.sources">
     1.6              <or>
     1.7 +                <available file="${src.config.dir}"/>
     1.8                  <available file="${src.dir}"/>
     1.9              </or>
    1.10          </condition>
    1.11 @@ -223,6 +224,7 @@
    1.12          <!-- You can override this target in the ../build.xml file. -->
    1.13      </target>
    1.14      <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
    1.15 +        <fail unless="src.config.dir">Must set src.config.dir</fail>
    1.16          <fail unless="src.dir">Must set src.dir</fail>
    1.17          <fail unless="test.src.dir">Must set test.src.dir</fail>
    1.18          <fail unless="build.dir">Must set build.dir</fail>
    1.19 @@ -245,7 +247,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.config.dir}:${src.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 @@ -286,7 +288,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.config.dir}:${src.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 @@ -319,7 +321,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.config.dir}:${src.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 @@ -925,11 +927,12 @@
    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.config.dir}:${src.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.config.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    1.57              <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    1.58          </copy>
    1.59      </target>
    1.60 @@ -951,7 +954,7 @@
    1.61      <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
    1.62          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    1.63          <j2seproject3:force-recompile/>
    1.64 -        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
    1.65 +        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.config.dir}:${src.dir}"/>
    1.66      </target>
    1.67      <target name="-post-compile-single">
    1.68          <!-- Empty placeholder for easier customization. -->
    1.69 @@ -1217,6 +1220,9 @@
    1.70              <classpath>
    1.71                  <path path="${javac.classpath}"/>
    1.72              </classpath>
    1.73 +            <fileset dir="${src.config.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
    1.74 +                <filename name="**/*.java"/>
    1.75 +            </fileset>
    1.76              <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
    1.77                  <filename name="**/*.java"/>
    1.78              </fileset>
    1.79 @@ -1227,6 +1233,9 @@
    1.80              <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
    1.81          </javadoc>
    1.82          <copy todir="${dist.javadoc.dir}">
    1.83 +            <fileset dir="${src.config.dir}" excludes="${excludes}" includes="${includes}">
    1.84 +                <filename name="**/doc-files/**"/>
    1.85 +            </fileset>
    1.86              <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
    1.87                  <filename name="**/doc-files/**"/>
    1.88              </fileset>