Skip to content

Commit

Permalink
[Debugger] Copy the NSUrlSessionHandler src. Fixes #3724 (#4193)
Browse files Browse the repository at this point in the history 
* [Debugger] Copy the NSUrlSessionHandler src. Fixes #3724

Ensure that we do copy and pathmap the code of the NSUrlSessionHandler.

Fixes #3724
  • Loading branch information
@mandel-macaque
mandel-macaque authored Jun 10, 2018
1 parent 3ef8e41 commit 9eb238c
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 116 deletions.
30 changes: 10 additions & 20 deletions tools/install-source/InstallSourcesTests/XamarinSourcesPathManglerTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,34 +30,24 @@ public void SetUp ()
};
}

[TestCase ("/Library/Frameworks/Xamarin.iOS.framework/Versions/4.1.0.402/src/Xamarin.iOS/CoreData/NSEntityMapping.g.cs",
"/Users/test/xamarin-macios/src/build/ios/native/CoreData/NSEntityMapping.g.cs")]
[TestCase ("/Users/test/xamarin-macios/_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git/src/Xamarin.iOS/build/ios/native/AVFoundation/AVMutableTimedMetadataGroup.g.cs",
"/Users/test/xamarin-macios/src/build/ios/native/AVFoundation/AVMutableTimedMetadataGroup.g.cs")]
[TestCase ("/Users/test/xamarin-macios/_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git/src/Xamarin.iOS/build/ios/native/CloudKit/CKRecordZoneNotification.g.cs",
"/Users/test/xamarin-macios/src/build/ios/native/CloudKit/CKRecordZoneNotification.g.cs")]
public void TestGetSourcePathGeneratediOSCode (string path, string expectedPath)
[TestCase ("/Library/Frameworks/Xamarin.iOS.framework/Versions/4.1.0.402/src/Xamarin.iOS/CoreData/NSEntityMapping.g.cs")]
[TestCase ("/Users/test/xamarin-macios/_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git/src/Xamarin.iOS/build/ios/native/AVFoundation/AVMutableTimedMetadataGroup.g.cs")]
[TestCase ("/Users/test/xamarin-macios/_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git/src/Xamarin.iOS/build/ios/native/CloudKit/CKRecordZoneNotification.g.cs")]
public void TestGetSourcePathGeneratediOSCode (string path)
{
var result = mangler.GetSourcePath (path);
Assert.IsTrue (result.Contains ("/build/"), "Path does not contain '/build/'");
Assert.IsTrue (result.StartsWith(xamarinSourcePath, StringComparison.InvariantCulture), "Path does not start with the XamarinPath '{0}'", xamarinSourcePath);
Assert.AreEqual (result, expectedPath);
Assert.AreEqual (path, result);
}

[TestCase ("/Library/Frameworks/Xamarin.Mac.framework/Versions/4.1.0.402/src/Xamarin.iOS/CoreData/NSEntityMapping.g.cs",
"/Users/test/xamarin-macios/src/build/mac/full/CoreData/NSEntityMapping.g.cs")]
[TestCase ("/Users/test/xamarin-macios/_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/git/src/Xamarin.Mac/build/mac/full/AVFoundation/AVMutableTimedMetadataGroup.g.cs",
"/Users/test/xamarin-macios/src/build/mac/full/AVFoundation/AVMutableTimedMetadataGroup.g.cs")]
[TestCase ("/Users/test/xamarin-macios/_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/git/src/Xamarin.Mac/build/mac/full/CloudKit/CKRecordZoneNotification.g.cs",
"/Users/test/xamarin-macios/src/build/mac/full/CloudKit/CKRecordZoneNotification.g.cs")]
public void TestGetSourcePathGeneratedMacCode (string path, string expectedPath)
[TestCase ("/Library/Frameworks/Xamarin.Mac.framework/Versions/4.1.0.402/src/Xamarin.iOS/CoreData/NSEntityMapping.g.cs")]
[TestCase ("/Users/test/xamarin-macios/_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/git/src/Xamarin.Mac/build/mac/full/AVFoundation/AVMutableTimedMetadataGroup.g.cs")]
[TestCase ("/Users/test/xamarin-macios/_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/git/src/Xamarin.Mac/build/mac/full/CloudKit/CKRecordZoneNotification.g.cs")]
public void TestGetSourcePathGeneratedMacCode (string path)
{
mangler.FrameworkPath = "Xamarin.Mac.framework"; // dealing with mac sources
mangler.InstallDir = "/Library/Frameworks/Xamarin.Mac.framework/Versions/4.1.0.402/";
var result = mangler.GetSourcePath (path);
Assert.IsTrue (result.Contains ("/build/"), "Path does not contain '/build/'");
Assert.IsTrue (result.StartsWith (xamarinSourcePath, StringComparison.InvariantCulture), "Path does not start with the XamarinPath '{0}'", xamarinSourcePath);
Assert.AreEqual (expectedPath, result);
Assert.AreEqual (path, result);
}

[TestCase ("/Users/test/xamarin-macios/runtime/Delegates.generated.cs", "/Users/test/xamarin-macios/runtime/Delegates.generated.cs")]
Expand Down
154 changes: 77 additions & 77 deletions tools/install-source/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,85 +26,85 @@ Mono.Cecil.dll: $(MONO_CECIL_DLL)
$(Q) cp $<* $(dir $@)

