Fix MAS builds

build.xml

@@ -373,18 +373,21 @@
 			<option value="-Djava.io.tmpdir=Library/Caches/java.io.tmpdir" />
 		</create-app-bundle>
 
-		<!-- remove unused language resources -->
+		<!-- strip bundle from unused resources -->
 		<delete verbose="yes" includeEmptyDirs="yes">
 			<fileset dir="${path.app}/Contents/Resources">
 				<include name="**.lproj/**" />
 				<exclude name="en.lproj/**" />
 			</fileset>
+			<fileset dir="${path.app}/Contents/PlugIns/jre-${jre.version}.jre">
+				<include name="bin/**" />
+			</fileset>
 		</delete>
 
 		<property name="path.app.jre" location="${path.app}/Contents/PlugIns/jre-${jre.version}.jre" />
 
 		<!-- MAS validation is a bit buggy and requires even libraries and frameworks to have a unique CFBundleIdentifier Collision -->
-		<replace file="${path.app.jre}/Contents/Info.plist" token="com.oracle.java.${jre.version}.jre" value="${application.identifier}.jre" encoding="UTF-8" summary="true" />
+		<replace file="${path.app.jre}/Contents/Info.plist" token="com.oracle.java.${jre.version}.jre" value="${package.identifier}" encoding="UTF-8" summary="true" />
 
 		<!-- fix broken symlink -->
 		<copy file="${dir.staging}/jre-${jre.version}.jre/Contents/Home/lib/jli/libjli.dylib" tofile="${path.app.jre}/Contents/MacOS/libjli.dylib" overwrite="yes" verbose="yes" failonerror="yes" />
@@ -829,12 +832,9 @@
 			</patternset>
 			<chainedmapper>
 				<flattenmapper />
-				<compositemapper>
-					<globmapper from="*.jnilib" to="*.dylib" />
-					<identitymapper />
-				</compositemapper>
 			</chainedmapper>
 		</unzip>
+
 		<unzip src="${dir.lib}/ivy/jar/sevenzipjbinding-all-platforms.jar" dest="${dir.lib}/native/${arch}" overwrite="yes">
 			<patternset>
 				<include name="**/${arch.7zj}/*.dll" />
@@ -849,6 +849,11 @@
 				</compositemapper>
 			</chainedmapper>
 		</unzip>
+
+		<!-- strip x86 and PPC native code from universal library -->
+		<exec executable="ditto" os="Mac OS X" dir="${dir.lib}/native/mac-x86_64">
+			<arg line="--arch x86_64 libjnidispatch.jnilib libjnidispatch.dylib" />
+		</exec>
 	</target>
 
 

lib/native/update-mediainfo.sh

@@ -27,7 +27,6 @@ done
 # Copy native libraries into repository
 cd ..
 
-cp Staging/*Mac*x86_64*/*/*/libmediainfo.0.dylib mac-x86_64/libmediainfo.dylib
 cp Staging/*Windows*x64*/MediaInfo.dll win32-x64/MediaInfo.dll
 cp Staging/*Windows*i386*/MediaInfo.dll win32-x86/MediaInfo.dll
 cp Staging/*/data/usr/lib/x86_64-linux-gnu/libmediainfo.so.0.0.0 linux-amd64/libmediainfo.so 
@@ -35,4 +34,7 @@ cp Staging/*/data/usr/lib/i386-linux-gnu/libmediainfo.so.0.0.0 linux-i686/libmed
 cp Staging/*/data/usr/lib/x86_64-linux-gnu/libzen.so.0.0.0 linux-amd64/libzen.so
 cp Staging/*/data/usr/lib/i386-linux-gnu/libzen.so.0.0.0 linux-i686/libzen.so
 
+# Strip x86 and PPC native code from universal library
+ditto --arch x86_64 Staging/*Mac*x86_64*/*/*/libmediainfo.0.dylib mac-x86_64/libmediainfo.dylib
+
 rm -r Staging