Skip to content

Commit

Permalink
Changed error output to warning output when Gum files file is locked
Browse files Browse the repository at this point in the history 
Added FNA to the build server uploader.
  • Loading branch information
@vchelaru
vchelaru committed Nov 18, 2023
1 parent 82394db commit c6542b2
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 14 deletions.
60 changes: 55 additions & 5 deletions FRBDK/BuildServerUploader/BuildServerUploaderConsole/Data/AllData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static AllData()

engine.RelativeToLibrariesDebugFolder = @"Xna4Pc\Debug";
engine.RelativeToLibrariesReleaseFolder = @"Xna4Pc\Release";
engine.TemplateFolder = @"FlatRedBallXna4Template\FlatRedBallXna4Template\FlatRedBallXna4Template\";
engine.TemplateCsProjFolder = @"FlatRedBallXna4Template\FlatRedBallXna4Template\FlatRedBallXna4Template\";

engine.DebugFiles.Add(@"FlatRedBall\Engines\Forms\FlatRedBall.Forms\FlatRedBall.Forms\bin\x86\Debug\FlatRedBall.Forms.dll");
engine.DebugFiles.Add(@"FlatRedBall\Engines\Forms\FlatRedBall.Forms\FlatRedBall.Forms\bin\x86\Debug\FlatRedBall.Forms.pdb");
Expand Down Expand Up @@ -57,7 +57,7 @@ static AllData()

engine.RelativeToLibrariesDebugFolder = @"Android\Debug";
engine.RelativeToLibrariesReleaseFolder = @"Android\Release";
engine.TemplateFolder = @"FlatRedBallAndroidTemplate\FlatRedBallAndroidTemplate\";
engine.TemplateCsProjFolder = @"FlatRedBallAndroidTemplate\FlatRedBallAndroidTemplate\";

engine.DebugFiles.Add(@"FlatRedBall\Engines\FlatRedBallXNA\FlatRedBall\bin\Android\Debug\FlatRedBallAndroid.dll");
engine.DebugFiles.Add(@"FlatRedBall\Engines\FlatRedBallXNA\FlatRedBall\bin\Android\Debug\FlatRedBallAndroid.pdb");
Expand Down Expand Up @@ -94,7 +94,7 @@ static AllData()

engine.RelativeToLibrariesDebugFolder = @"iOS\Debug";
engine.RelativeToLibrariesReleaseFolder = @"iOS\Release";
engine.TemplateFolder = @"FlatRedBalliOSTemplate\FlatRedBalliOSTemplate\";
engine.TemplateCsProjFolder = @"FlatRedBalliOSTemplate\FlatRedBalliOSTemplate\";

engine.DebugFiles.Add(@"FlatRedBall\Engines\FlatRedBallXNA\FlatRedBall\bin\iOS\Debug\FlatRedBalliOS.dll");
engine.DebugFiles.Add(@"FlatRedBall\Engines\FlatRedBallXNA\FlatRedBall\bin\iOS\Debug\FlatRedBalliOS.pdb");
Expand Down Expand Up @@ -167,7 +167,7 @@ static AllData()

engine.RelativeToLibrariesDebugFolder = @"DesktopGl\Debug";
engine.RelativeToLibrariesReleaseFolder = @"DesktopGl\Release";
engine.TemplateFolder = @"FlatRedBallDesktopGlTemplate\FlatRedBallDesktopGlTemplate\";
engine.TemplateCsProjFolder = @"FlatRedBallDesktopGlTemplate\FlatRedBallDesktopGlTemplate\";

engine.DebugFiles.Add(@"FlatRedBall\Engines\FlatRedBallXNA\FlatRedBall\bin\DesktopGL\Debug\FlatRedBallDesktopGL.dll");
engine.DebugFiles.Add(@"FlatRedBall\Engines\FlatRedBallXNA\FlatRedBall\bin\DesktopGL\Debug\FlatRedBallDesktopGL.pdb");
Expand Down Expand Up @@ -207,7 +207,7 @@ static AllData()

