Initial commit

Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Mac.h

@@ -0,0 +1,15 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#define ASSETPROCESSOR_TRAIT_LEGACY_RC_RELATIVE_PATH "/rc"
+#define ASSETPROCESSOR_TRAIT_CASE_SENSITIVE_FILESYSTEM false

Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Platform.h

@@ -0,0 +1,14 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <AssetProcessor_Traits_Mac.h>

Code/Tools/AssetProcessor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,59 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Code/Tools/AssetProcessor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512x512.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a396a13d3bc7ca074cdc6fdd072ba18c2e359bd24408783809b6c90adf23e22a
+size 21937

Code/Tools/AssetProcessor/Platform/Mac/Images.xcassets/AssetProcessorAppIcon.appiconset/Contents.json

@@ -0,0 +1,59 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Code/Tools/AssetProcessor/Platform/Mac/Images.xcassets/AssetProcessorAppIcon.appiconset/icon_512x512.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a396a13d3bc7ca074cdc6fdd072ba18c2e359bd24408783809b6c90adf23e22a
+size 21937

Code/Tools/AssetProcessor/Platform/Mac/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Code/Tools/AssetProcessor/Platform/Mac/PAL_mac.cmake

@@ -0,0 +1,13 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set (PAL_TRAIT_BUILD_ASSETPROCESSOR_APPLICATION_TYPE APPLICATION)
+

Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_gui_mac_files.cmake

@@ -0,0 +1,16 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    gui_info.plist
+    native/utilities/MacDockIconHandler.mm
+    native/utilities/MacDockIconHandler.h
+)

Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake

@@ -0,0 +1,25 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+ly_add_bundle_resources(
+    TARGET AssetProcessor
+    FILES
+        ${CMAKE_SOURCE_DIR}/Code/Tools/RC/Config/rc/xmlfilter.txt
+        ${CMAKE_SOURCE_DIR}/Code/Tools/RC/Config/rc/rc.ini
+)
+
+# Set resources directory for app icons
+target_sources(AssetProcessor PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Platform/Mac/Images.xcassets)
+set_target_properties(AssetProcessor PROPERTIES
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Platform/Mac/gui_info.plist
+    RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/Platform/Mac/Images.xcassets
+    XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AssetProcessorAppIcon
+)

Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac_files.cmake

@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    native/FileWatcher/FileWatcher_macos.cpp
+)

Code/Tools/AssetProcessor/Platform/Mac/gui_info.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>This file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved.</string>
+	<key>CFBundleSignature</key>
+	<string>ASPR</string>
+	<key>CFBundleExecutable</key>
+	<string>AssetProcessor</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.Amazon.AssetProcessor</string>
+</dict>
+</plist>

Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_macos.cpp

