X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=build.xml;h=0bdf890e2eed19c2f311b13f0da8a5a9d2a7787a;hb=9240f032a51de25bdc90bdebec99bb63896b24d0;hp=0209da005156511c83c85703178043642ebd3d16;hpb=e685a47d98ab73fde720b670dd8e0b4f677b827f;p=fanfix.git

diff --git a/build.xml b/build.xml
index 0209da0..0bdf890 100644
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,7 @@
 
    The MIT License (MIT)
 
-   Copyright (C) 2017 Kevin Lamonte
+   Copyright (C) 2019 Kevin Lamonte
 
    Permission is hereby granted, free of charge, to any person
    obtaining a copy of this software and associated documentation
@@ -30,12 +30,7 @@
 
 <project name="jexer" basedir="." default="jar">
 
-  <!--
-      I am using GCJ deliberately to test against Java 1.5 features.
-  -->
-  <property name="build.compiler" value="gcj"/>
-
-  <property name="version"       value="0.0.5"/>
+  <property name="version"       value="1.0.0"/>
   <property name="src.dir"       value="src"/>
   <property name="resources.dir" value="resources"/>
   <property name="build.dir"     value="build"/>
@@ -51,22 +46,37 @@
   <target name="compile">
     <mkdir dir="${classes.dir}"/>
     <javac srcdir="${src.dir}" destdir="${classes.dir}"
-	   includeantruntime="false"
-	   debug="on"
-	   debuglevel="lines,vars,source"
-	   />
+           includeantruntime="false"
+           debug="on"
+           debuglevel="lines,vars,source"
+           target="1.6"
+           source="1.6"
+           >
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xdiags:verbose"/>
+      <compilerarg value="-Xlint:deprecation" />
+    </javac>
   </target>
 
   <target name="jar" depends="compile">
     <mkdir dir="${jar.dir}"/>
     <jar destfile="${jar.dir}/${ant.project.name}.jar"
-	 basedir="${classes.dir}">
-      <fileset dir="${resources.dir}"/>
+         basedir="${classes.dir}">
+
+      <fileset dir="${resources.dir}">
+        <exclude name="**/*TTF-4.39.ttf" />
+        <exclude name="**/*Italic*.ttf" />
+      </fileset>
+
+      <!-- Include properties files. -->
+      <fileset dir="${src.dir}" includes="**/*.properties"/>
+
       <!-- Include source by default. -->
-      <fileset dir="${src.dir}"/>
+      <!-- <fileset dir="${src.dir}"/> -->
+
       <manifest>
-	<attribute name="Main-Class" value="jexer.demos.Demo1"/>
-	<attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Main-Class" value="jexer.demos.Demo1"/>
+        <attribute name="Implementation-Version" value="${version}"/>
       </manifest>
     </jar>
   </target>
@@ -83,34 +93,40 @@
 
   <target name="doc" depends="docs"/>
 
+  <!--
+      For Java 11+, add additionalparam="dash-dash-frames".  My
+      workflow is back to Java 8, so leaving this comment here for
+      myself when Debian stables moves to Java 11.
+  -->
+
   <target name="docs" depends="jar">
     <javadoc
-	destdir="${apidocs.dir}"
-	author="true"
-	version="true"
-	use="true"
-	access="protected"
-	failonwarning="true"
-	windowtitle="Jexer - Java Text User Interface - API docs">
-
+        destdir="${apidocs.dir}"
+        author="true"
+        version="true"
+        use="true"
+        access="protected"
+        windowtitle="Jexer - Java Text User Interface - API docs"
+        additionalparam="--frames"
+        >
       <fileset dir="${src.dir}" defaultexcludes="yes">
-	<include name="jexer/**"/>
+        <include name="jexer/**/*.java"/>
       </fileset>
 
       <doctitle>
-	<![CDATA[<h1>Jexer - Java Text User Interface Library</h1>]]>
+        <![CDATA[<h1>Jexer - Java Text User Interface Library</h1>]]>
       </doctitle>
       <bottom>
-	<![CDATA[<i>Copyright &#169; 2017 Kevin Lamonte. Licensed MIT.</i>]]>
+        <![CDATA[<i>Copyright &#169; 2019 Kevin Lamonte. Licensed MIT.</i>]]>
       </bottom>
       <!--
-	  <tag name="todo" scope="all" description="To do:"/>
-	  <group title="Group 1 Packages" packages="com.dummy.test.a*"/>
-	  <group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/>
-	  <link offline="true"
-	  href="http://docs.oracle.com/javase/7/docs/api/"
-	  packagelistLoc="C:\tmp"/>
-	  <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+          <tag name="todo" scope="all" description="To do:"/>
+          <group title="Group 1 Packages" packages="com.dummy.test.a*"/>
+          <group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/>
+          <link offline="true"
+          href="http://docs.oracle.com/javase/7/docs/api/"
+          packagelistLoc="C:\tmp"/>
+          <link href="http://docs.oracle.com/javase/7/docs/api/"/>
       -->
     </javadoc>
   </target>