Download ivy from ant

This commit is contained in:
Nikolay Borodin 2024-04-02 19:27:53 +02:00
parent f1a896dd46
commit a2afb3cab6
2 changed files with 21 additions and 3 deletions

View file

@ -18,6 +18,5 @@ deploy:jdk8:
- apt update
- apt -y install ant make gcc gcc-multilib mingw-w64 mingw-w64-tools mingw-w64-i686-dev mingw-w64-x86-64-dev openjdk-11-jdk libayatana-appindicator3-dev libnotify-dev
- git submodule update --init --recursive
- curl https://repo1.maven.org/maven2/org/apache/ivy/ivy/2.5.2/ivy-2.5.2.jar --create-dirs -o "${HOME}/.ant/lib/ivy.jar"
- make install

View file

@ -26,6 +26,13 @@
<property name="clib" value="clib"/>
<property name="resources" value="resources"/>
<property name="classpath" value="lib/commons-jxpath-1.1.jar;lib/commons-logging-1.2.jar;lib/bcprov-jdk15on-1.70.jar;lib/junit-4.5.jar;lib/commons-codec-1.3.jar;lib/swing-layout-1.0.3.jar;lib/WaifUPnP.jar;lib/flatlaf-3.1.1.jar"/>
<property name="ivy.install.version" value="2.5.2"/>
<condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME"/>
</condition>
<property name="ivy.home" value="${user.home}/.ant"/>
<property name="ivy.jar.dir" value="${ivy.home}/lib"/>
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
<target name="init">
<mkdir dir="${build}"/>
@ -57,9 +64,21 @@
<copy file="3rdparty/WaifUPnP/dist/WaifUPnP.jar" tofile="lib/WaifUPnP.jar"/>
</target>
<target name="resolve">
<target name="resolve" depends="init-ivy">
<ivy:retrieve/>
</target>
</target>
<target name="init-ivy" depends="download-ivy">
<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"/>
</target>
<target name="download-ivy" unless="offline">
<mkdir dir="${ivy.jar.dir}"/>
<get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
<target name="jar" depends="compile">
<mkdir dir="${build}/lib"/>