ignore

[hayashilib/hayashi.git] / build.xml

diff --git a/build.xml b/build.xml
index 1863a97..eaf9c49 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,20 +1,21 @@
 <project name="hayashi" default="all" basedir=".">\r
     <property name="src" value="${basedir}/src" />\r
-    <property name="obj" value="${basedir}/classes" />\r
+    <property name="obj" value="${basedir}/build" />\r
     <property name="javadoc.dest" value="${basedir}/doc" />\r
     <property name="report" value="${basedir}/report" />\r
     <property file="build.properties" />\r
-       <property name="appname" value="hayashi"></property>\r
-       <property name="version" value="0226"></property>\r
+    <property name="appname" value="hayashi"></property>\r
+    <property name="version" value="0228"></property>\r
 \r
-       <!--クラスパスを設定 -->\r
+    <!--クラスパスを設定 -->\r
     <path id="compile.classpath">\r
-        <pathelement location="lib/junit.jar"/>\r
+        <pathelement location="lib/junit-4.12.jar"/>\r
+        <pathelement location="lib/hamcrest-core-1.3"/>\r
         <pathelement location="lib/xercesImpl.jar"/>\r
         <pathelement location="lib/mail-1.4.jar"/>\r
         <pathelement location="lib/activation-1.1.jar"/>\r
         <pathelement location="lib/servlet-api.jar"/>\r
-               <pathelement path="${obj}"/>\r
+        <pathelement path="${obj}"/>\r
     </path>\r
        \r
 \r
@@ -29,61 +30,60 @@
        -->\r
     </target>\r
 \r
-    <target name="clean" description="Delete build directory">\r
-               <delete>\r
-                       <fileset dir="${src}" includes="**/*.class" />\r
-                       <fileset dir="${obj}" includes="**/*.class" />\r
-               </delete>\r
+    <target name="clean" depends="prepare" description="Delete build directory">\r
+        <delete>\r
+            <fileset dir="${src}" includes="**/*.class" />\r
+            <fileset dir="${obj}" includes="**/*.class" />\r
+        </delete>\r
     </target>\r
 \r
        <!-- コンパイル -->\r
-    <target name="compile" depends="prepare" description="Compile Java Sources">\r
-        <javac srcdir="${src}" destdir="${obj}" encoding="UTF-8"\r
-               target="1.5" optimize="off" debug="on" verbose="false">\r
+    <target name="compile" description="Compile Java Sources">\r
+        <javac srcdir="${src}" destdir="${obj}" encoding="UTF-8" \r
+               optimize="off" debug="on" verbose="false">\r
             <include name="**/*.java" />\r
             <classpath refid="compile.classpath"/>\r
         </javac>\r
     </target>\r
 \r
-       <!--\r
-       Javadoc作成\r
-               実行させるには、PATHにJDKの「JAVA_HOME/bin」を追加する必要がある。\r
-       -->\r
-       <target name="javadoc" depends="compile" description="Create Javadoc API documentation">\r
-        <mkdir dir="${javadoc.dest}/api" />\r
-        <javadoc\r
-                       packagenames="*"\r
-                       encoding="UTF-8"\r
-                       charset="UTF-8"\r
-                       sourcepath="${src}"\r
-                       destdir="${javadoc.dest}/api" >\r
-               <link href="http://java.sun.com/j2se/1.5.0/ja/docs/ja/api/" />\r
-               <link href="http://java.sun.com/products/javamail/javadocs/" />\r
-               <classpath refid="compile.classpath" />\r
-        </javadoc>\r
-       </target>\r
+    <!--\r
+    Javadoc作成\r
+            実行させるには、PATHにJDKの「JAVA_HOME/bin」を追加する必要がある。\r
+    -->\r
+    <target name="javadoc" depends="compile" description="Create Javadoc API documentation">\r
+    <mkdir dir="${javadoc.dest}/api" />\r
+    <javadoc\r
+            packagenames="*"\r
+            encoding="UTF-8"\r
+            charset="UTF-8"\r
+            sourcepath="${src}"\r
+            destdir="${javadoc.dest}/api" >\r
+        <link href="http://java.sun.com/j2se/1.5.0/ja/docs/ja/api/" />\r
+        <link href="http://java.sun.com/products/javamail/javadocs/" />\r
+        <classpath refid="compile.classpath" />\r
+    </javadoc>\r
+    </target>\r
 \r
-       <!-- Jarアーカイバの作成 -->\r
+    <!-- Jarアーカイバの作成 -->\r
     <target name="makejar" depends="compile" description="make hayashi.jar">\r
-               <delete file="${appname}_${version}.jar"/>\r
-               <tstamp>\r
-                       <format property="ts" pattern="yyyy/MM/dd-HH:mm:ss-z"/>\r
-               </tstamp>\r
-               <jar destfile="${appname}_${version}.jar">\r
-                       <fileset file="README.txt"/>\r
-                       <fileset dir="test" includes="**/*.class,**/*.java" />\r
-                       <fileset dir="${obj}" includes="**/*.class,**/*.java" />\r
-                       <fileset dir="${javadoc.dest}" includes="**/*.*"/>\r
-                       <manifest>\r
-                               <attribute name="Implementation-Title"   value="${appname}"/>\r
-                               <attribute name="Implementation-Version" value="hayashi lib ${version}"/>\r
-                               <attribute name="Implementation-Vendor"  value="Yuu Hayashi."/>\r
-                               <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}])"/>\r
-                       </manifest>\r
-               </jar>\r
+        <delete file="${appname}_${version}.jar"/>\r
+        <tstamp>\r
+            <format property="ts" pattern="yyyy/MM/dd-HH:mm:ss-z"/>\r
+        </tstamp>\r
+        <jar destfile="${appname}_${version}.jar">\r
+            <fileset file="README.txt"/>\r
+            <fileset dir="${src}" includes="**/*.java" />\r
+            <fileset dir="${obj}" includes="**/*.class,**/*.java" />\r
+            <fileset dir="${javadoc.dest}" includes="**/*.*"/>\r
+            <manifest>\r
+                <attribute name="Implementation-Title"   value="${appname}"/>\r
+                <attribute name="Implementation-Version" value="hayashi lib ${version}"/>\r
+                <attribute name="Implementation-Vendor"  value="Yuu Hayashi."/>\r
+                <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}])"/>\r
+            </manifest>\r
+        </jar>\r
     </target>\r
 \r
-\r
     <target name="test" depends="compile" description="Run JUnit">\r
         <junit printsummary="yes">\r
             <classpath refid="compile.classpath"/>\r
@@ -109,7 +109,7 @@
         </junitreport>\r
     </target>\r
 \r
-    <target name="all" depends="clean, javadoc, makejar" description="Clean build directory, then compile, and JavaDoc">\r
+    <target name="all" depends="makejar" description="Clean build directory, then compile, and JavaDoc">\r
     </target>\r
 \r
 </project>\r