xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[xharness] Write relative paths in the makefiles. (#160) 

Fixes the packaged mac tests when they're executed on a different
machine with a different path.
This commit is contained in:
Rolf Bjarne Kvinge 2016-06-09 17:36:32 +02:00
Родитель fac7270eb8
Коммит e3cc7c31bc
1 изменённых файлов: 13 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
tests/xharness/MakefileGenerator.cs
Просмотреть файл

@ -76,6 +76,17 @@ namespace xharness
}
}
static string CreateRelativePath (string path, string relative_to)
{
if (path.StartsWith (relative_to, StringComparison.Ordinal)) {
var rv = path.Substring (relative_to.Length);
if (relative_to [relative_to.Length - 1] != Path.PathSeparator)
rv = rv.Substring (1);
return rv;
}
return path;
}
public static void CreateMacMakefile (Harness harness, IEnumerable<MacTarget> targets)
{
var makefile = Path.Combine (harness.RootDirectory, "Makefile-mac.inc");
@ -126,7 +137,7 @@ namespace xharness
writer.WriteLine ();
writer.WriteTarget (MakeMacClassicTargetName (target, MacTargetNameType.Exec), "");
writer.WriteLine ("\t$(Q) {0}/bin/x86/Debug/{1}.app/Contents/MacOS/{1}", Path.GetDirectoryName (target.ProjectPath), make_escaped_name);
writer.WriteLine ("\t$(Q) {0}/bin/x86/Debug/{1}.app/Contents/MacOS/{1}", CreateRelativePath (Path.GetDirectoryName (target.ProjectPath), Path.GetDirectoryName (makefile)), make_escaped_name);
writer.WriteLine ();
writer.WriteTarget (MakeMacClassicTargetName (target, MacTargetNameType.Run), "");
@ -149,7 +160,7 @@ namespace xharness
writer.WriteLine ();
writer.WriteTarget (MakeMacUnifiedTargetName (target, MacTargetNameType.Exec), "");
writer.WriteLine ("\t$(Q) {2}/bin/x86/Debug{1}/{0}.app/Contents/MacOS/{0}", make_escaped_name, target.Suffix, Path.GetDirectoryName (target.ProjectPath));
writer.WriteLine ("\t$(Q) {2}/bin/x86/Debug{1}/{0}.app/Contents/MacOS/{0}", make_escaped_name, target.Suffix, CreateRelativePath (Path.GetDirectoryName (target.ProjectPath), Path.GetDirectoryName (makefile)));
writer.WriteLine ();
writer.WriteTarget (MakeMacUnifiedTargetName (target, MacTargetNameType.Run), "");