Skip to content

[msbuild] Fix running bgen for Xamarin.Mac. (#1977) #1978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 1 commit into from
Apr 12, 2017
Merged

[msbuild] Fix running bgen for Xamarin.Mac. (#1977) #1978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions msbuild/Xamarin.Mac.Tasks/Tasks/BTouch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ protected override string GenerateCommandLineCommands ()
isMobile = true; // Some older binding don't have either tag, assume mobile since it is the default
}

EnvironmentVariables = new string[] {
"MONO_PATH=" + string.Format ("{0}/lib/mono/{1}", FrameworkRoot, isMobile ? "Xamarin.Mac" : "4.5")
};

var sb = new StringBuilder ();
var bgen = Path.Combine (FrameworkRoot, "lib", "bgen", "bgen.exe");
if (File.Exists (bgen)) {
sb.Append (bgen);
} else {
if (!File.Exists (bgen)) {
EnvironmentVariables = new string[] {
"MONO_PATH=" + string.Format ("{0}/lib/mono/{1}", FrameworkRoot, isMobile ? "Xamarin.Mac" : "4.5")
};

if (isMobile) {
sb.Append (Path.Combine (FrameworkRoot, "lib", "bmac", "bmac-mobile.exe"));
} else {
Expand Down
3 changes: 2 additions & 1 deletion msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.CSharp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.

<BaseLibDllPath Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">$(XamarinMacFrameworkRoot)/lib/mono/Xamarin.Mac/Xamarin.Mac.dll</BaseLibDllPath>
<BaseLibDllPath Condition="'$(TargetFrameworkIdentifier)' != 'Xamarin.Mac'">$(XamarinMacFrameworkRoot)/lib/mono/4.5/Xamarin.Mac.dll</BaseLibDllPath>
<BTouchToolExe>bmac-mobile-mono</BTouchToolExe>
<BTouchToolPath>$(XamarinMacFrameworkRoot)/bin/</BTouchToolPath>
<BTouchToolExe Condition="Exists('$(BTouchToolPath)/bgen')">bgen</BTouchToolExe>
<BTouchToolExe Condition="!Exists('$(BTouchToolPath)/bgen')">bmac-mobile-mono</BTouchToolExe>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>

<DefineConstants>__UNIFIED__;$(DefineConstants)</DefineConstants>
Expand Down