mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.10.0.47

Browse Source 
Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mcs/tools/macpack/LOADER
View File

@ -10,6 +10,7 @@
X11_MODE=%X11_MODE%
MWF_MODE=%MWF_MODE%
COCOASHARP_MODE=%COCOASHARP_MODE%
MONO_ARGS=%MONO_ARGS%
PWD=`pwd`
# Fetch the path relative to the launch point where this shell script exists.
@ -33,19 +34,24 @@ fi
cd "$APP_PATH/Contents/Resources"
mono4_path=/usr/local/bin/mono
mono5_path=/Library/Frameworks/Mono.framework/Versions/Current/Commands/mono
if [ "$X11_MODE" -eq "1" ]; then
open-x11 "$APP_NAME"
# rcruzs00
# El Capitan FIX: `which` wont work (system-integrity-protection)
# elif: Keep compatibility with previous code
elif [ -f /usr/local/bin/mono ]; then
elif [ -f "$mono4_path" ]; then
DIR=$(cd "$(dirname "$0")"; pwd)
/usr/local/bin/mono $DIR/../Resources/"$ASSEMBLY"
"$mono4_path" $MONO_ARGS $DIR/../Resources/"$ASSEMBLY"
elif [ -f "$mono5_path" ]; then
DIR=$(cd "$(dirname "$0")"; pwd)
"$mono5_path" $MONO_ARGS $DIR/../Resources/"$ASSEMBLY"
else
if [ ! -d "./bin" ]; then mkdir bin ; fi
if [ -f "./bin/$APP_NAME" ]; then rm -f "./bin/$APP_NAME" ; fi
ln -s `which mono` "./bin/$APP_NAME"
"./bin/$APP_NAME" "$ASSEMBLY"
"./bin/$APP_NAME" $MONO_ARGS "$ASSEMBLY"
fi

10
mcs/tools/macpack/MacPack.cs
View File

@ -112,23 +112,33 @@ namespace Mac {
script = script.Replace ("%MWF_MODE%", "0");
script = script.Replace ("%COCOASHARP_MODE%", "0");
script = script.Replace ("%X11_MODE%", "0");
script = script.Replace ("%MONO_ARGS%", "");
break;
case 1:
script = script.Replace ("%MWF_MODE%", "1");
script = script.Replace ("%COCOASHARP_MODE%", "0");
script = script.Replace ("%X11_MODE%", "0");
// no WinForms support in 64-bit Mono - pass --arch=32 to the mono executable
// see XplatUICarbon.Initialize():
// WARNING: The Carbon driver has not been ported to 64bits, and very few parts
// of Windows.Forms will work properly, or at all
script = script.Replace ("%MONO_ARGS%", "--arch=32");
break;
case 2:
script = script.Replace ("%MWF_MODE%", "0");
script = script.Replace ("%COCOASHARP_MODE%", "1");
script = script.Replace ("%X11_MODE%", "0");
script = script.Replace ("%MONO_ARGS%", "");
break;
case 3:
script = script.Replace ("%MWF_MODE%", "0");
script = script.Replace ("%COCOASHARP_MODE%", "0");
script = script.Replace ("%X11_MODE%", "1");
script = script.Replace ("%MONO_ARGS%", "");
break;
}
data = Encoding.ASCII.GetBytes (script);
writer.Write (data, 0, data.Length);
writer.Close ();