Use the ooo-build structure

threerings · Feb 24, 2011 · 23955fd · 23955fd
1 parent 1a71661
commit 23955fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
   <!-- bring in our standard build support -->
   <property name="ooo-build.vers" value="2.0"/>
   <ant antfile="etc/bootstrap.xml"/>
-  <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/build-support.xml"/>
+  <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
   <target name="distclean">
     <delete dir="${deploy.dir}"/>

diff --git a/etc/bootstrap.xml b/etc/bootstrap.xml
@@ -7,7 +7,7 @@
 
        <property name="ooo-build.vers" value="1.3"/>
        <ant antfile="bootstrap.xml"/>
-       <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/build-support.xml"/>
+       <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
        to the top level of your build.xml.  Then you can depend on -init-ooo in your lowest level
        target and pick up all the standard ooo ant tasks and macros.
@@ -28,8 +28,8 @@
   </target>
 
   <property name="ooo-build.dir" value="${maven.dir}/ooo-build/${ooo-build.vers}"/>
-  <condition property="build-support.exists"><available file="${ooo-build.dir}/build-support.xml"/></condition>
-  <target name="-extract-ooo-build" depends="-download-ooo-build" unless="build-support.exists">
+  <condition property="extracted.exists"><available file="${ooo-build.dir}/ooo-build.xml"/></condition>
+  <target name="-extract-ooo-build" depends="-download-ooo-build" unless="extracted.exists">
     <mkdir dir="${ooo-build.dir}"/>
     <unjar src="${ooo-build.local.file}" dest="${ooo-build.dir}"/>
   </target>