Browse Source

don't require clean before build

Signed-off-by: Grant Limberg <[email protected]>
Grant Limberg 10 years ago
parent
commit
1a528aec76
2 changed files with 6 additions and 3 deletions
  1. 1 0
      .gitignore
  2. 5 3
      java/build.xml

+ 1 - 0
.gitignore

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

+ 5 - 3
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">