don't require clean before build

Signed-off-by: Grant Limberg <glimberg@gmail.com>
This commit is contained in:
Grant Limberg 2015-04-23 20:34:59 -07:00
parent ffb9e2901e
commit 1a528aec76
2 changed files with 6 additions and 3 deletions

1
.gitignore vendored
View File

@ -47,3 +47,4 @@
java/obj/ java/obj/
java/libs/ java/libs/
java/bin/ java/bin/
java/classes/

View File

@ -3,24 +3,26 @@
<target name="clean"> <target name="clean">
<delete dir="bin" failonerror="false"/> <delete dir="bin" failonerror="false"/>
<delete dir="classes" failonerror="false"/>
<delete dir="libs" failonerror="false"/> <delete dir="libs" failonerror="false"/>
<delete dir="obj" failonerror="false"/> <delete dir="obj" failonerror="false"/>
</target> </target>
<target name="build" depends="clean"> <target name="build">
<echo message="os.name = ${os.name}"/> <echo message="os.name = ${os.name}"/>
<echo message="os.arch = ${os.arch}"/> <echo message="os.arch = ${os.arch}"/>
<echo message="ant.java.version = ${ant.java.version}"/> <echo message="ant.java.version = ${ant.java.version}"/>
<echo message="java.version = ${java.version}"/> <echo message="java.version = ${java.version}"/>
<mkdir dir="bin"/> <mkdir dir="bin"/>
<mkdir dir="classes"/>
<javac srcdir="src" <javac srcdir="src"
destdir="bin" destdir="classes"
classpath="${env.ANDROID_PLATFORM}/android.jar" classpath="${env.ANDROID_PLATFORM}/android.jar"
includeantruntime="false"/> includeantruntime="false"/>
<exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true"> <exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true">
<arg value="ZT1=${user.dir}/../"/> <arg value="ZT1=${user.dir}/../"/>
</exec> </exec>
<jar destfile="bin/ZeroTierOneSDK.jar" basedir="bin"/> <jar destfile="bin/ZeroTierOneSDK.jar" basedir="classes"/>
</target> </target>
<!-- <target name="android" depends="build"> <!-- <target name="android" depends="build">