Skip to content

Commit 3d35af9

Browse files
Knut Anders Hatlentrondn
Knut Anders Hatlen
authored and
trondn
committed
Make web project dependent on main project
Since NetBeans is not very happy with projects that share source roots (see http://wiki.netbeans.org/FaqSourceRootOverlap), I've removed ../src and ../generatedsrc from the web project's list of source roots, and instead added the main OpenGrok project as a dependency.
1 parent e96415d commit 3d35af9

File tree

4 files changed

+39
-41
lines changed

4 files changed

+39
-41
lines changed

‎opengrok-web-nbproject/build.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,5 @@
99
<!-- in the project's Project Properties dialog box.-->
1010
<project name="opengrok-web-nbproject" default="default" basedir=".">
1111
<description>Builds, tests, and runs the project opengrok-web-nbproject.</description>
12-
<import file="nbproject/build-impl.xml"/>
13-
<import file="../build.xml"/>
14-
15-
<target name="-pre-compile" depends="jflex"/>
16-
17-
<target name="-post-clean">
18-
<delete dir="${src.generatedsrc.dir}"/>
19-
<delete file="${manifest.file}"/>
20-
</target>
21-
12+
<import file="nbproject/build-impl.xml"/>
2213
</project>

‎opengrok-web-nbproject/nbproject/build-impl.xml

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@
5353
<or/>
5454
</condition>
5555
<condition property="have.sources">
56-
<or>
57-
<available file="${src.dir}"/>
58-
<available file="${src.generatedsrc.dir}"/>
59-
</or>
56+
<or/>
6057
</condition>
6158
<condition property="netbeans.home+have.tests">
6259
<and>
@@ -185,8 +182,6 @@
185182
<!-- You can override this target in the ../build.xml file. -->
186183
</target>
187184
<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>
190185
<fail unless="build.dir">Must set build.dir</fail>
191186
<fail unless="build.web.dir">Must set build.web.dir</fail>
192187
<fail unless="build.generated.dir">Must set build.generated.dir</fail>
@@ -216,7 +211,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
216211
</target>
217212
<target name="-init-macrodef-javac">
218213
<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"/>
220215
<attribute default="${build.classes.dir}" name="destdir"/>
221216
<attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
222217
<attribute default="${includes}" name="includes"/>
@@ -385,8 +380,16 @@ exists or setup the property manually. For example like this:
385380
<!--
386381
COMPILATION SECTION
387382
-->
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>
390393
<target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
391394
<target depends="init,deps-jar" name="-pre-pre-compile">
392395
<mkdir dir="${build.classes.dir}"/>
@@ -405,10 +408,7 @@ exists or setup the property manually. For example like this:
405408
</target>
406409
<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">
407410
<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}"/>
412412
</target>
413413
<target if="has.custom.manifest" name="-copy-manifest">
414414
<mkdir dir="${build.meta.inf.dir}"/>
@@ -434,10 +434,7 @@ exists or setup the property manually. For example like this:
434434
<target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
435435
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
436436
<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}"/>
441438
</target>
442439
<target name="-post-compile-single">
443440
<!-- Empty placeholder for easier customization. -->
@@ -532,6 +529,7 @@ exists or setup the property manually. For example like this:
532529
<copyfiles files="${file.reference.org.apache.commons.jrcs.rcs.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
533530
<copyfiles files="${file.reference.org.apache.commons.jrcs.diff.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
534531
<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"/>
535533
<mkdir dir="${build.web.dir}/META-INF"/>
536534
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
537535
</target>
@@ -544,6 +542,7 @@ exists or setup the property manually. For example like this:
544542
<copyfiles files="${file.reference.org.apache.commons.jrcs.rcs.jar}" todir="${build.web.dir}/WEB-INF\lib"/>
545543
<copyfiles files="${file.reference.org.apache.commons.jrcs.diff.jar}" todir="${build.web.dir}/WEB-INF\lib"/>
546544
<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"/>
547546
</target>
548547
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
549548
<delete dir="${build.web.dir}/WEB-INF/lib"/>
@@ -732,12 +731,6 @@ exists or setup the property manually. For example like this:
732731
<classpath>
733732
<path path="${javac.classpath}:${j2ee.platform.classpath}"/>
734733
</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>
741734
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
742735
<include name="**/*.java"/>
743736
</fileset>
@@ -839,7 +832,9 @@ exists or setup the property manually. For example like this:
839832
840833
CLEANUP SECTION
841834
-->
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>
843838
<target depends="init" name="do-clean">
844839
<condition property="build.dir.to.clean" value="${build.web.dir}">
845840
<isset property="dist.ear.dir"/>

‎opengrok-web-nbproject/nbproject/project.properties

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ javac.classpath=\
4848
${file.reference.jmxremote_optional.jar}:\
4949
${file.reference.org.apache.commons.jrcs.rcs.jar}:\
5050
${file.reference.org.apache.commons.jrcs.diff.jar}:\
51-
${file.reference.lucene-spellchecker-3.0.1.jar}
51+
${file.reference.lucene-spellchecker-3.0.1.jar}:\
52+
${reference.opengrok.jar}
5253
# Space-separated list of extra javac options
5354
javac.compilerargs=-Xlint:unchecked
5455
javac.debug=true
@@ -76,6 +77,8 @@ jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
7677
lib.dir=${source.root}/lib
7778
persistence.xml.dir=${source.root}/web
7879
platform.active=default_platform
80+
project.opengrok=..
81+
reference.opengrok.jar=${project.opengrok}/dist/opengrok.jar
7982
resource.dir=setup
8083
run.test.classpath=\
8184
${javac.test.classpath}:\
@@ -85,8 +88,6 @@ run.test.classpath=\
8588
runmain.jvmargs=
8689
source.encoding=UTF-8
8790
source.root=${file.reference.Projects-opengrok}
88-
src.dir=${file.reference.opengrok-src}
89-
src.generatedsrc.dir=${file.reference.opengrok-generatedsrc}
9091
war.content.additional=
9192
war.ear.name=source.war
9293
war.name=source.war

‎opengrok-web-nbproject/nbproject/project.xml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,24 @@
4141
<file>${file.reference.lucene-spellchecker-3.0.1.jar}</file>
4242
<path-in-war>WEB-INF\lib</path-in-war>
4343
</library>
44+
<library dirs="200">
45+
<file>${reference.opengrok.jar}</file>
46+
<path-in-war>WEB-INF/lib</path-in-war>
47+
</library>
4448
</web-module-libraries>
4549
<web-module-additional-libraries/>
46-
<source-roots>
47-
<root id="src.dir" name="..\src"/>
48-
<root id="src.generatedsrc.dir" name="..\generatedsrc"/>
49-
</source-roots>
50+
<source-roots/>
5051
<test-roots/>
5152
</data>
53+
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
54+
<reference>
55+
<foreign-project>opengrok</foreign-project>
56+
<artifact-type>jar</artifact-type>
57+
<script>build.xml</script>
58+
<target>jar</target>
59+
<clean-target>clean</clean-target>
60+
<id>jar</id>
61+
</reference>
62+
</references>
5263
</configuration>
5364
</project>

0 commit comments

Comments
 (0)