IOS_ASSEMBLIES = \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.CJK.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.MidEast.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.Other.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.Rare.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.West.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Microsoft.CSharp.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.CSharp.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.Data.Sqlite.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.Data.Tds.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.Security.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.Simd.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ComponentModel.Composition.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ComponentModel.DataAnnotations.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Core.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Data.Services.Client.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Data.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.IO.Compression.FileSystem.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.IO.Compression.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.IdentityModel.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Json.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Net.Http.WinHttpHandler.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Net.Http.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Net.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Numerics.Vectors.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Numerics.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Reflection.Context.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Runtime.Serialization.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Security.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ServiceModel.Internals.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ServiceModel.Web.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ServiceModel.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Transactions.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Web.Services.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Xml.Linq.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Xml.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/mscorlib.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/Xamarin.iOS.pdb
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/I18N.CJK.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/I18N.MidEast.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/I18N.Other.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/I18N.Rare.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/I18N.West.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/I18N.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Microsoft.CSharp.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Mono.CSharp.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Mono.Data.Sqlite.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Mono.Data.Tds.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Mono.Security.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Mono.Simd.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.ComponentModel.Composition.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.ComponentModel.DataAnnotations.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Core.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Data.Services.Client.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Data.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.IO.Compression.FileSystem.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.IO.Compression.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.IdentityModel.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Json.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Net.Http.WinHttpHandler.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Net.Http.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Net.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Numerics.Vectors.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Numerics.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Reflection.Context.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Runtime.Serialization.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Security.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.ServiceModel.Internals.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.ServiceModel.Web.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.ServiceModel.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Transactions.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Web.Services.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Xml.Linq.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.Xml.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/System.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/mscorlib.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/Xamarin.iOS.pdb \

MAC_ASSEMBLIES = \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.CJK.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.MidEast.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.Other.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.Rare.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.West.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Microsoft.CSharp.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.CSharp.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.CompilerServices.SymbolWriter.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.Data.Sqlite.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.Data.Tds.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.Security.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ComponentModel.Composition.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ComponentModel.DataAnnotations.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Core.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Data.Services.Client.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Data.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.IO.Compression.FileSystem.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.IO.Compression.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.IdentityModel.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Json.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Net.Http.WinHttpHandler.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Net.Http.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Net.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Numerics.Vectors.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Numerics.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Reflection.Context.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Runtime.Serialization.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Security.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ServiceModel.Internals.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ServiceModel.Web.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ServiceModel.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Transactions.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Web.Services.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Xml.Linq.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Xml.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/mscorlib.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/I18N.CJK.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/I18N.MidEast.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/I18N.Other.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/I18N.Rare.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/I18N.West.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/I18N.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Microsoft.CSharp.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Mono.CSharp.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Mono.CompilerServices.SymbolWriter.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Mono.Data.Sqlite.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Mono.Data.Tds.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Mono.Security.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.ComponentModel.Composition.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.ComponentModel.DataAnnotations.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Core.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Data.Services.Client.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Data.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.IO.Compression.FileSystem.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.IO.Compression.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.IdentityModel.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Json.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Net.Http.WinHttpHandler.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Net.Http.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Net.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Numerics.Vectors.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Numerics.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Reflection.Context.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Runtime.Serialization.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Security.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.ServiceModel.Internals.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.ServiceModel.Web.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.ServiceModel.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Transactions.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Web.Services.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Xml.Linq.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.Xml.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/System.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/mscorlib.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.pdb

IOS_MDB_FILES = \
Expand Down
2 changes: 1 addition & 1 deletion tools/install-source/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public static int Main (string[] arguments)
{ "xamarin-path=", "The path of the xamarin source.", v => xamarinpath = v },
{ "install-dir=", "The directory to install into. The files will be put into a src subdirectory of this directory.", v => installDir = v },
{ "destination-dir=", "The path to the directory used for the -pathmap at build time.", v => destinationDir = v},
{ "v|erbose", "Enable verbose output", v => verbose = true },
{ "v|verbose", "Enable verbose output", v => verbose = true },
};

var paths = os.Parse (arguments);
Expand Down
19 changes: 1 addition & 18 deletions tools/install-source/XamarinSourcesPathMangler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,24 +82,7 @@ static bool IsRunrime (string path)
/// </summary>
/// <returns>The source path for native type.</returns>
/// <param name="path">Path.</param>
string GetSourcePathForGeneratedPath (string path)
{
var frameworkPrefix = FrameworkPath.Remove (FrameworkPath.IndexOf (".framework", StringComparison.Ordinal));
var installPath = Path.Combine (InstallDir, "src", frameworkPrefix);
// we might be looking at a mdb that was already gone thorugh mdb rebase, if that is the case, do find the path for the final target
if (path.StartsWith (InstallDir, StringComparison.InvariantCulture)) {
var src = path.Substring (installPath.Length + 1);
if (src.StartsWith ("/", StringComparison.Ordinal))
src = src.Remove (0, 1);
src = Path.Combine (XamarinSourcePath, (InstallDir.Contains ("Xamarin.iOS.framework")) ? "build/ios/native/" : "build/mac/full/", src);
return src;
} else {
var pos = path.IndexOf ($"/{frameworkPrefix}/", StringComparison.InvariantCulture);
var src = path.Remove (0, pos + $"/{frameworkPrefix}/".Length); // 3 for src and 1 for /
src = Path.Combine (XamarinSourcePath, src);
return src;
}
}
string GetSourcePathForGeneratedPath (string path) => path;

/// <summary>
/// Returns the source path for the native common types.
Expand Down

1 comment on commit 9eb238c

@rolfbjarne
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 Jenkins job (on internal Jenkins) failed in stage 'Test run' 🔥 : hudson.AbortException: script returned exit code 2

✅ Build succeeded
✅ API Diff (from stable)
✅ API Diff (from PR only) (no change)
✅ Generator Diff (only version changes)
🔥 Test run failed 🔥

Test results

Test run in progress: NotStarted: 225, Ignored: 1124

Please sign in to comment.