diff options
Diffstat (limited to 'nbproject/build-impl.xml')
| -rwxr-xr-x | nbproject/build-impl.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 1bf7540..02bb0a6 100755 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -90,6 +90,7 @@ is divided into following sections: </condition>
<condition property="have.sources">
<or>
+ <available file="${src.www.dir}"/>
<available file="${src.dir}"/>
<available file="${src.java.dir}"/>
<available file="${src.res.dir}"/>
@@ -147,6 +148,7 @@ is divided into following sections: <!-- You can override this target in the ../build.xml file. -->
</target>
<target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
+ <fail unless="src.www.dir">Must set src.www.dir</fail>
<fail unless="src.dir">Must set src.dir</fail>
<fail unless="src.java.dir">Must set src.java.dir</fail>
<fail unless="src.res.dir">Must set src.res.dir</fail>
@@ -173,7 +175,7 @@ is divided into following sections: </target>
<target name="-init-macrodef-javac">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
+ <attribute default="${src.www.dir}:${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${includes}" name="includes"/>
@@ -192,7 +194,7 @@ is divided into following sections: </sequential>
</macrodef>
<macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
+ <attribute default="${src.www.dir}:${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -352,6 +354,7 @@ is divided into following sections: <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
<j2seproject3:javac/>
<copy todir="${build.classes.dir}">
+ <fileset dir="${src.www.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.res.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -370,7 +373,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="" includes="${javac.includes}" sourcepath="${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}"/>
+ <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.www.dir}:${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -504,6 +507,9 @@ is divided into following sections: <classpath>
<path path="${javac.classpath}"/>
</classpath>
+ <fileset dir="${src.www.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
<fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
|