ConvBusstop.sh

[convbusstop/convbusstop.git] / build.xml

diff --git a/build.xml b/build.xml
index 551c945..b6929f5 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -9,11 +9,11 @@
        -->
     <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="dest" value="${basedir}/bin"></property>
+       <property name="javalib" value="lib"></property>
        <property name="appname" value="ConvBusstop"></property>
        <property name="version" value=""></property>
-       <property name="dblib" value="hsqldb_2_2_9.jar"></property>
+       <property name="dblib" value="hsqldb_2.2.9.jar"></property>
        <property name="hayashilib" value="hayashi_0225.jar"></property>
 
 
@@ -67,11 +67,11 @@
                                <attribute name="Implementation-Vendor"  value="hayashi"/>
                                <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}])"/>
                        </manifest>
-                       <zipfileset src="${javalib}/jar-in-jar-loader.zip"/>
+                       <!-- zipfileset src="${javalib}/jar-in-jar-loader.zip"/ -->
+           <!-- zipfileset dir="${javalib}" includes="${hayashilib}"/ -->
+           <!-- zipfileset dir="${javalib}" includes="${dblib}"/ -->
                        <zipfileset dir="classes"/>
                        <zipfileset dir="${src}"/>
-            <zipfileset dir="${javalib}" includes="${hayashilib}"/>
-            <zipfileset dir="${javalib}" includes="${dblib}"/>
         </jar>
     </target>
 
@@ -81,11 +81,20 @@
     <target name="deploy" depends="create_run_jar" description="'${appname}.jar'を作成する">
        <zip destfile="${appname}.zip">
            <fileset dir="${basedir}" includes="${appname}.jar"/>
+                       <fileset dir="${javalib}">
+                               <include name="${hayashilib}"/>
+                               <include name="${dblib}"/>
+                       </fileset>
            <fileset dir="${src}" includes="ConvBusstop.bat"/>
+           <fileset dir="${src}" includes="ConvBusstop.sh"/>
            <fileset dir="${src}" includes="database.properties"/>
        </zip>
                <copy preservelastmodified="true" todir="${dest}">
                        <fileset file="${basedir}/${appname}.jar"/>
+                       <fileset dir="${javalib}">
+                               <include name="${hayashilib}"/>
+                               <include name="${dblib}"/>
+                       </fileset>
                        <fileset file="${src}/ConvBusstop.bat"/>
                        <fileset file="${src}/database.properties" />
                </copy>