summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-04-23 20:34:59 -0700
committerGrant Limberg <glimberg@gmail.com>2015-04-23 20:34:59 -0700
commit1a528aec76ffd006c714c69b398796d45d5b33ce (patch)
tree7660433cb7c70c98a7c85053924467b343be6747
parentffb9e2901e542544c437af566615e6e10bc76771 (diff)
downloadinfinitytier-1a528aec76ffd006c714c69b398796d45d5b33ce.tar.gz
infinitytier-1a528aec76ffd006c714c69b398796d45d5b33ce.zip
don't require clean before build
Signed-off-by: Grant Limberg <glimberg@gmail.com>
-rwxr-xr-x.gitignore1
-rw-r--r--java/build.xml8
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 22dc4582..23b7526d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
java/obj/
java/libs/
java/bin/
+java/classes/
diff --git a/java/build.xml b/java/build.xml
index 30f8ab57..8c3a3293 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -3,24 +3,26 @@
<target name="clean">
<delete dir="bin" failonerror="false"/>
+ <delete dir="classes" failonerror="false"/>
<delete dir="libs" failonerror="false"/>
<delete dir="obj" failonerror="false"/>
</target>
- <target name="build" depends="clean">
+ <target name="build">
<echo message="os.name = ${os.name}"/>
<echo message="os.arch = ${os.arch}"/>
<echo message="ant.java.version = ${ant.java.version}"/>
<echo message="java.version = ${java.version}"/>
<mkdir dir="bin"/>
+ <mkdir dir="classes"/>
<javac srcdir="src"
- destdir="bin"
+ destdir="classes"
classpath="${env.ANDROID_PLATFORM}/android.jar"
includeantruntime="false"/>
<exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true">
<arg value="ZT1=${user.dir}/../"/>
</exec>
- <jar destfile="bin/ZeroTierOneSDK.jar" basedir="bin"/>
+ <jar destfile="bin/ZeroTierOneSDK.jar" basedir="classes"/>
</target>
<!-- <target name="android" depends="build">