mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maybe fix random MAS codesign issues... :'(

This commit is contained in:
Reinhard Pointner 2016-11-14 04:34:35 +08:00
parent bbb8debb53
commit b8f0729e24
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build.xml
View File

@ -388,6 +388,7 @@
<!-- fetch latest JRE --> <!-- fetch latest JRE -->
<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes" /> <exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes" />
<copy todir="${dir.cache}"> <copy todir="${dir.cache}">
<tarfileset> <tarfileset>
<gzipresource> <gzipresource>
@ -403,7 +404,6 @@
</tarfileset> </tarfileset>
</copy> </copy>
<bundleapp jvmrequired="${jvm.version}" minimumsystemversion="${mac.version}" outputdirectory="${dir.dist}" executablename="${application.executable}" name="${application.name}" displayname="${application.name}" version="${revision}" shortversion="${version}" identifier="${application.identifier}" mainclassname="${main.class}" icon="${application.icon}" copyright="${tstamp.year} ${package.company}" applicationcategory="${mac.application.category}" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="true"> <bundleapp jvmrequired="${jvm.version}" minimumsystemversion="${mac.version}" outputdirectory="${dir.dist}" executablename="${application.executable}" name="${application.name}" displayname="${application.name}" version="${revision}" shortversion="${version}" identifier="${application.identifier}" mainclassname="${main.class}" icon="${application.icon}" copyright="${tstamp.year} ${package.company}" applicationcategory="${mac.application.category}" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="true">
<classpath file="${path.fatjar}" /> <classpath file="${path.fatjar}" />
<librarypath dir="${dir.lib}/native/mac-x86_64" /> <librarypath dir="${dir.lib}/native/mac-x86_64" />
@ -447,9 +447,6 @@
<bundledocument role="viewer" handlerRank="none" contentTypes="public.folder" name="Media folder" /> <bundledocument role="viewer" handlerRank="none" contentTypes="public.folder" name="Media folder" />
</bundleapp> </bundleapp>
<!-- fix broken symlink -->
<copy file="${jre.path}/lib/jli/libjli.dylib" tofile="${path.app.jre}/Contents/MacOS/libjli.dylib" overwrite="yes" verbose="yes" failonerror="yes" />
<!-- remove unused language resources --> <!-- remove unused language resources -->
<delete verbose="yes" includeEmptyDirs="yes"> <delete verbose="yes" includeEmptyDirs="yes">
<fileset dir="${path.app}/Contents/Resources"> <fileset dir="${path.app}/Contents/Resources">
@ -458,6 +455,9 @@
</fileset> </fileset>
</delete> </delete>
<!-- fix broken symlink -->
<copy file="${jre.path}/lib/jli/libjli.dylib" tofile="${path.app.jre}/Contents/MacOS/libjli.dylib" overwrite="yes" verbose="yes" failonerror="yes" />
<!-- fix permissions (fpcalc and jspawnhelper be executable and signed with inherit entitlements) --> <!-- fix permissions (fpcalc and jspawnhelper be executable and signed with inherit entitlements) -->
<chmod perm="+x"> <chmod perm="+x">
<fileset dir="${path.app}"> <fileset dir="${path.app}">
@ -472,36 +472,28 @@
<property name="codesign.entitlements" value="--entitlements '${dir.installer}/appbundle/FileBot.entitlements'" /> <property name="codesign.entitlements" value="--entitlements '${dir.installer}/appbundle/FileBot.entitlements'" />
<property name="codesign.entitlements.inherit" value="--entitlements '${dir.installer}/appbundle/inherit.entitlements'" /> <property name="codesign.entitlements.inherit" value="--entitlements '${dir.installer}/appbundle/inherit.entitlements'" />
<!-- sign frameworks -->
<apply executable="codesign" parallel="yes" failonerror="yes">
<arg line="${codesign.opts} ${codesign.entitlements.inherit}" />
<fileset dir="${path.app.jre}">
<include name="**/*.dylib" />
</fileset>
</apply>
<exec executable="codesign" failonerror="yes">
<arg line="${codesign.opts} ${codesign.entitlements.inherit} '${path.app.jre}'" />
</exec>
<!-- sign helper tools with inherit entitlements --> <!-- sign helper tools with inherit entitlements -->
<apply executable="codesign" failonerror="yes"> <apply executable="codesign" failonerror="yes">
<arg line="${codesign.opts} ${codesign.entitlements.inherit}" /> <arg line="${codesign.opts} ${codesign.entitlements.inherit}" />
<fileset dir="${path.app}"> <fileset dir="${path.app}">
<include name="**/jspawnhelper" />
<include name="**/fpcalc" /> <include name="**/fpcalc" />
</fileset> </fileset>
</apply> </apply>
<!-- sign everything that hasn't been signed yet and isn't the app launcher which is signed with the app bundle --> <!-- sign frameworks -->
<apply executable="codesign" parallel="yes" failonerror="yes"> <apply executable="codesign" parallel="yes" failonerror="yes">
<arg line="${codesign.opts} ${codesign.entitlements}" /> <arg line="${codesign.opts}" />
<fileset dir="${path.app}"> <fileset dir="${path.app}">
<exclude name="Contents/PlugIns/**" /> <include name="**/*.dylib" />
<exclude name="Contents/MacOS/${application.executable}" /> <include name="**/*.sh" />
<exclude name="Contents/MacOS/fpcalc" />
</fileset> </fileset>
</apply> </apply>
<!-- sign app with entitlements --> <!-- sign app with entitlements -->
<exec executable="codesign" failonerror="yes">
<arg line="${codesign.opts} '${path.app.jre}'" />
</exec>
<exec executable="codesign" failonerror="yes"> <exec executable="codesign" failonerror="yes">
<arg line="${codesign.opts} ${codesign.entitlements} '${path.app}'" /> <arg line="${codesign.opts} ${codesign.entitlements} '${path.app}'" />
</exec> </exec>