engine.RelativeToLibrariesDebugFolder = @"DesktopGl\Debug";
engine.RelativeToLibrariesReleaseFolder = @"DesktopGl\Release";
engine.TemplateFolder = @"FlatRedBallDesktopGlNet6Template\FlatRedBallDesktopGlNet6Template\";
engine.TemplateCsProjFolder = @"FlatRedBallDesktopGlNet6Template\FlatRedBallDesktopGlNet6Template\";

// This is the built folder when building FlatRedBall.Forms sln
// All files below (DebugFiles and ReleaseFiles) should be contained
Expand Down Expand Up @@ -251,7 +251,57 @@ static AllData()
Engines.Add(engine);

}
// FNA Desktop
{
var engine = new EngineData();

engine.EngineCSProjLocation = @"FlatRedBall\Engines\FlatRedBallXNA\FlatRedBall.FNA\FlatRedBall.FNA.csproj";

engine.RelativeToLibrariesDebugFolder = @"FNA\Debug";
engine.RelativeToLibrariesReleaseFolder = @"FNA\Release";
engine.TemplateCsProjFolder = @"FlatRedBallDesktopFnaTemplate\FlatRedBallDesktopFnaTemplate\";

// This is the built folder when building FlatRedBall.Forms sln
// All files below (DebugFiles and ReleaseFiles) should be contained
// in that output folder because the project should reference those files
var debugBinFolder = @"FlatRedBall\Engines\Forms\FlatRedBall.Forms\FlatRedBall.Forms.FNA\bin\Debug\net7.0\";
var releaseBinFolder = @"FlatRedBall\Engines\Forms\FlatRedBall.Forms\FlatRedBall.Forms.FNA\bin\Release\net7.0\";

engine.DebugFiles.Add($"{debugBinFolder}FlatRedBall.FNA.dll");
engine.DebugFiles.Add($"{debugBinFolder}FlatRedBall.FNA.pdb");

engine.DebugFiles.Add($"{debugBinFolder}FlatRedBall.Forms.FNA.dll");
engine.DebugFiles.Add($"{debugBinFolder}FlatRedBall.Forms.FNA.deps.json");
engine.DebugFiles.Add($"{debugBinFolder}FlatRedBall.Forms.FNA.pdb");

engine.DebugFiles.Add($"{debugBinFolder}FNA.dll");
engine.DebugFiles.Add($"{debugBinFolder}FNA.dll.config");
engine.DebugFiles.Add($"{debugBinFolder}FNA.pdb");

engine.DebugFiles.Add($"{debugBinFolder}GumCore.FNA.dll");
engine.DebugFiles.Add($"{debugBinFolder}GumCore.FNA.pdb");

engine.DebugFiles.Add($"{debugBinFolder}StateInterpolation.FNA.dll");
engine.DebugFiles.Add($"{debugBinFolder}StateInterpolation.FNA.pdb");

engine.ReleaseFiles.Add($"{releaseBinFolder}FlatRedBall.FNA.dll");
engine.ReleaseFiles.Add($"{releaseBinFolder}FlatRedBall.FNA.pdb");

engine.ReleaseFiles.Add($"{releaseBinFolder}FlatRedBall.Forms.FNA.dll");
engine.ReleaseFiles.Add($"{releaseBinFolder}FlatRedBall.Forms.FNA.pdb");

engine.ReleaseFiles.Add($"{releaseBinFolder}FNA.dll");
engine.ReleaseFiles.Add($"{releaseBinFolder}FNA.dll.config");
engine.ReleaseFiles.Add($"{releaseBinFolder}FNA.pdb");

engine.ReleaseFiles.Add($"{releaseBinFolder}GumCore.FNA.dll");
engine.ReleaseFiles.Add($"{releaseBinFolder}GumCore.FNA.pdb");

engine.ReleaseFiles.Add($"{releaseBinFolder}StateInterpolation.FNA.dll");
engine.ReleaseFiles.Add($"{releaseBinFolder}StateInterpolation.FNA.pdb");

Engines.Add(engine);
}

}
}
Expand Down
8 changes: 4 additions & 4 deletions FRBDK/BuildServerUploader/BuildServerUploaderConsole/Data/EngineData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ public class EngineData

