ConvBusstop.sh

diff --git a/.classpath b/.classpath
index 2d3bafe..0aa7983 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -3,7 +3,7 @@
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="lib" path="/home/hayashi/workspace/hayashi_0225.jar"/>
-       <classpathentry kind="lib" path="/home/hayashi/workspace/hsqldb_2_2_8.jar"/>
        <classpathentry kind="lib" path="/home/hayashi/workspace/jar-in-jar-loader.zip"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="lib" path="/home/hayashi/workspace/hsqldb.jar"/>
+       <classpathentry kind="output" path="classes"/>
 </classpath>

diff --git a/.gitignore b/.gitignore
index a486e24..8054013 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.class
 *.jar
-*.zip
\ No newline at end of file
+*.zip
+bin/
\ No newline at end of file

diff --git a/ConvBusstop.zip b/ConvBusstop.zip
index 21adceb..725e5e1 100644 (file)
Binary files a/ConvBusstop.zip and b/ConvBusstop.zip differ

diff --git a/bin/ConvBusstop.bat b/bin/ConvBusstop.bat
index 09a806a..a22a21e 100644 (file)
--- a/bin/ConvBusstop.bat
+++ b/bin/ConvBusstop.bat
@@ -1,5 +1,5 @@
 rem java -jar ConvBusstop.jar
 
-java -jar ConvBusstop.jar -nocheck
+java -cp .;ConvBusstop.jar;hayashi_0225.jar;hsqldb_2.2.9.jar osm.jp.ConvBusstop -nocheck
 
 pause
\ No newline at end of file

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>

diff --git a/src/ConvBusstop.bat b/src/ConvBusstop.bat
index 09a806a..a22a21e 100644 (file)
--- a/src/ConvBusstop.bat
+++ b/src/ConvBusstop.bat
@@ -1,5 +1,5 @@
 rem java -jar ConvBusstop.jar
 
-java -jar ConvBusstop.jar -nocheck
+java -cp .;ConvBusstop.jar;hayashi_0225.jar;hsqldb_2.2.9.jar osm.jp.ConvBusstop -nocheck
 
 pause
\ No newline at end of file

diff --git a/src/ConvBusstop.sh b/src/ConvBusstop.sh
new file mode 100755 (executable)
index 0000000..b9e5318
--- /dev/null
+++ b/src/ConvBusstop.sh
@@ -0,0 +1 @@
+java -cp .:ConvBusstop.jar:hayashi_0225.jar:hsqldb_2.2.9.jar osm.jp.ConvBusstop -nocheck