53
53
<or />
54
54
</condition >
55
55
<condition property =" have.sources" >
56
- <or >
57
- <available file =" ${src.dir}" />
58
- <available file =" ${src.generatedsrc.dir}" />
59
- </or >
56
+ <or />
60
57
</condition >
61
58
<condition property =" netbeans.home+have.tests" >
62
59
<and >
185
182
<!-- You can override this target in the ../build.xml file. -->
186
183
</target >
187
184
<target depends =" -pre-init,-init-private,-init-user,-init-project,-do-init" name =" -init-check" >
188
- <fail unless =" src.dir" >Must set src.dir</fail >
189
- <fail unless =" src.generatedsrc.dir" >Must set src.generatedsrc.dir</fail >
190
185
<fail unless =" build.dir" >Must set build.dir</fail >
191
186
<fail unless =" build.web.dir" >Must set build.web.dir</fail >
192
187
<fail unless =" build.generated.dir" >Must set build.generated.dir</fail >
@@ -216,7 +211,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
216
211
</target >
217
212
<target name =" -init-macrodef-javac" >
218
213
<macrodef name =" javac" uri =" http://www.netbeans.org/ns/web-project/2" >
219
- <attribute default =" ${src.dir}:${src.generatedsrc.dir} " name =" srcdir" />
214
+ <attribute default =" " name =" srcdir" />
220
215
<attribute default =" ${build.classes.dir}" name =" destdir" />
221
216
<attribute default =" ${javac.classpath}:${j2ee.platform.classpath}" name =" classpath" />
222
217
<attribute default =" ${includes}" name =" includes" />
@@ -385,8 +380,16 @@ exists or setup the property manually. For example like this:
385
380
<!--
386
381
COMPILATION SECTION
387
382
-->
388
- <target depends =" init" if =" no.dist.ear.dir" name =" deps-module-jar" unless =" no.deps" />
389
- <target depends =" init" if =" dist.ear.dir" name =" deps-ear-jar" unless =" no.deps" />
383
+ <target depends =" init" if =" no.dist.ear.dir" name =" deps-module-jar" unless =" no.deps" >
384
+ <ant antfile =" ${project.opengrok}/build.xml" inheritall =" false" target =" jar" >
385
+ <property name =" deploy.on.save" value =" false" />
386
+ </ant >
387
+ </target >
388
+ <target depends =" init" if =" dist.ear.dir" name =" deps-ear-jar" unless =" no.deps" >
389
+ <ant antfile =" ${project.opengrok}/build.xml" inheritall =" false" target =" jar" >
390
+ <property name =" deploy.on.save" value =" false" />
391
+ </ant >
392
+ </target >
390
393
<target depends =" init, deps-module-jar, deps-ear-jar" name =" deps-jar" unless =" no.deps" />
391
394
<target depends =" init,deps-jar" name =" -pre-pre-compile" >
392
395
<mkdir dir =" ${build.classes.dir}" />
@@ -405,10 +408,7 @@ exists or setup the property manually. For example like this:
405
408
</target >
406
409
<target depends =" init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if =" have.sources" name =" -do-compile" >
407
410
<webproject2 : javac destdir =" ${build.classes.dir}" gensrcdir =" ${build.generated.sources.dir}" />
408
- <copy todir =" ${build.classes.dir}" >
409
- <fileset dir =" ${src.dir}" excludes =" ${build.classes.excludes},${excludes}" includes =" ${includes}" />
410
- <fileset dir =" ${src.generatedsrc.dir}" excludes =" ${build.classes.excludes},${excludes}" includes =" ${includes}" />
411
- </copy >
411
+ <copy todir =" ${build.classes.dir}" />
412
412
</target >
413
413
<target if =" has.custom.manifest" name =" -copy-manifest" >
414
414
<mkdir dir =" ${build.meta.inf.dir}" />
@@ -434,10 +434,7 @@ exists or setup the property manually. For example like this:
434
434
<target depends =" init,deps-jar,-pre-pre-compile" name =" -do-compile-single" >
435
435
<fail unless =" javac.includes" >Must select some files in the IDE or set javac.includes</fail >
436
436
<webproject2 : javac excludes =" " gensrcdir =" ${build.generated.sources.dir}" includes =" ${javac.includes}" />
437
- <copy todir =" ${build.classes.dir}" >
438
- <fileset dir =" ${src.dir}" excludes =" ${build.classes.excludes},${excludes}" includes =" ${includes}" />
439
- <fileset dir =" ${src.generatedsrc.dir}" excludes =" ${build.classes.excludes},${excludes}" includes =" ${includes}" />
440
- </copy >
437
+ <copy todir =" ${build.classes.dir}" />
441
438
</target >
442
439
<target name =" -post-compile-single" >
443
440
<!-- Empty placeholder for easier customization. -->
@@ -532,6 +529,7 @@ exists or setup the property manually. For example like this:
532
529
<copyfiles files =" ${file.reference.org.apache.commons.jrcs.rcs.jar}" iftldtodir =" ${build.web.dir}/WEB-INF" todir =" ${dist.ear.dir}/lib" />
533
530
<copyfiles files =" ${file.reference.org.apache.commons.jrcs.diff.jar}" iftldtodir =" ${build.web.dir}/WEB-INF" todir =" ${dist.ear.dir}/lib" />
534
531
<copyfiles files =" ${file.reference.lucene-spellchecker-3.0.1.jar}" iftldtodir =" ${build.web.dir}/WEB-INF" todir =" ${dist.ear.dir}/lib" />
532
+ <copyfiles files =" ${reference.opengrok.jar}" iftldtodir =" ${build.web.dir}/WEB-INF" todir =" ${dist.ear.dir}/lib" />
535
533
<mkdir dir =" ${build.web.dir}/META-INF" />
536
534
<manifest file =" ${build.web.dir}/META-INF/MANIFEST.MF" mode =" update" />
537
535
</target >
@@ -544,6 +542,7 @@ exists or setup the property manually. For example like this:
544
542
<copyfiles files =" ${file.reference.org.apache.commons.jrcs.rcs.jar}" todir =" ${build.web.dir}/WEB-INF\lib" />
545
543
<copyfiles files =" ${file.reference.org.apache.commons.jrcs.diff.jar}" todir =" ${build.web.dir}/WEB-INF\lib" />
546
544
<copyfiles files =" ${file.reference.lucene-spellchecker-3.0.1.jar}" todir =" ${build.web.dir}/WEB-INF\lib" />
545
+ <copyfiles files =" ${reference.opengrok.jar}" todir =" ${build.web.dir}/WEB-INF/lib" />
547
546
</target >
548
547
<target depends =" init" if =" dist.ear.dir" name =" -clean-webinf-lib" >
549
548
<delete dir =" ${build.web.dir}/WEB-INF/lib" />
@@ -732,12 +731,6 @@ exists or setup the property manually. For example like this:
732
731
<classpath >
733
732
<path path =" ${javac.classpath}:${j2ee.platform.classpath}" />
734
733
</classpath >
735
- <fileset dir =" ${src.dir}" excludes =" ${excludes}" includes =" ${includes}" >
736
- <filename name =" **/*.java" />
737
- </fileset >
738
- <fileset dir =" ${src.generatedsrc.dir}" excludes =" ${excludes}" includes =" ${includes}" >
739
- <filename name =" **/*.java" />
740
- </fileset >
741
734
<fileset dir =" ${build.generated.sources.dir}" erroronmissingdir =" false" >
742
735
<include name =" **/*.java" />
743
736
</fileset >
@@ -839,7 +832,9 @@ exists or setup the property manually. For example like this:
839
832
840
833
CLEANUP SECTION
841
834
-->
842
- <target depends =" init" if =" no.dist.ear.dir" name =" deps-clean" unless =" no.deps" />
835
+ <target depends =" init" if =" no.dist.ear.dir" name =" deps-clean" unless =" no.deps" >
836
+ <ant antfile =" ${project.opengrok}/build.xml" inheritall =" false" target =" clean" />
837
+ </target >
843
838
<target depends =" init" name =" do-clean" >
844
839
<condition property =" build.dir.to.clean" value =" ${build.web.dir}" >
845
840
<isset property =" dist.ear.dir" />
0 commit comments