diff --git a/routerjars/build.gradle b/routerjars/build.gradle index 6eb5738c5c47d7c2d35f2807872d8f9c88a0e420..5d9d2fb116d3f3b1091fc74243f2b1c2f23ea9aa 100644 --- a/routerjars/build.gradle +++ b/routerjars/build.gradle @@ -16,4 +16,10 @@ artifacts.add('default', file('libs/i2ptunnel.jar')) artifacts.add('default', file('libs/addressbook.jar')) artifacts.add('default', file('libs/BOB.jar')) -clean.dependsOn cleanBuildJars \ No newline at end of file +clean.dependsOn cleanBuildJars + +clean << { + exec { + commandLine 'ant', 'clean' + } +} \ No newline at end of file diff --git a/routerjars/build.xml b/routerjars/build.xml index accc3ba2aae516874b949735dbb71c9797def149..ba737591a1483848dc440fdf65e330c7f12e7bbc 100644 --- a/routerjars/build.xml +++ b/routerjars/build.xml @@ -16,17 +16,6 @@ </fail> <echo message="Using I2P source at ${i2pbase}" /> - <!-- this loads my.version.code and my.version.name --> - <property file="../scripts/version.properties" /> - <property name="version.code" value="${my.version.code}" /> - <property name="version.name" value="${my.version.name}" /> - <echo message="version.code '${version.code}', 'version.name '${version.name}', '${my.version.name}'" /> - - <target name="-pre-compile" depends="jbigi, buildrouter" /> - - <!-- new rules --> - - <available property="have.router" file="${i2pbase}/build/router.jar" /> <available property="have.bob" file="${i2pbase}/apps/BOB/dist/BOB.jar" /> <available property="have.i2ptunnel" file="${i2pbase}/apps/i2ptunnel/java/build/i2ptunnel.jar" /> @@ -80,14 +69,6 @@ </target> - <target name="jbigi" > - <exec executable="sh" osfamily="unix" failonerror="true"> - <arg value="-c" /> - <arg value="jni/build.sh ${i2pbase}" /> - </exec> - <copy file="jni/libjbigi.so" todir="${jar.libs.dir}/armeabi" /> - </target> - <target name="clean"> <ant dir="${i2pbase}" target="clean" /> </target>