Sophie

Sophie

distrib > Fedora > 14 > i386 > by-pkgid > 371f378791b6ec58b04dc0f8e0092016 > files > 4

clapham-0.1.003-4.fc14.src.rpm

diff -up clapham-0.1.003/build.xml.noivy clapham-0.1.003/build.xml
--- clapham-0.1.003/build.xml.noivy	2009-05-11 01:16:38.000000000 -0700
+++ clapham-0.1.003/build.xml	2011-01-09 00:57:47.000000000 -0800
@@ -17,7 +17,11 @@
   == along with this program; if not, write to the Free Software
   == Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -->
-<project name="clapham" default="compile" xmlns:ivy="antlib:org.apache.ivy.ant">
+<!--
+  == Changes by <eric@brouhaha.com> for Fedora RPM build:
+  ==   All references to Ivy removed
+-->
+<project name="clapham" default="compile">
     <property environment="env"/>
     <property file="build.properties"/>
 
@@ -26,11 +30,6 @@
     <property name="version" value="${project.revision}"/>
     <property name="vendor" value="${project.vendor}"/>
 
-    <!-- Define desired ivy version and location. -->
-    <property name="ivy.install.version" value="2.0.0-rc2"/>
-    <property name="ivy.jar.dir" value="${basedir}/ivy"/>
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
-
     <property name="project.location" location="${basedir}"/>
     <property name="src.dir" location="${basedir}/src"/>
     <property name="testsrc.dir" location="${basedir}/testsrc"/>
@@ -65,43 +64,6 @@
         <path refid="project.build.classpath"/>
     </path>
 
-    <!-- Bootstrap Ivy from web site so that it can be used without any special
-         installation. Then of course it will load all of the other jars we
-         need. -->
-    <target name="download-ivy" unless="skip.download">
-        <mkdir dir="${ivy.jar.dir}"/>
-        <get
-                src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
-                dest="${ivy.jar.file}"
-                usetimestamp="true"/>
-    </target>
-
-    <!-- Define ivy tasks. If you put ivy.jar in your ant lib directory, this
-         task is not necessary. -->
-    <target name="install-ivy" depends="download-ivy">
-        <!-- Try to load ivy here from local ivy dir, in case the user has not
-             already dropped it into ant's lib dir. (Note that the latter copy
-             will always take precedence.) We will not fail as long as local
-             lib dir exists (it may be empty) and ivy is in at least one of
-             ant's lib dir or the local lib dir. -->
-        <path id="ivy.lib.path">
-            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-        </path>
-        <taskdef
-                resource="org/apache/ivy/ant/antlib.xml"
-                uri="antlib:org.apache.ivy.ant"
-                classpathref="ivy.lib.path"/>
-        <ivy:settings file="${basedir}/ivysettings.xml"/>
-    </target>
-
-    <target name="clean-ivy">
-        <delete dir="${ivy.jar.dir}"/>
-    </target>
-
-    <target name="clean-cache" depends="install-ivy">
-        <ivy:cleancache/>
-    </target>
-
     <target name="wirth-parser">
         <javacc
                 target="src/net/hydromatic/clapham/parser/wirth/WirthParser.jj"
@@ -114,15 +76,10 @@
                 javacchome="${basedir}/lib"/>
     </target>
 
-    <target name="prepare" depends="download-ivy,install-ivy,resolve">
+    <target name="prepare">
         <mkdir dir="${classes.dir}"/>
     </target>
 
-    <target name="resolve" unless="skip.download">
-        <ivy:resolve file="ivy.xml"/>
-        <ivy:retrieve pattern="${lib.dir}/[module].[ext]"/>
-    </target>
-
     <target name="all" depends="prepare,wirth-parser,bnf-parser,compile"/>
 
     <target name="compile" depends="