Merge origin/master

This commit is contained in:
2015-04-14 22:54:16 +02:00
23 changed files with 808 additions and 46 deletions
+50 -3
View File
@@ -6,7 +6,8 @@
<property name="DISTLIBRARIESFULLDIR" value="${DISTRIBUTIONDIR}/${DISTLIBRARIESDIRNAME}"/>
<patternset id="compiler.resources">
<include name="**/?*.properties"/>
<include name="**/?*.properties"/>
<include name="**/?*.colorschemes"/>
<include name="**/?*.bin"/>
<include name="**/?*.xml"/>
<include name="**/?*.txt"/>
@@ -182,6 +183,48 @@
<zipfileset dir="${DISTRIBUTIONDIR}" includes="ffdec.sh" fullpath="ffdec.sh" filemode="755"/>
</zip>
</target>
<target name="osx-app-archive" depends="-loadversion,dist">
<mkdir dir="${RELEASESDIR}"/>
<property name="osx.zip.file" value="${RELEASESDIR}/${PREFIXFILENAME}_${VERSION}${VERSIONSUFFIX}_macosx.zip" />
<tempfile property="app.script.temp" deleteonexit="true" />
<echo file="${app.script.temp}">#!/bin/bash&#10;cd "$(dirname "$${BASH_SOURCE[0]}")"&#10;cd ../Resources&#10;./ffdec.sh</echo>
<tempfile property="app.info.temp" deleteonexit="true" />
<echo file="${app.info.temp}"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDisplayName</key>
<string>${PRODUCTNAME}</string>
<key>CFBundleExecutable</key>
<string>FFDec</string>
<key>CFBundleIconFile</key>
<string>Icon.icns</string>
<key>CFBundleIdentifier</key>
<string>${MACBUNDLE}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>FFDec</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${VERSION}${VERSIONSUFFIX}</string>
<key>CFBundleVersion</key>
<string>${VERSION}${VERSIONSUFFIX}</string>
<key>LSApplicationCategoryType</key>
<string>${MACCATEGORYTYPE}</string>
</dict>
</plist>]]></echo>
<zip destfile="${osx.zip.file}">
<zipfileset file="${app.script.temp}" fullpath="FFDec.app/Contents/MacOS/FFDec" filemode="755" />
<zipfileset file="${app.info.temp}" fullpath="FFDec.app/Contents/Info.plist" />
<zipfileset dir="${DISTRIBUTIONDIR}" excludes="ffdec.sh" prefix="FFDec.app/Contents/Resources/" />
<zipfileset dir="${DISTRIBUTIONDIR}" includes="ffdec.sh" fullpath="FFDec.app/Contents/Resources/ffdec.sh" filemode="755" />
</zip>
</target>
<target name="-set-gui-type">
<property name="EXETYPE" value="gui" />
</target>
@@ -277,7 +320,7 @@
</target>
<target name="release" depends="library,archive,installer,locales">
<target name="release" depends="library,archive,osx-app-archive,installer,locales">
</target>
@@ -357,6 +400,10 @@
<arg value="-file" />
<arg value="fileZip" />
<arg value="${zip.file}" />
<arg value="-file" />
<arg value="fileOSXZip" />
<arg value="${osx.zip.file}" />
<arg value="-file" />
<arg value="fileLang" />
@@ -680,4 +727,4 @@
<target name="upload-last" depends="all,-upload">
</target>
</project>
</project>