mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-08 19:48:20 +02:00
Resolve custom build properties specified in workspace project specs.
This commit is contained in:
parent
da31757fa7
commit
d929e1bfe9
3 changed files with 21 additions and 6 deletions
|
@ -198,11 +198,6 @@ namespace IDE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static public void ResolveWorkspaceProperties(Workspace workspace)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static public void ResolveProjectProperties(Project project)
|
static public void ResolveProjectProperties(Project project)
|
||||||
{
|
{
|
||||||
if (project == null)
|
if (project == null)
|
||||||
|
|
|
@ -3241,6 +3241,27 @@ namespace IDE
|
||||||
public Result<Project, ProjectAddError> AddProject(StringView projectName, VerSpec verSpec)
|
public Result<Project, ProjectAddError> AddProject(StringView projectName, VerSpec verSpec)
|
||||||
{
|
{
|
||||||
VerSpec useVerSpec = verSpec;
|
VerSpec useVerSpec = verSpec;
|
||||||
|
|
||||||
|
switch (useVerSpec)
|
||||||
|
{
|
||||||
|
case .None:
|
||||||
|
|
||||||
|
case .SemVer(let ver):
|
||||||
|
String unresolvedVersion = scope String(ver.mVersion);
|
||||||
|
CustomBuildProperties.ResolveString(unresolvedVersion, ver.mVersion);
|
||||||
|
|
||||||
|
case .Path(let path):
|
||||||
|
String unresolvedPath = scope String(path);
|
||||||
|
CustomBuildProperties.ResolveString(unresolvedPath, path);
|
||||||
|
|
||||||
|
case .Git(let url, let ver):
|
||||||
|
String unresolvedUrl = scope String(url);
|
||||||
|
CustomBuildProperties.ResolveString(unresolvedUrl, url);
|
||||||
|
|
||||||
|
String unresolvedVersion = scope String(ver.mVersion);
|
||||||
|
CustomBuildProperties.ResolveString(unresolvedVersion, ver.mVersion);
|
||||||
|
}
|
||||||
|
|
||||||
String verConfigDir = mWorkspace.mDir;
|
String verConfigDir = mWorkspace.mDir;
|
||||||
|
|
||||||
if (let project = mWorkspace.FindProject(projectName))
|
if (let project = mWorkspace.FindProject(projectName))
|
||||||
|
|
|
@ -1040,7 +1040,6 @@ namespace IDE
|
||||||
data.GetString("Copyright", mCopyright);
|
data.GetString("Copyright", mCopyright);
|
||||||
data.GetString("FileVersion", mFileVersion);
|
data.GetString("FileVersion", mFileVersion);
|
||||||
data.GetString("ProductVersion", mProductVersion);
|
data.GetString("ProductVersion", mProductVersion);
|
||||||
String resolvedProductVersion = scope String();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Serialize(StructuredData data)
|
public void Serialize(StructuredData data)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue