Compare commits

...
Author SHA1 Message Date
Jo Shields 2da6ddd758 [mkbundle] Don't try to handle OSX and Linux unmanaged libs separately
Turns out the test we had prevents building a OSX bundle on Linux, as it does runtime OS detection.

Since `zip` succeeds fine on missing files in input, it's safe to just indiscriminately try to package both .dylib and .so versions of relevant files regardless of host OS - only one will match at any given time
2018-01-08 14:45:21 -05:00
+1 -5
View File
@@ -1,8 +1,4 @@
#!/bin/sh
extension=".dylib"
if test `uname -o` = GNU/Linux; then
extension=".so"
fi
if test x$2 = x; then
echo usage is: mono-package-runtime MONO_INSTALL_PREFIX LABEL
@@ -35,6 +31,6 @@ fi
o=`pwd`/$output
cd $prefix
(zip -u $o.zip bin/mono lib/mono/4.5/mscorlib.dll lib/mono/4.5/System*dll lib/mono/4.5/Mono.CSharp.dll lib/mono/4.5/Microsoft*dll lib/mono/4.5/FSharp*.dll lib/mono/4.5/I18N*dll lib/mono/4.5/Accessibility.dll lib/mono/4.5/RabbitMQ.Client.dll lib/mono/4.5/ICSharpCode.SharpZipLib.dll lib/mono/4.5/CustomMarshalers.dll etc/mono/config etc/mono/4.5/machine.config etc/mono/4.5/web.config lib/mono/4.5/Mono.Cairo.dll lib/mono/4.5/Mono.Data.Sqlite.dll lib/mono/4.5/Mono.Posix.dll lib/mono/4.5/Mono.Security.*dll lib/mono/4.5/Mono.Simd.dll lib/libMonoSupportW$extension lib/libMonoPosixHelper$extension lib/libmono-btls-shared$extension)
(zip -u $o.zip bin/mono lib/mono/4.5/mscorlib.dll lib/mono/4.5/System*dll lib/mono/4.5/Mono.CSharp.dll lib/mono/4.5/Microsoft*dll lib/mono/4.5/FSharp*.dll lib/mono/4.5/I18N*dll lib/mono/4.5/Accessibility.dll lib/mono/4.5/RabbitMQ.Client.dll lib/mono/4.5/ICSharpCode.SharpZipLib.dll lib/mono/4.5/CustomMarshalers.dll etc/mono/config etc/mono/4.5/machine.config etc/mono/4.5/web.config lib/mono/4.5/Mono.Cairo.dll lib/mono/4.5/Mono.Data.Sqlite.dll lib/mono/4.5/Mono.Posix.dll lib/mono/4.5/Mono.Security.*dll lib/mono/4.5/Mono.Simd.dll lib/libMonoSupportW.dylib lib/libMonoSupportW.so lib/libMonoPosixHelper.dylib lib/libMonoPosixHelper.so lib/libmono-btls-shared.dylib lib/libmono-btls-shared.so)
echo Created file $o.zip