Permalink
Browse files

Merge pull request #33 from joshmoore/7239-submods

OME build hooks
  • Loading branch information...
2 parents dca4603 + 3e892d1 commit 517ef9f73d5d13e6f3599953fb24281afa2b10db @melissalinkert melissalinkert committed Mar 12, 2012
Showing with 52 additions and 1 deletion.
  1. +9 −1 build.xml
  2. +28 −0 ivy.xml
  3. +15 −0 ome.xml
View
@@ -308,9 +308,17 @@ Apache XML-RPC
License: Apache
-->
-<project name="Bio-Formats" default="jars" basedir=".">
+<project name="Bio-Formats" default="jars" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
<description>
Master build file for all Java software projects at LOCI
</description>
<import file="ant/toplevel.xml"/>
+
+ <!-- OME-compatibility layer -->
+ <target name="dist" description="Hook for OME build to call Bio-Formats">
+ <ant target="tools"/>
+ <ant target="tools-ome"/>
+ <ant antfile="ome.xml" inheritRefs="false" inheritAll="false"/>
+ </target>
+
</project>
View
28 ivy.xml
@@ -0,0 +1,28 @@
+<ivy-module version="1.0">
+ <info organisation="ome" module="bio-formats" revision="4.3.3-DEV-ice33" status="integration" publication="20120228143140"/>
+ <configurations>
+ <conf name="build"/>
+ <conf name="runtime"/>
+ </configurations>
+ <publications>
+ <artifact name="bio-formats"/>
+ <artifact name="jai_imageio"/>
+ <artifact name="loci-common"/>
+ <artifact name="mdbtools-java"/>
+ <artifact name="metakit"/>
+ <artifact name="ome-io"/>
+ <artifact name="ome-xml"/>
+ <artifact name="poi-loci"/>
+ <artifact name="scifio"/>
+ </publications>
+ <dependencies defaultconfmapping="build,runtime->default">
+ <!-- Internal -->
+ <dependency name="specification" rev="4.3.3-DEV-ice33" changing="true" conf="build,runtime->build"/>
+ <!-- Deps -->
+ <dependency org="bf-deps" name="xalan" rev="2.7.1"/>
+ <dependency org="bf-deps" name="serializer" rev="2.7.1"/>
+ <dependency org="bf-deps" name="bufr" rev="1.1.00"/>
+ <dependency org="bf-deps" name="grib" rev="5.1.03"/>
+ <dependency org="bf-deps" name="netcdf" rev="4.0"/>
+ </dependencies>
+</ivy-module>
View
15 ome.xml
@@ -0,0 +1,15 @@
+<project name="OME-Bio-Formats-Build" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+ <description>
+ OME build file for Bio-Formats jars.
+ </description>
+
+ <property name="import.dir" value="${basedir}/../antlib/resources"/>
+ <import file="${import.dir}/global.xml"/>
+ <import file="${import.dir}/lifecycle.xml"/>
+
+ <target name="dist" depends="generate" description="Hook for OME build to call Bio-Formats">
+ <installIvy/>
+ <publishArtifact pattern="artifacts/[artifact].[ext]"/>
+ </target>
+
+</project>

0 comments on commit 517ef9f

Please sign in to comment.