Builds Windows nounity and unity
Builds Linux nounity and unity Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -699,7 +699,7 @@ Please note that only those seed files will get updated that are active for your
|
||||
{
|
||||
report.append(AZStd::string::format(
|
||||
"SOURCEID: %" PRId64 ", CURRENT PATH: %s, NEW PATH: %s, CURRENT GUID: %s, NEW GUID: %s\n",
|
||||
static_cast<int64_t>(relocationInfo.m_sourceEntry.m_sourceID),
|
||||
relocationInfo.m_sourceEntry.m_sourceID,
|
||||
relocationInfo.m_oldRelativePath.c_str(),
|
||||
relocationInfo.m_newRelativePath.c_str(),
|
||||
relocationInfo.m_sourceEntry.m_sourceGuid.ToString<AZStd::string>().c_str(),
|
||||
@@ -709,7 +709,7 @@ Please note that only those seed files will get updated that are active for your
|
||||
{
|
||||
report.append(AZStd::string::format(
|
||||
"SOURCEID: %" PRId64 ", CURRENT PATH: %s, CURRENT GUID: %s\n",
|
||||
static_cast<int64_t>(relocationInfo.m_sourceEntry.m_sourceID),
|
||||
relocationInfo.m_sourceEntry.m_sourceID,
|
||||
relocationInfo.m_oldRelativePath.c_str(),
|
||||
relocationInfo.m_sourceEntry.m_sourceGuid.ToString<AZStd::string>().c_str()));
|
||||
}
|
||||
|
||||
@@ -1025,7 +1025,7 @@ namespace AssetUtilities
|
||||
|
||||
AZStd::string ComputeJobLogFileName(const AzToolsFramework::AssetSystem::JobInfo& jobInfo)
|
||||
{
|
||||
return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobInfo.m_sourceFile.c_str(), jobInfo.GetHash(), static_cast<uint64_t>(jobInfo.m_jobRunKey));
|
||||
return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobInfo.m_sourceFile.c_str(), jobInfo.GetHash(), jobInfo.m_jobRunKey);
|
||||
}
|
||||
|
||||
AZStd::string ComputeJobLogFileName(const AssetBuilderSDK::CreateJobsRequest& createJobsRequest)
|
||||
@@ -1245,7 +1245,7 @@ namespace AssetUtilities
|
||||
return 0;
|
||||
}
|
||||
|
||||
std::uint64_t AdjustTimestamp(QDateTime timestamp)
|
||||
AZ::u64 AdjustTimestamp(QDateTime timestamp)
|
||||
{
|
||||
timestamp = timestamp.toUTC();
|
||||
|
||||
@@ -1280,7 +1280,7 @@ namespace AssetUtilities
|
||||
else
|
||||
{
|
||||
bool useHash = ShouldUseFileHashing();
|
||||
std::uint64_t fileIdentifier;
|
||||
AZ::u64 fileIdentifier;
|
||||
if(useHash)
|
||||
{
|
||||
fileIdentifier = GetFileHash(absolutePath.c_str());
|
||||
@@ -1294,13 +1294,13 @@ namespace AssetUtilities
|
||||
// so we add the size of it too.
|
||||
// its also possible that it moved to a different file with the same modtime/hash AND size,
|
||||
// but with a different name. So we add that too.
|
||||
return AZStd::string::format("%" PRIX64 ":%" PRIu64 ":%s", fileIdentifier, aznumeric_cast<uint64_t>(fileStateInfo.m_fileSize), nameToUse.c_str());
|
||||
return AZStd::string::format("%" PRIX64 ":%" PRIu64 ":%s", fileIdentifier, fileStateInfo.m_fileSize, nameToUse.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
AZStd::string ComputeJobLogFileName(const AssetProcessor::JobEntry& jobEntry)
|
||||
{
|
||||
return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobEntry.m_databaseSourceName.toUtf8().constData(), jobEntry.GetHash(), static_cast<uint64_t>(jobEntry.m_jobRunKey));
|
||||
return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobEntry.m_databaseSourceName.toUtf8().constData(), jobEntry.GetHash(), jobEntry.m_jobRunKey);
|
||||
}
|
||||
|
||||
bool CreateTempRootFolder(QString startFolder, QDir& tempRoot)
|
||||
|
||||
@@ -240,7 +240,7 @@ namespace AssetUtilities
|
||||
inline constexpr AZ::u64 FileHashBufferSize = 1024 * 64;
|
||||
|
||||
//! Adjusts a timestamp to fix timezone settings and account for any precision adjustment needed
|
||||
std::uint64_t AdjustTimestamp(QDateTime timestamp);
|
||||
AZ::u64 AdjustTimestamp(QDateTime timestamp);
|
||||
|
||||
// Generates a fingerprint string based on details of the file, will return the string "0" if the file does not exist.
|
||||
// note that the 'name to use' can be blank, but it used to disambiguate between files that have the same
|
||||
|
||||
@@ -7,12 +7,11 @@
|
||||
|
||||
// LY Editor Crashpad Upload Handler Extension
|
||||
|
||||
#include <AzCore/PlatformIncl.h>
|
||||
#include <handler/handler_main.h>
|
||||
#include <tools/tool_support.h>
|
||||
#include <Uploader/CrashUploader.h>
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
namespace
|
||||
{
|
||||
int HandlerMain(int argc, char* argv[])
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AzCore/PlatformIncl.h>
|
||||
#include <client/crash_report_database.h>
|
||||
#include <util/net/http_multipart_builder.h>
|
||||
#include <util/net/http_transport.h>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <AzCore/PlatformDef.h>
|
||||
#include <AzCore/PlatformIncl.h>
|
||||
AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option")
|
||||
#include <QtGui>
|
||||
#include <QtWidgets/QMenu>
|
||||
@@ -13,8 +13,7 @@ AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option")
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
#ifdef AZ_PLATFORM_WINDOWS
|
||||
// windows include must be first so we get the full version (AZCore bring the trimmed one)
|
||||
#include <Windows.h>
|
||||
#include <AzCore/PlatformIncl.h>
|
||||
#else
|
||||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
@@ -23,10 +23,7 @@ AZ_POP_DISABLE_WARNING
|
||||
#include <AzCore/Debug/TraceMessageBus.h>
|
||||
#include <AzCore/IO/SystemFile.h>
|
||||
#include <AzCore/Component/TickBus.h>
|
||||
|
||||
#if defined(AZ_PLATFORM_WINDOWS)
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#include <AzCore/PlatformIncl.h>
|
||||
#endif
|
||||
|
||||
namespace AZ
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
// windows include must be first so we get the full version (AZCore bring the trimmed one)
|
||||
#ifdef _WIN32
|
||||
#include <Windows.h>
|
||||
#include <AzCore/PlatformIncl.h>
|
||||
#include <winnls.h>
|
||||
#include <shobjidl.h>
|
||||
#include <objbase.h>
|
||||
|
||||
@@ -13,10 +13,8 @@
|
||||
#include <AzToolsFramework/UI/LegacyFramework/Core/EditorContextBus.h>
|
||||
#include <AzCore/IO/SystemFile.h>
|
||||
#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
|
||||
|
||||
#if defined(AZ_PLATFORM_WINDOWS)
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#include <AzCore/PlatformIncl.h>
|
||||
#include <CryCommon/platform.h>
|
||||
|
||||
namespace LUAEditor
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user