From 7ca050fdf582bcc68a822590d942d810669fd878 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 27 Jun 2014 15:20:58 +0000
Subject: [PATCH] Cleaned up routerjars
---
routerjars/build.gradle | 8 +++++++-
routerjars/build.xml | 19 -------------------
2 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/routerjars/build.gradle b/routerjars/build.gradle
index 6eb5738c5..5d9d2fb11 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 accc3ba2a..ba737591a 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>
--
GitLab