buildファイルの変更

commonsのライセンス表記をちゃんとする。

diff --git a/importPicture/build.xml b/importPicture/build.xml
index 415640b..3cdfed7 100644 (file)
--- a/importPicture/build.xml
+++ b/importPicture/build.xml
@@ -3,6 +3,7 @@
 <project name="AdjustTime" default="all" basedir=".">\r
 \r
        <target name="all" depends="release">\r
+               \r
        </target>\r
 \r
        <!--\r
@@ -14,8 +15,10 @@
     <property name="src" value="${basedir}/src" />\r
     <property name="classes" value="${basedir}/classes" />\r
        <property name="deploy" value="${basedir}/deploy" />\r
-       <property name="appname" value="AdjustTime"></property>\r
+       <property name="appname" value="AdjustTime2"></property>\r
        <property name="version" value="${verdate}"></property>\r
+       \r
+    <property name="commons-imaging" value="lib/commons-imaging-1.0-20150518.202342-66.jar" />\r
 \r
 \r
        <!--\r
@@ -44,18 +47,20 @@
                <delete>\r
                        <fileset dir="${classes}" includes="**/*.class" />\r
                        <fileset dir="${src}" includes="**/*.class" />\r
+                       <fileset dir="${deploy}" includes="**/*.*" />\r
                </delete>\r
        </target>\r
 \r
        <!--\r
        [STEP 2] コンパイル\r
         -->\r
-       <target name="compile_src" description="コンパイル src">\r
-           <javac      debug="on" srcdir="${src}" destdir="${classes}" encoding="UTF-8" includeantruntime="false" target="1.6">\r
+       <target name="compile_src" depends="clean" description="コンパイル src">\r
+           <javac      debug="on" srcdir="${src}" destdir="${classes}" encoding="UTF-8" includeantruntime="false" target="1.8" source="1.8">\r
                        <include name="**" />\r
                <exclude name="**/*.smap" />\r
                <classpath>\r
                                <pathelement path="${src}"/>\r
+                       <pathelement path="${commons-imaging}"/>\r
                        </classpath>\r
                </javac>\r
        </target>\r
@@ -67,7 +72,7 @@
                <tstamp>\r
                        <format property="ts" pattern="yyyy-MM-dd-HH:mm:ss-z"/>\r
                </tstamp>\r
-               <jar destfile="${appname}.jar" >\r
+               <jar destfile="${deploy}/${appname}.jar" >\r
                        <manifest>\r
                          <attribute name="Main-Class" value="osm.jp.gpx.matchtime.gui.AdjustTime" />\r
                          <attribute name="Class-Path" value="${jar.runtime.classpath}" />\r
@@ -85,14 +90,23 @@
        <!--\r
        [STEP 4] Deployment\r
         -->\r
-    <target name="release" depends="create_run_jar" description="'${deploy}/${appname}.zip'を作成する">\r
-       <zip destfile="${deploy}/${appname}.zip">\r
+    <target name="deploy" depends="create_run_jar" description="各ファイルを'./${deploy}/'に配置する">\r
+       <copy preservelastmodified="true" todir="${deploy}">\r
                <fileset dir="." includes="${appname}.jar"/>\r
-               <fileset dir="." includes="commons-imaging-1.0-SNAPSHOT.jar"/>\r
                <fileset dir="${src}" includes="README.jp.txt"/>\r
                <fileset dir="${src}" includes="LICENSE.txt"/>\r
                <fileset dir="${src}" includes="${appname}.bat"/>\r
                <fileset dir="${src}" includes="${appname}.sh"/>\r
+               </copy>\r
+       <copy preservelastmodified="true" file="${commons-imaging}" tofile="${deploy}/commons-imaging-1.0-SNAPSHOT.jar"/>\r
+    </target>\r
+\r
+       <!--\r
+       [STEP 5] release\r
+        -->\r
+    <target name="release" depends="deploy" description="'./${appname}.zip'を作成する">\r
+       <zip destfile="${appname}_${verdate}.zip">\r
+               <fileset dir="${deploy}" includes="**.*"/>\r
                </zip>\r
     </target>\r
 </project>\r

diff --git a/importPicture/src/AdjustTime.bat b/importPicture/src/AdjustTime.bat
deleted file mode 100644 (file)
index b7c7b05..0000000
--- a/importPicture/src/AdjustTime.bat
+++ /dev/null
@@ -1 +0,0 @@
-javaw -cp .;AdjustTime.jar;commons-imaging-1.0-SNAPSHOT.jar osm.jp.gpx.matchtime.gui.AdjustTime
\ No newline at end of file

diff --git a/importPicture/src/AdjustTime.sh b/importPicture/src/AdjustTime.sh
deleted file mode 100644 (file)
index 61bed2a..0000000
--- a/importPicture/src/AdjustTime.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar osm.jp.gpx.matchtime.gui.AdjustTime

diff --git a/importPicture/src/README.jp.txt b/importPicture/src/README.jp.txt
index fac8e3e..d000ee7 100644 (file)
--- a/importPicture/src/README.jp.txt
+++ b/importPicture/src/README.jp.txt
@@ -34,10 +34,20 @@ EXIFへの書き込みには別途「Apache commons imaging」ライブラリが
 commons_imaging ライブラリは下記から入手してください。
 （version 1.0 以降が必要です）
 
-commons-imaging-1.0-SNAPSHOT.jarの入手元
-    https://repository.apache.org/content/groups/snapshots/org/apache/commons/commons-imaging/1.0-SNAPSHOT/
 
 
 -------------------------------------------------------------------
+AdjustTime2.jar
 Copyright (c) 2014 Yuu Hayashi
-This software is released under the MIT License, see LICENSE.txt.
\ No newline at end of file
+This software is released under the MIT License, see LICENSE.txt.
+
+-------------------------------------------------------------------
+About 'commons-imaging-1.0-SNAPSHOT.jar'
+'commons-imaging-1.0-SNAPSHOT.jar' is the work that is distributed in the Apache License 2.0
+
+commons-imaging-1.0-SNAPSHOT.jarについて
+'commons-imaging-1.0-SNAPSHOT.jar'は、 Apache 2.0ライセンスで配布されている製作物です。
+
+commons-imaging-1.0-SNAPSHOT.jarの入手元
+    https://repository.apache.org/content/groups/snapshots/org/apache/commons/commons-imaging/1.0-SNAPSHOT/
+       commons-imaging-1.0-20150518.202342-66.jar