@@ -0,0 +1,176 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#include <native/FileWatcher/FileWatcher.h>
+
+#include <native/utilities/BatchApplicationManager.h>
+
+#include <AzCore/Debug/Trace.h>
+#include <CoreServices/CoreServices.h>
+
+void FileEventStreamCallback(ConstFSEventStreamRef streamRef, void *clientCallBackInfo, size_t numEvents, void *eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[]);
+
+struct FolderRootWatch::PlatformImplementation
+{
+    PlatformImplementation() : m_stream(nullptr), m_runLoop(nullptr) { }
+
+    FSEventStreamRef m_stream;
+    CFRunLoopRef m_runLoop;
+    QString m_renameFileDirectory;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+/// FolderWatchRoot
+FolderRootWatch::FolderRootWatch(const QString rootFolder)
+    : m_root(rootFolder)
+    , m_shutdownThreadSignal(false)
+    , m_fileWatcher(nullptr)
+    , m_platformImpl(new PlatformImplementation())
+{
+}
+
+FolderRootWatch::~FolderRootWatch()
+{
+    // Destructor is required in here since this file contains the definition of struct PlatformImplementation
+    Stop();
+
+    delete m_platformImpl;
+}
+
+bool FolderRootWatch::Start()
+{
+    m_shutdownThreadSignal = false;
+
+    CFStringRef rootPath = CFStringCreateWithCString(kCFAllocatorDefault, m_root.toStdString().data(), kCFStringEncodingMacRoman);
+    CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void **)&rootPath, 1, NULL);
+    
+    // The larger this number, the larger the delay between the kernel knowing a file changed
+    // and us actually consuming the event.  It is very important for asset processor to deal with
+    // file changes as fast as possible, since we use file "fencing" to control network access
+    // For example, if someone asks (over the network) "does file xyz exist?" we actually put a random file on disk
+    // and only answer their query when we see that file appear on our file monitor, so that we know all other
+    // file creations/modifications/deletions have been seen before we answer their question.
+    // as such, having a slow response time here can cause a dramatic slowdown for all other operations.
+    CFAbsoluteTime timeBetweenKernelUpdateAndNotification = 0.001;
+
+    // Set ourselves as the value for the context info field so that in the callback
+    // we get passed into it and the callback can call our public API to handle
+    // the file change events
+    FSEventStreamContext streamContext;
+    ::memset(&streamContext, 0, sizeof(streamContext));
+    streamContext.info = this;
+
+    m_platformImpl->m_stream = FSEventStreamCreate(NULL,
+                                 FileEventStreamCallback,
+                                 &streamContext,
+                                 pathsToWatch,
+                                 kFSEventStreamEventIdSinceNow,
+                                 timeBetweenKernelUpdateAndNotification,
+                                 kFSEventStreamCreateFlagFileEvents);
+
+    AZ_Error("FileWatcher", (m_platformImpl->m_stream != nullptr), "FSEventStreamCreate returned a nullptr. No file events will be reported for %s", m_root.toStdString().c_str());
+
+    m_thread = std::thread(std::bind(&FolderRootWatch::WatchFolderLoop, this));
+
+    CFRelease(pathsToWatch);
+    CFRelease(rootPath);
+
+    return (m_platformImpl->m_stream != nullptr);
+}
+
+void FolderRootWatch::Stop()
+{
+    m_shutdownThreadSignal = true;
+
+    if (m_thread.joinable())
+    {
+        m_thread.join(); // wait for the thread to finish
+        m_thread = std::thread(); //destroy
+    }
+
+    FSEventStreamStop(m_platformImpl->m_stream);
+    FSEventStreamInvalidate(m_platformImpl->m_stream);
+    FSEventStreamRelease(m_platformImpl->m_stream);
+}
+
+void FolderRootWatch::WatchFolderLoop()
+{
+    // Use a half second timeout interval so that we can check if
+    // m_shutdownThreadSignal has been changed while we were running the RunLoop
+    static const CFTimeInterval secondsToProcess = 0.5;
+
+    m_platformImpl->m_runLoop = CFRunLoopGetCurrent();
+    FSEventStreamScheduleWithRunLoop(m_platformImpl->m_stream, m_platformImpl->m_runLoop, kCFRunLoopDefaultMode);
+    FSEventStreamStart(m_platformImpl->m_stream);
+
+    const bool returnAfterFirstEventHandled = false;
+
+    while (!m_shutdownThreadSignal)
+    {
+        CFRunLoopRunInMode(kCFRunLoopDefaultMode, secondsToProcess, returnAfterFirstEventHandled);
+    }
+}
+
+void FileEventStreamCallback(ConstFSEventStreamRef streamRef, void *clientCallBackInfo, size_t numEvents, void *eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[])
+{
+    FolderRootWatch* watcher = reinterpret_cast<FolderRootWatch*>(clientCallBackInfo);
+
+    const char** filePaths = reinterpret_cast<const char**>(eventPaths);
+
+    for (int i = 0; i < numEvents; ++i)
+    {
+        QFileInfo fileInfo(QDir::cleanPath(filePaths[i]));
+        QString fileAndPath = fileInfo.absoluteFilePath();
+
+        if (!fileInfo.isHidden())
+        {
+            // Some events will be aggreated into one so it is possible we will get
+            // multiple event flags set for a single file (create/modify as an example)
+            // so check for all of them
+            if (eventFlags[i] & kFSEventStreamEventFlagItemCreated)
+            {
+                watcher->ProcessNewFileEvent(fileAndPath);
+            }
+
+            if (eventFlags[i] & kFSEventStreamEventFlagItemModified)
+            {
+                watcher->ProcessModifyFileEvent(fileAndPath);
+            }
+
+            if (eventFlags[i] & kFSEventStreamEventFlagItemRemoved)
+            {
+                watcher->ProcessDeleteFileEvent(fileAndPath);
+            }
+
+            if (eventFlags[i] & kFSEventStreamEventFlagItemRenamed)
+            {
+                if (fileInfo.exists())
+                {
+                    watcher->ProcessNewFileEvent(fileAndPath);
+
+                    // macOS does not send out an event for the directory being
+                    // modified when a file has been renamed but the FileWatcher
+                    // API expects it so send out the modification event ourselves.
+                    watcher->ProcessModifyFileEvent(fileInfo.absolutePath());
+                }
+                else
+                {
+                    watcher->ProcessDeleteFileEvent(fileAndPath);
+
+                    // macOS does not send out an event for the directory being
+                    // modified when a file has been renamed but the FileWatcher
+                    // API expects it so send out the modification event ourselves.
+                    watcher->ProcessModifyFileEvent(fileInfo.absolutePath());
+                }
+            }
+        }
+    }
+}

Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_win.cpp

