・ 配備ディレクトリの分離

・ アプリケーションバンドルのローカライズ修正

git-svn-id: https://svn.sourceforge.jp/svnroot/charactermanaj/trunk@49 5b6e9025-a2e8-4882-b233-f889982098c5

diff --git a/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings b/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings
deleted file mode 100755 (executable)
index 7c94dc3..0000000
--- a/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-CFBundleName = "キャラクターなんとかJ";

diff --git a/build.xml b/build.xml
index b4343d7..0bfe1b0 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -5,6 +5,7 @@
        <!-- 出力するファイル名 -->
        <property name="appName" value="CharacterManaJ.app"/>
        <property name="jarName" value="CharacterManaJ.jar"/>
+       <property name="distdir" value="dist"/>
 
        <!-- ビルド日時とバージョン、ベンダー -->
        <property file="resources/version.properties"/>
@@ -69,7 +70,7 @@
                </java>
 
                <!-- JARを作成する -->
-               <jar jarfile="CharacterManaJ.jar" basedir="work">
+               <jar jarfile="${distdir}/CharacterManaJ.jar" basedir="work">
                <manifest>
                        <attribute name="Main-Class" value="charactermanaj.CharacterManaJ" />
                        <!-- スプラッシュ画像 -->
@@ -96,22 +97,22 @@
         -->
        <target name="makeAppBundle" if="isMacOSX" depends="default">
                <!-- JARファイルをアプリケーションバンドル内にコピー -->
-       <exec dir="." executable="/bin/ln">
+       <exec dir="${distdir}" executable="/bin/ln">
                <arg line='-f "${jarName}" "${appName}/Contents/Resources/Java/${jarName}"'/>
                </exec>
                <!-- JAVA起動スタブをコピー -->
                <copy file="/System/Library/Frameworks/JavaVM.framework/Versions/Current/Resources/MacOS/JavaApplicationStub"
-                         toDir="${appName}/Contents/MacOS/"/>
+                         toDir="${distdir}/${appName}/Contents/MacOS/"/>
                <!-- ルートフォルダにアプリケーションバンドルの属性をセット -->
-               <exec dir="." executable="/bin/sh">
+               <exec dir="${distdir}" executable="/bin/sh">
                        <arg line='-c "/usr/bin/setFile -a B ${appName}"'/>
                </exec>
                <!-- JAVA起動スタブに実行パーミッション再設定 -->
-               <exec dir="." executable="/bin/sh">
+               <exec dir="${distdir}" executable="/bin/sh">
                        <arg line='-c "chmod 755 ${appName}/Contents/MacOS/JavaApplicationStub"'/>
                </exec>
                <!-- リソースディレクトリのパーミッション再設定 -->
-               <exec dir="." executable="/bin/sh">
+               <exec dir="${distdir}" executable="/bin/sh">
                        <arg line='-c "chmod -R 774 ${appName}/Contents/Resources/"'/>
                </exec>
        </target>
@@ -123,19 +124,19 @@
         -->
        <target name="makeAppBundleJava7" if="isMacOSX" depends="default">
                <!-- JARファイルをアプリケーションバンドル内にコピー -->
-       <exec dir="." executable="/bin/ln">
+       <exec dir="${distdir}" executable="/bin/ln">
                <arg line='-f "${jarName}" "java7mac/${appName}/Contents/Java/${jarName}"'/>
                </exec>
                <!-- ルートフォルダにアプリケーションバンドルの属性をセット -->
-               <exec dir="java7mac" executable="/bin/sh">
+               <exec dir="${distdir}/java7mac" executable="/bin/sh">
                        <arg line='-c "/usr/bin/setFile -a B ${appName}"'/>
                </exec>
                <!-- JAVA起動スタブに実行パーミッション再設定 -->
-               <exec dir="java7mac" executable="/bin/sh">
+               <exec dir="${distdir}/java7mac" executable="/bin/sh">
                        <arg line='-c "chmod 755 ${appName}/Contents/MacOS/JavaAppLauncher"'/>
                </exec>
                <!-- リソースディレクトリのパーミッション再設定 -->
-               <exec dir="java7mac" executable="/bin/sh">
+               <exec dir="${distdir}/java7mac" executable="/bin/sh">
                        <arg line='-c "chmod -R 774 ${appName}/Contents/Resources/"'/>
                </exec>
        </target>

diff --git a/CharacterManaJ.app/Contents/Info.plist b/dist/CharacterManaJ.app/Contents/Info.plist
similarity index 100%
rename from CharacterManaJ.app/Contents/Info.plist
rename to dist/CharacterManaJ.app/Contents/Info.plist

diff --git a/CharacterManaJ.app/Contents/MacOS/JavaApplicationStub b/dist/CharacterManaJ.app/Contents/MacOS/JavaApplicationStub
similarity index 100%
rename from CharacterManaJ.app/Contents/MacOS/JavaApplicationStub
rename to dist/CharacterManaJ.app/Contents/MacOS/JavaApplicationStub

