changed build.xml: changed name of the jar that is crated & let the default target also crate the javadoc

Davidiusdadi · Davidiusdadi · commit da227bde5eab · 2012-11-01T01:11:56.000+01:00
diff --git a/build.xml b/build.xml
@@ -1,28 +1,29 @@
-<project default="jar">
+<project default="all">
 
-  <target name="compile">
-    <mkdir dir="build/classes" />
-    <mkdir dir="build/examples" />
-    <javac includeantruntime="false" debug="on" srcdir="src" destdir="build/classes" />
-    <javac includeantruntime="false" srcdir="example" classpath="build/classes" destdir="build/examples" />
-  </target>
+	<target name="all" depends="doc,jar" />
 
-  <target name="jar" depends="compile">
-    <jar destfile="dist/WebSocket.jar"
-         basedir="build/classes"
-         includes="**/*.class"
-         />
-  </target>
+	<target name="compile">
+		<mkdir dir="build/classes" />
+		<mkdir dir="build/examples" />
+		<javac includeantruntime="false" debug="on" srcdir="src/main/java"
+			destdir="build/classes" />
+		<javac includeantruntime="false" srcdir="src/main/example/"
+			classpath="build/classes" destdir="build/examples" />
+	</target>
 
-  <target name="doc">
-    <delete dir="doc" />
-    <javadoc sourcepath="src"
-             destdir="doc"
-          />
-  </target>
-  
-  <target name="clean">
-    <delete dir="build"/>
-  </target>
+	<target name="jar" depends="compile">
+		<jar destfile="dist/java_websocket.jar">
+			<fileset dir="build/classes" includes="**/*.class" />
+		</jar>
+	</target>
+
+	<target name="doc">
+		<delete dir="doc" />
+		<javadoc sourcepath="src/main/java" destdir="doc" />
+	</target>
+
+	<target name="clean">
+		<delete dir="build" />
+	</target>
 
 </project>
