HSQLDB.JAR をhsqldb-2.2.9.jar に変更

diff --git a/build.xml b/build.xml
index 2eb2aef..551c945 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -3,17 +3,18 @@
 <project name="ConvBusstop" default="all" basedir=".">
        <!--
        ソース以外にビルドに必要なライブラリ
-       ./lib/hayashi_0225.jar
-       ./lib/hsqldb_2_2_8.jar
-       ./lib/jar-in-jar-loader.zip
+       ../hayashi_0225.jar
+       ../hsqldb_2_2_8.jar
+       ../jar-in-jar-loader.zip
        -->
     <property name="src" value="${basedir}/src" />
     <property name="classes" value="${basedir}/classes" />
+       <property name="dest" value="${basedir}/dest"></property>
+       <property name="javalib" value="${basedir}/.."></property>
        <property name="appname" value="ConvBusstop"></property>
        <property name="version" value=""></property>
-       <property name="dblib" value="hsqldb.jar"></property>
+       <property name="dblib" value="hsqldb_2_2_9.jar"></property>
        <property name="hayashilib" value="hayashi_0225.jar"></property>
-       <property name="dest" value="${basedir}/dest"></property>
 
 
        <!--
@@ -26,7 +27,6 @@
                </delete>
        </target>
 
-
        <!--
        [STEP 2] コンパイル
        -->
@@ -37,7 +37,7 @@
 
                <classpath>
                                <pathelement path="${src}"/>
-                               <fileset dir="${basedir}/..">
+                               <fileset dir="${javalib}">
                                        <include name="${hayashilib}"/>
                                        <include name="${dblib}"/>
                                </fileset>
@@ -57,22 +57,21 @@
                        <fileset dir="${src}" includes="**/*.gif" />
                        <fileset dir="${src}" includes="**/*.jpg" />
 
-
                        <manifest>
                                <attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
                                <attribute name="Rsrc-Main-Class" value="osm.jp.ConvBusstop"/>
                                <attribute name="Class-Path" value="."/>
-                               <attribute name="Rsrc-Class-Path" value="./ ../ ${hayashilib} ${dblib}"/>
+                               <attribute name="Rsrc-Class-Path" value="./ ../ ${javalib}/${hayashilib} ${javalib}/${dblib}"/>
                                <attribute name="Implementation-Title"   value="${appname}"/>
                                <attribute name="Implementation-Version" value="${appname}"/>
                                <attribute name="Implementation-Vendor"  value="hayashi"/>
                                <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}])"/>
                        </manifest>
-                       <zipfileset src="../jar-in-jar-loader.zip"/>
+                       <zipfileset src="${javalib}/jar-in-jar-loader.zip"/>
                        <zipfileset dir="classes"/>
                        <zipfileset dir="${src}"/>
-            <zipfileset dir="${basedir}/.." includes="${hayashilib}"/>
-            <zipfileset dir="${basedir}/.." includes="${dblib}"/>
+            <zipfileset dir="${javalib}" includes="${hayashilib}"/>
+            <zipfileset dir="${javalib}" includes="${dblib}"/>
         </jar>
     </target>