forked from pool/ant-contrib
87447dd655
* no upstream changelog available - removed patches: * ant-contrib-1.0b2-enable-for-task.patch there is no for task in beta3 * ant-contrib-ant-1.7.0.patch no longer needed * ant-contrib-build_xml.patch fixed upstream - added patches: * ant-contrib-antservertest.patch * ant-contrib-pom.patch * local-ivy.patch - add pom file - add ant.d configuration OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant-contrib?expand=0&rev=14
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
--- build.xml.sav 2006-11-02 18:44:02.000000000 +0200
|
|
+++ build.xml 2011-12-15 13:36:38.630460824 +0200
|
|
@@ -20,22 +20,7 @@
|
|
<property name="dist.dir" location="dist" />
|
|
<property name="target.stage.dir" location="${target.dir}/stage" />
|
|
|
|
- <target name="init">
|
|
- <path id="ivy.lib.path">
|
|
- <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/>
|
|
- <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
|
|
- <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
|
|
- <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
|
|
- <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
|
|
- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
|
|
- </path>
|
|
-
|
|
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
|
|
- uri="antlib:fr.jayasoft.ivy.ant"
|
|
- classpathref="ivy.lib.path"/>
|
|
- </target>
|
|
-
|
|
- <target name="configure" depends="init">
|
|
+ <target name="configure" >
|
|
<ivy:configure file="ivy-conf.xml" />
|
|
</target>
|
|
|
|
--- ivy-conf.xml.sav 2006-10-28 14:57:58.000000000 +0300
|
|
+++ ivy-conf.xml 2011-12-15 14:35:15.155840710 +0200
|
|
@@ -5,11 +5,11 @@
|
|
|
|
<resolvers>
|
|
<filesystem name="local">
|
|
- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
|
|
- <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
|
|
+ <ivy pattern="${ivy.conf.dir}/lib/[module]/apache-ivy-[revision].xml" />
|
|
+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
|
|
</filesystem>
|
|
|
|
- <ivyrep name="ivyrep" />
|
|
+ <ivyrep name="ivyrep" ivyroot="."/>
|
|
|
|
<chain name="default-resolver">
|
|
<resolver ref="local" />
|