X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=build.xml;h=2641c5a7dfb75eaf289eb1f46424540066bc15d8;hb=a4406f4ed7f163b7ab0adce2e710b74d1175b1f3;hp=da82c0ff848e87ed99daf6b67ea08bf37cddf680;hpb=05dbb28d6e8613216f43e8d0fae487c1d9c2fcd3;p=nikiroo-utils.git

diff --git a/build.xml b/build.xml
index da82c0f..2641c5a 100644
--- a/build.xml
+++ b/build.xml
@@ -30,67 +30,66 @@
 
 <project name="jexer" basedir="." default="run">
 
-    <property name="src.dir"     value="src"/>
-    <property name="build.dir"   value="build"/>
-    <property name="classes.dir" value="${build.dir}/classes"/>
-    <property name="jar.dir"     value="${build.dir}/jar"/>
-
-    <property name="demo.class"  value="Demo1"/>
+    <property name="src.dir"       value="src"/>
+    <property name="resources.dir" value="resources"/>
+    <property name="build.dir"     value="build"/>
+    <property name="classes.dir"   value="${build.dir}/classes"/>
+    <property name="jar.dir"       value="${build.dir}/jar"/>
+    <property name="apidocs.dir"   value="docs/api"/>
 
     <target name="clean">
-        <delete dir="${build.dir}"/>
+	<delete dir="${build.dir}"/>
+	<delete dir="${apidocs.dir}"/>
     </target>
 
     <target name="compile">
-        <mkdir dir="${classes.dir}"/>
-        <javac srcdir="${src.dir}" destdir="${classes.dir}"
+	<mkdir dir="${classes.dir}"/>
+	<javac srcdir="${src.dir}" destdir="${classes.dir}"
 	       includeantruntime="false"/>
     </target>
 
     <target name="jar" depends="compile">
-        <mkdir dir="${jar.dir}"/>
-        <jar destfile="${jar.dir}/${ant.project.name}.jar"
-	     basedir="${classes.dir}"
-	     excludes="**/Demo*" >
-        </jar>
-    </target>
-
-    <target name="demos" depends="jar">
-      <mkdir dir="${classes.dir}"/>
-      <javac srcdir="demos" destdir="${classes.dir}"
-	     includeantruntime="false"/>
+	<mkdir dir="${jar.dir}"/>
+	<jar destfile="${jar.dir}/${ant.project.name}.jar"
+	     basedir="${classes.dir}">
+	  <fileset dir="${resources.dir}"/>
+	  <!-- By including Jexer's source, the LGPL terms are
+	       automatically satisfied. -->
+	  <fileset dir="${src.dir}"/>
+	  <manifest>
+	    <attribute name="Main-Class" value="jexer.demos.Demo1"/>
+	  </manifest>
+	</jar>
     </target>
 
-    <target name="run" depends="jar,docs,demos">
-      <java classname="${demo.class}" fork="false">
-	<classpath>
-          <path location="${jar.dir}/${ant.project.name}.jar"/>
-          <path location="${classes.dir}"/>
-	</classpath>
+    <target name="run" depends="jar">
+      <java jar="${jar.dir}/${ant.project.name}.jar" fork="true">
+	<arg value="-Djexer.Swing=true"/>
       </java>
     </target>
 
     <target name="clean-build" depends="clean,jar"/>
 
     <target name="main" depends="clean,run"/>
-    
+
+    <target name="doc" depends="docs"/>
+
     <target name="docs" depends="jar">
       <javadoc
-          destdir="docs/api"
-          author="true"
-          version="true"
-          use="true"
-	  access="private"
+	  destdir="${apidocs.dir}"
+	  author="true"
+	  version="true"
+	  use="true"
+	  access="protected"
 	  failonwarning="true"
-          windowtitle="Jexer - Java Text User Interface - API docs">
+	  windowtitle="Jexer - Java Text User Interface - API docs">
 
 	<fileset dir="${src.dir}" defaultexcludes="yes">
 	  <include name="jexer/**"/>
-	  <exclude name="demos/**"/>
 	</fileset>
 
 	<doctitle>
-	  <![CDATA[<h1>Test</h1>]]>
+	  <![CDATA[<h1>Jexer - Java Text User Interface Library</h1>]]>
 	</doctitle>
 	<bottom>
 	  <![CDATA[<i>Copyright &#169; 2015 Kevin Lamonte. Licensed LGPLv3+</i>]]>
@@ -106,5 +105,5 @@
 	-->
       </javadoc>
     </target>
-    
+
 </project>