Update the FileIO Aliases (#4186)
* Update the FileIOAlias naming to make the cache, project root and engine root paths more clear The alias of `@root@`, `@assets@`, and `@projectplatformcache@` has been collapsed to `@projectproductassets@` The alias of `@devroot@` and `@engroot@` has been collapsed to `@engroot@` The alias of `@devassets@` and `@projectroot@` has been collapsed to `@projectroot@` Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated use of devassets and devroot properties in python Those properties now use projectroot and engroot Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updating the alias @engroot@ alias path comment in each platform specific LocalFileIO_*.cpp file Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed hardcoded size of 9 for the product asset alias. The ResolvePath function now just appends the @projectproductassets@ alias with the input path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Remove duplicate @projectproductassets@ check in ProcessFileTreeRequest Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fix for typos in Hydra python test Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated LocalFileIO::Copy call on Windows to use the Unicode aware CopyFileW API Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the AWSMetreicsGemAllocatorFixture to properly suppress asset cache write errors for Test file creation. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed unneeded call to set the @projectproductasstes@ alias at the bottom of the AssetSeedManagerTest SetUp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Added a deprecated alias map to the FileIO System When a deprecated alias is accessed, the FileIO System logs an AZ_Error and indicates the alias that should be used Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated python test scripts to use the projectroot binding Retrieving the AutomatedTesting project path based on "<devroot>/AutomatedTesting" has been removed. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated references to devroot and devgame within the codebase The GetAbsoluteDevGameFolderPath functions has been replaced with direct call to AZ::Utils::GetProjectPath The GetAbsoluteDevRootFolderPath functions has been replaced with direct calls to AZ::Utils::GetEnginePath Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated <engroot>/AutomatedTesting references to projectroot Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced references that assumes the project path is <engroot>/AutomatedTesting with <projectroot> in the AutomatedTesting python test Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Correct casing in emfxworkspace file Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed newly added AppendPathParts function Removed the Path constructors which accepts a PathIterable instance The PathIterable isn't safe to return to a user of the Path class as it might be referencing temporary paths supplied via PathView arguments Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed unused parameter warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Undid change to the LexicallyProximate function to set the path result to the base path. It needs to return the *this path if the pathResult is empty Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Moved the LocalFileIO ConvertToAbsolutePath implementations to AZ::Utils Fixed the ConvertToAbsolutePath implementation for Unix platforms to use a buffer that is size PATH_MAX(4096 on all our supported Unix platforms). Because the buffer before was AZ::IO::MaxPathLength which as a size of 1024, this was resulting in the Unix `realpath` function smashing the stack when it converts a path to an absolute path that is longer than 1024 characters Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the EditorCore.Tests to attach the AZ Environment to the EditorCore shared library that is statically loaded on launch. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed for DeprecatedAlaisesKeyVisitor Visit function causing the non string_view overloads being hidden causing a hidden base class function warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Changed the AWSMetricsGemMock to use a temporary for writing test assets Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the LocalFileIO::ResolvePath function to use HasRootPath to determine if a path starts with a root path such as "D:", "D:/" or "/" IsAbsolute was not the corect check as the path of "D:" is a relative path. To be absolute according to the Windows the path must have a root directory. i.e "D:/" or "D:\" Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed absolute path comment from LocalFile_UnixLike.cpp and LocalFile_Android.cpp FindFiles implementations Updated the ConvertToAlias to supply an AZ::IO::FixedMaxPath Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced usage of the @projectproductassets@ alias with @engroot@ when referring to the LmbrCentral source folder in the CopyDependencyBuilderTest and the SeedBuilderTests Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the ScriptCanvas Upgrade Tool to output backed up files to the Project User Path instead of the engine root Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed whitespacing issues in Application.cpp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Remove unnecessary creation of a FixedMaxPath in the UpgradeTool.cpp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Modified testSeedFolder variable in the SeedBuilderTests to use the @engroot@ alias instead of @projectproductassets@/.. alias when referring to the LmbrCentral Gem source path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated references to the Project Asset Cache in the PythonTests. Those tests no longer use the logic `azlmbr.paths.projectroot / "Cache" / "pc"` to retrieve a path to the cache root but instead the `azlmbr.paths.projectproductassets` constant Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed the FileIO Deprecated Alias test on Windows Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removing @projectsourceassets@ alias, as it is only used once. Updated the PhysX EditorSystemComponent.cpp to query the ProjectPath form the SettingsRegistry. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced @projectproductassets@ alias with @products@ Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Rollback changes to the PhysX EditorSystemComponent.cpp The changes to use the ProjectPath from the SettingsRegistry has been implemented in PR #4497 Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
This commit is contained in:
lumberyard-employee-dm
committed by
GitHub
GitHub
parent
643bd84739
commit
f648cb1fd8
@@ -105,7 +105,7 @@ namespace AudioControlBuilder
|
||||
Audio::ATLXmlTags::ATLPreloadRequestTag, "preload request"));
|
||||
}
|
||||
|
||||
// For each preload request in the control file, determine which config group is used for this platform and register each
|
||||
// For each preload request in the control file, determine which config group is used for this platform and register each
|
||||
// bank listed in that preload request as a dependency.
|
||||
while (preloadRequestNode)
|
||||
{
|
||||
@@ -163,7 +163,7 @@ namespace AudioControlBuilder
|
||||
const AZ::rapidxml::xml_node<char>* configGroupNode = configGroupMap[configGroupName];
|
||||
if (!configGroupNode)
|
||||
{
|
||||
// The config group this platform uses isn't defined in the control file. This might be intentional, so just
|
||||
// The config group this platform uses isn't defined in the control file. This might be intentional, so just
|
||||
// generate a warning and keep going to the next preload node.
|
||||
AZ_TracePrintf("Audio Control Builder", "%s node for config group %s is not defined, so no banks are referenced.",
|
||||
Audio::ATLXmlTags::ATLConfigGroupTag, configGroupName.c_str());
|
||||
@@ -188,7 +188,7 @@ namespace AudioControlBuilder
|
||||
}
|
||||
|
||||
// Prepend the bank name with the relative path to the wwise sounds folder to get relative path to the bank from
|
||||
// the @assets@ alias and push that into the list of banks referenced.
|
||||
// the @products@ alias and push that into the list of banks referenced.
|
||||
AZStd::string soundsPrefix = Audio::Wwise::DefaultBanksPath;
|
||||
banksReferenced.emplace_back(soundsPrefix + bankNameAttribute->value());
|
||||
|
||||
@@ -496,7 +496,7 @@ namespace AudioControlBuilder
|
||||
pathDependencies.emplace(relativeBankPath, AssetBuilderSDK::ProductPathDependencyType::ProductFile);
|
||||
}
|
||||
|
||||
// For each bank figure out what events are included in the bank, then run through every event referenced in the file and
|
||||
// For each bank figure out what events are included in the bank, then run through every event referenced in the file and
|
||||
// make sure it is in the list gathered from the banks.
|
||||
const auto triggersNode = node->first_node(Audio::ATLXmlTags::TriggersNodeTag);
|
||||
if (!triggersNode)
|
||||
@@ -520,7 +520,7 @@ namespace AudioControlBuilder
|
||||
|
||||
AZStd::set<AZStd::string> wwiseEventsInReferencedBanks;
|
||||
|
||||
// Load all bankdeps files for all banks referenced and aggregate the list of events in those files.
|
||||
// Load all bankdeps files for all banks referenced and aggregate the list of events in those files.
|
||||
for (const AZStd::string& relativeBankPath : banksReferenced)
|
||||
{
|
||||
// Create the full path to the bankdeps file from the bank file.
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace WwiseBuilder
|
||||
{
|
||||
fileNames.push_back(dependenciesArray[dependencyIndex].GetString());
|
||||
}
|
||||
|
||||
|
||||
// The dependency array is empty, which likely means it was modified by hand. However, every bank is dependent
|
||||
// on init.bnk (other than itself), so just force add it as a dependency here. and emit a warning.
|
||||
if (fileNames.size() == 0)
|
||||
@@ -93,7 +93,7 @@ namespace WwiseBuilder
|
||||
|
||||
void WwiseBuilderWorker::Initialize()
|
||||
{
|
||||
AZ::IO::Path configFile("@devassets@");
|
||||
AZ::IO::Path configFile("@projectroot@");
|
||||
configFile /= Audio::Wwise::DefaultBanksPath;
|
||||
configFile /= Audio::Wwise::ConfigFile;
|
||||
|
||||
@@ -180,7 +180,7 @@ namespace WwiseBuilder
|
||||
{
|
||||
AZ_TracePrintf(AssetBuilderSDK::InfoWindow, "Starting Job.\n");
|
||||
AZ::IO::PathView fullPath(request.m_fullPath);
|
||||
|
||||
|
||||
if (m_isShuttingDown)
|
||||
{
|
||||
AZ_TracePrintf(AssetBuilderSDK::ErrorWindow, "Cancelled job %s because shutdown was requested.\n", request.m_fullPath.c_str());
|
||||
@@ -204,7 +204,7 @@ namespace WwiseBuilder
|
||||
AZ::Outcome<AZStd::string, AZStd::string> gatherProductDependenciesResponse = GatherProductDependencies(request.m_fullPath, request.m_sourceFile, dependencyPaths);
|
||||
if (!gatherProductDependenciesResponse.IsSuccess())
|
||||
{
|
||||
AZ_Error(WwiseBuilderWindowName, false, "Dependency gathering for %s failed. %s",
|
||||
AZ_Error(WwiseBuilderWindowName, false, "Dependency gathering for %s failed. %s",
|
||||
request.m_fullPath.c_str(), gatherProductDependenciesResponse.GetError().c_str());
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user