Skip to content

Commit

Permalink
Make build-blitz target faster (Fix #8356)
Browse files Browse the repository at this point in the history
Use hard-coded paths for the blitz.buildpath
variable in ant. This prevents rogue directories
(for example see the submodule work of omegh-104)
from being built. In this case, insight is not
touched at all:

{{{
  $ ./build.py build-blitz 2>&1 | tee build.log
  $ grep -i insight build.log # Nothing.
}}}

Note: in order to have tests working, it will
likely be necessary to run the full build.
  • Loading branch information
joshmoore committed Mar 22, 2012
1 parent 52d5f30 commit 392cc15
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,18 @@ java component.
</then></if>
<installIvy/>
<ivy:buildlist reference="all.buildpath" settingsRef="ivy.toplevel">
<fileset dir="${omero.home}/components" includes="*/build.xml" excludes="**/policy/**,**/tools/**"/>
<fileset dir="${omero.home}/components" includes="*/build.xml" excludes="**/tools/**"/>
</ivy:buildlist>
<ivy:buildlist reference="blitzserver.buildpath" settingsRef="ivy.toplevel">
<fileset dir="${omero.home}/components" includes="*/build.xml" excludes="**/policy/**,**/tools/**"/>
<fileset dir="${omero.home}/components/blitz/" includes="build.xml"/>
<fileset dir="${omero.home}/components/common/" includes="build.xml"/>
<fileset dir="${omero.home}/components/dsl/" includes="build.xml"/>
<fileset dir="${omero.home}/components/model/" includes="build.xml"/>
<fileset dir="${omero.home}/components/rendering/" includes="build.xml"/>
<fileset dir="${omero.home}/components/romio/" includes="build.xml"/>
<fileset dir="${omero.home}/components/server/" includes="build.xml"/>
<fileset dir="${omero.home}/components/specification/" includes="build.xml"/>
<fileset dir="${omero.home}/components/xsd-fu/" includes="build.xml"/>
</ivy:buildlist>
<ivy:buildlist reference="all-tools.buildpath" settingsRef="ivy.toplevel">
<fileset dir="${omero.home}/components/tools" includes="*/build.xml"/>
Expand Down

0 comments on commit 392cc15

Please sign in to comment.