diff --git a/CharacterManaJ.app/Contents/PkgInfo b/dist/CharacterManaJ.app/Contents/PkgInfo
similarity index 100%
rename from CharacterManaJ.app/Contents/PkgInfo
rename to dist/CharacterManaJ.app/Contents/PkgInfo

diff --git a/CharacterManaJ.jar b/dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar
similarity index 91%
rename from CharacterManaJ.jar
rename to dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar
index afa5605..db891c5 100755 (executable)
Binary files a/CharacterManaJ.jar and b/dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar differ

diff --git a/dist/CharacterManaJ.app/Contents/Resources/en.lproj/InfoPlist.strings b/dist/CharacterManaJ.app/Contents/Resources/en.lproj/InfoPlist.strings
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/CharacterManaJ.app/Contents/Resources/icon.icns b/dist/CharacterManaJ.app/Contents/Resources/icon.icns
similarity index 100%
rename from CharacterManaJ.app/Contents/Resources/icon.icns
rename to dist/CharacterManaJ.app/Contents/Resources/icon.icns

diff --git a/java7mac/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings b/dist/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings
similarity index 100%
rename from java7mac/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings
rename to dist/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings

diff --git a/CharacterManaJ.app/Contents/Resources/splash.png b/dist/CharacterManaJ.app/Contents/Resources/splash.png
similarity index 100%
rename from CharacterManaJ.app/Contents/Resources/splash.png
rename to dist/CharacterManaJ.app/Contents/Resources/splash.png

diff --git a/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar b/dist/CharacterManaJ.jar
similarity index 91%
rename from java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar
rename to dist/CharacterManaJ.jar
index afa5605..db891c5 100755 (executable)
Binary files a/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar and b/dist/CharacterManaJ.jar differ

diff --git a/charactermanaj.exe b/dist/charactermanaj.exe
similarity index 100%
rename from charactermanaj.exe
rename to dist/charactermanaj.exe

diff --git a/java7mac/CharacterManaJ.app/Contents/Info.plist b/dist/java7mac/CharacterManaJ.app/Contents/Info.plist
similarity index 100%
rename from java7mac/CharacterManaJ.app/Contents/Info.plist
rename to dist/java7mac/CharacterManaJ.app/Contents/Info.plist

diff --git a/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar b/dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar
similarity index 91%
rename from CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar
rename to dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar
index afa5605..db891c5 100755 (executable)
Binary files a/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar and b/dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar differ

diff --git a/java7mac/CharacterManaJ.app/Contents/MacOS/JavaAppLauncher b/dist/java7mac/CharacterManaJ.app/Contents/MacOS/JavaAppLauncher
similarity index 100%
rename from java7mac/CharacterManaJ.app/Contents/MacOS/JavaAppLauncher
rename to dist/java7mac/CharacterManaJ.app/Contents/MacOS/JavaAppLauncher

diff --git a/java7mac/CharacterManaJ.app/Contents/PkgInfo b/dist/java7mac/CharacterManaJ.app/Contents/PkgInfo
similarity index 100%
rename from java7mac/CharacterManaJ.app/Contents/PkgInfo
rename to dist/java7mac/CharacterManaJ.app/Contents/PkgInfo

diff --git a/java7mac/CharacterManaJ.app/Contents/Resources/en.lproj/Localizable.strings b/dist/java7mac/CharacterManaJ.app/Contents/Resources/en.lproj/Localizable.strings
similarity index 100%
rename from java7mac/CharacterManaJ.app/Contents/Resources/en.lproj/Localizable.strings
rename to dist/java7mac/CharacterManaJ.app/Contents/Resources/en.lproj/Localizable.strings

diff --git a/java7mac/CharacterManaJ.app/Contents/Resources/icon.icns b/dist/java7mac/CharacterManaJ.app/Contents/Resources/icon.icns
similarity index 100%
rename from java7mac/CharacterManaJ.app/Contents/Resources/icon.icns
rename to dist/java7mac/CharacterManaJ.app/Contents/Resources/icon.icns

diff --git a/dist/java7mac/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings b/dist/java7mac/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings
new file mode 100755 (executable)
index 0000000..53d07a8
--- /dev/null
+++ b/dist/java7mac/CharacterManaJ.app/Contents/Resources/ja.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+CFBundleName = "キャラクターなんとかJ";
+CFBundleDisplayName = "キャラクターなんとかJ";

diff --git a/java7mac/CharacterManaJ.app/Contents/Resources/splash.png b/dist/java7mac/CharacterManaJ.app/Contents/Resources/splash.png
similarity index 100%
rename from java7mac/CharacterManaJ.app/Contents/Resources/splash.png
rename to dist/java7mac/CharacterManaJ.app/Contents/Resources/splash.png

diff --git a/launch4j.xml b/launch4j.xml
index a609a35..f4d0ca4 100644 (file)
--- a/launch4j.xml
+++ b/launch4j.xml
@@ -1,8 +1,8 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>CharacterManaJ.jar</jar>
-  <outfile>charactermanaj.exe</outfile>
+  <jar>dist/CharacterManaJ.jar</jar>
+  <outfile>dist/charactermanaj.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir></chdir>