public string RelativeToLibrariesDebugFolder { get; set; }
public string RelativeToLibrariesReleaseFolder { get; set; }
public string TemplateFolder { get; set; }
public string TemplateCsProjFolder { get; set; }

public string EngineCSProjLocation { get; set; }

public string TemplateName
{
get
{
var firstIndex = TemplateFolder.Replace("\\", "/").IndexOf("/");
var firstIndex = TemplateCsProjFolder.Replace("\\", "/").IndexOf("/");

return TemplateFolder.Substring(0, firstIndex);
return TemplateCsProjFolder.Substring(0, firstIndex);
}
}

public override string ToString()
{
return $"{TemplateFolder}{TemplateName}";
return $"{TemplateCsProjFolder}{TemplateName}";
}
}
}
4 changes: 2 additions & 2 deletions ...ldServerUploader/BuildServerUploaderConsole/Processes/CopyBuiltEnginesToTemplateFolder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ public static List<CopyInformation> CopyInformationList
string targetDirectory;
foreach(var engine in AllData.Engines)
{
targetDirectory = engine.TemplateFolder + @"Libraries\" + engine.RelativeToLibrariesDebugFolder;
targetDirectory = engine.TemplateCsProjFolder + @"Libraries\" + engine.RelativeToLibrariesDebugFolder;

foreach(var file in engine.DebugFiles)
{
Add(file, targetDirectory);
}

targetDirectory = engine.TemplateFolder + @"Libraries\" + engine.RelativeToLibrariesReleaseFolder;
targetDirectory = engine.TemplateCsProjFolder + @"Libraries\" + engine.RelativeToLibrariesReleaseFolder;

foreach (var file in engine.ReleaseFiles)
{
Expand Down
2 changes: 1 addition & 1 deletion FRBDK/BuildServerUploader/BuildServerUploaderConsole/Processes/UpdateAssemblyVersions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public override void ExecuteStep()
ModifyCsprojAssemblyInfoVersion(DirectoryHelper.FrbdkDirectory + @"AnimationEditor\PreviewProject\AnimationEditor.csproj", VersionString);

var net6Engine = AllData.Engines.First(item => item.EngineCSProjLocation?.Contains("FlatRedBallDesktopGLNet6.csproj") == true);
var templateLocation = net6Engine.TemplateFolder + "FlatRedBallDesktopGlNet6Template.csproj";
var templateLocation = net6Engine.TemplateCsProjFolder + "FlatRedBallDesktopGlNet6Template.csproj";
ModifyNugetVersionInAssembly(DirectoryHelper.TemplateDirectory + templateLocation, VersionString);

Results.WriteMessage("Glue assembly versions updated to " + VersionString);
Expand Down
10 changes: 8 additions & 2 deletions FRBDK/Glue/GumPlugin/GumPlugin/Managers/EventExportManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,14 @@ public async Task HandleEventExportFileChanged(string fileName)
}
catch(Exception e)
{
// it's okay, I think?
GlueCommands.Self.PrintError($"Could not save Gum last change file {file}:\n{e}");
// it's okay, I think?
// Update November 17, 2023
// Ya, this is a warning, but
// we should not print an error
// here. We'll just output a warning:
GlueCommands.Self.PrintOutput($"Warning: Could not save Gum last change file {file}." +
$"You can continue to work normally, but you may want to see if something is " +
$"blocking access to this file if your team relies on this being part of the repository:\n{e}");
}
}
}
Expand Down

0 comments on commit c6542b2

Please sign in to comment.