@@ -0,0 +1,134 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <native/FileWatcher/FileWatcher.h>
+
+#include <AzCore/PlatformIncl.h>
+
+struct FolderRootWatch::PlatformImplementation
+{
+    PlatformImplementation() : m_directoryHandle(nullptr), m_ioHandle(nullptr) { }
+    HANDLE m_directoryHandle;
+    HANDLE m_ioHandle;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+/// FolderWatchRoot
+FolderRootWatch::FolderRootWatch(const QString rootFolder)
+    : m_root(rootFolder)
+    , m_shutdownThreadSignal(false)
+    , m_fileWatcher(nullptr)
+    , m_platformImpl(new PlatformImplementation())
+{
+}
+
+FolderRootWatch::~FolderRootWatch()
+{
+    // Destructor is required in here since this file contains the definition of struct PlatformImplementation
+    Stop();
+
+    delete m_platformImpl;
+}
+
+bool FolderRootWatch::Start()
+{
+    m_platformImpl->m_directoryHandle = ::CreateFileW(m_root.toStdWString().data(), FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, nullptr);
+
+    if (m_platformImpl->m_directoryHandle != INVALID_HANDLE_VALUE)
+    {
+        m_platformImpl->m_ioHandle = ::CreateIoCompletionPort(m_platformImpl->m_directoryHandle, nullptr, 1, 0);
+        if (m_platformImpl->m_ioHandle != INVALID_HANDLE_VALUE)
+        {
+            m_shutdownThreadSignal = false;
+            m_thread = std::thread(std::bind(&FolderRootWatch::WatchFolderLoop, this));
+            return true;
+        }
+    }
+    return false;
+}
+
+void FolderRootWatch::Stop()
+{
+    m_shutdownThreadSignal = true;
+    CloseHandle(m_platformImpl->m_ioHandle);
+    m_platformImpl->m_ioHandle = nullptr;
+
+    if (m_thread.joinable())
+    {
+        m_thread.join(); // wait for the thread to finish
+        m_thread = std::thread(); //destroy
+    }
+    CloseHandle(m_platformImpl->m_directoryHandle);
+    m_platformImpl->m_directoryHandle = nullptr;
+}
+
+void FolderRootWatch::WatchFolderLoop()
+{
+    FILE_NOTIFY_INFORMATION aFileNotifyInformationList[50000];
+    QString path;
+    OVERLAPPED aOverlapped;
+    LPOVERLAPPED pOverlapped;
+    DWORD dwByteCount;
+    ULONG_PTR ulKey;
+
+    while (!m_shutdownThreadSignal)
+    {
+        ::memset(aFileNotifyInformationList, 0, sizeof(aFileNotifyInformationList));
+        ::memset(&aOverlapped, 0, sizeof(aOverlapped));
+
+        if (::ReadDirectoryChangesW(m_platformImpl->m_directoryHandle, aFileNotifyInformationList, sizeof(aFileNotifyInformationList), true, FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_FILE_NAME, nullptr, &aOverlapped, nullptr))
+        {
+            //wait for up to a second for I/O to signal
+            dwByteCount = 0;
+            if (::GetQueuedCompletionStatus(m_platformImpl->m_ioHandle, &dwByteCount, &ulKey, &pOverlapped, INFINITE))
+            {
+                //if we are signaled to shutdown bypass
+                if (!m_shutdownThreadSignal && ulKey)
+                {
+                    if (dwByteCount)
+                    {
+                        int offset = 0;
+                        FILE_NOTIFY_INFORMATION* pFileNotifyInformation = aFileNotifyInformationList;
+                        do
+                        {
+                            pFileNotifyInformation = (FILE_NOTIFY_INFORMATION*)((char*)pFileNotifyInformation + offset);
+
+                            path.clear();
+                            path.append(m_root);
+                            path.append(QString::fromWCharArray(pFileNotifyInformation->FileName, pFileNotifyInformation->FileNameLength / 2));
+
+                            QString file = QDir::toNativeSeparators(QDir::cleanPath(path));
+
+                            switch (pFileNotifyInformation->Action)
+                            {
+                            case FILE_ACTION_ADDED:
+                            case FILE_ACTION_RENAMED_NEW_NAME:
+                                ProcessNewFileEvent(file);
+                                break;
+                            case FILE_ACTION_REMOVED:
+                            case FILE_ACTION_RENAMED_OLD_NAME:
+                                ProcessDeleteFileEvent(file);
+                                break;
+                            case FILE_ACTION_MODIFIED:
+                                ProcessModifyFileEvent(file);
+                                break;
+                            }
+
+                            offset = pFileNotifyInformation->NextEntryOffset;
+                        } while (offset);
+                    }
+                }
+            }
+        }
+    }
+}
+

Code/Tools/AssetProcessor/Platform/Mac/native/resource.h

@@ -0,0 +1,30 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Editor.rc
+//
+#define IDI_ICON1                        2
+#define IDC_STATIC                      -1
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC                     1
+#define _APS_NEXT_RESOURCE_VALUE        3
+#define _APS_NEXT_COMMAND_VALUE         32769
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           110
+#endif
+#endif

Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.h

@@ -0,0 +1,38 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
+* a third party where indicated.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,  
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+*
+*/
+#ifndef MACDOCKICONHANDLER_H
+#define MACDOCKICONHANDLER_H
+
+#include <QObject>
+
+#ifdef __OBJC__
+@class DockIconClickEventHandler;
+#else
+class DockIconClickEventHandler;
+#endif
+
+class MacDockIconHandler : public QObject
+{
+    Q_OBJECT
+public:
+    MacDockIconHandler(QObject* parent = nullptr);
+    ~MacDockIconHandler();
+
+Q_SIGNALS:
+    void dockIconClicked();
+
+private:
+
+    DockIconClickEventHandler* m_dockIconClickEventHandler;
+};
+
+#endif // MACDOCKICONCLICKHANDLER_H

Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.mm

@@ -0,0 +1,71 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
+* a third party where indicated.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,  
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+*
+*/
+#include <Cocoa/Cocoa.h>
+#include <native/utilities/MacDockIconHandler.h>
+
+#include <QTimer>
+
+@interface DockIconClickEventHandler : NSObject
+{
+    MacDockIconHandler* dockIconHandler;
+}
+@end
+
+@implementation DockIconClickEventHandler
+- (id)initWithDockIconHandler:(MacDockIconHandler *)aDockIconHandler
+{
+    self = [super init];
+    if (self)
+    {
+        dockIconHandler = aDockIconHandler;
+
+        [[NSAppleEventManager sharedAppleEventManager]
+            setEventHandler:self
+                andSelector:@selector(handleDockClickEvent:withReplyEvent:)
+              forEventClass:kCoreEventClass
+                 andEventID:kAEReopenApplication];
+    }
+    return self;
+}
+
+- (void)handleDockClickEvent:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent
+{
+    Q_UNUSED(event)
+    Q_UNUSED(replyEvent)
+
+    dockIconHandler->dockIconClicked();
+}
+@end
+
+MacDockIconHandler::MacDockIconHandler(QObject* parent)
+    : QObject(parent)
+{
+    // this has to be delayed, since Qt installs the same handler
+    // using 0 is timeout is not enough.
+    QTimer* t = new QTimer;
+    t->setSingleShot(true);
+    t->start(1);
+    connect(t, &QTimer::timeout, this, [t, this]()
+    {
+        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+        m_dockIconClickEventHandler = [[DockIconClickEventHandler alloc] initWithDockIconHandler:this];
+        [pool release];
+        t->deleteLater();
+    });
+}
+
+MacDockIconHandler::~MacDockIconHandler()
+{
+    [m_dockIconClickEventHandler release];
+}
+
+#include <native/utilities/moc_MacDockIconHandler.cpp>