Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). (#741)

Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used).

Code/CryEngine/CryCommon/StringUtils.h

@@ -168,7 +168,6 @@ namespace CryStringUtils_Internal
     // Can be used for ASCII and Unicode (UTF-8/UTF-16/UTF-32), but not for ANSI.
     // ? will match exactly one code-point.
     // * will match zero or more code-points.
-    // Note: function moved here from CryCommonTools.
     template <template<class> class CharComparator, class CharType>
     inline bool MatchesWildcards_Tpl(const CharType* pStr, const CharType* pWild)
     {

Code/Sandbox/Editor/CMakeLists.txt

@@ -118,7 +118,6 @@ ly_add_target(
             Gem::LmbrCentral.Static
             Legacy::NewsShared
             AZ::AWSNativeSDKInit
-            Legacy::CryCommonTools
             AZ::AtomCore
             Gem::Atom_RPI.Edit
             Gem::Atom_RPI.Public
@@ -244,7 +243,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 AZ::AzToolsFramework
                 Legacy::EditorLib
                 Gem::LmbrCentral
-                Legacy::CryCommonTools
     )
     ly_add_googletest(
         NAME Legacy::EditorLib.Tests

Code/Sandbox/Editor/editor_lib_files.cmake

@@ -760,10 +760,13 @@ set(FILES
     Util/PakFile.h
     Util/PredefinedAspectRatios.cpp
     Util/PredefinedAspectRatios.h
+    Util/StringHelpers.cpp
+    Util/StringHelpers.h
     Util/StringNoCasePredicate.h
     Util/TRefCountBase.h
     Util/Triangulate.cpp
     Util/Triangulate.h
+    Util/Util.h
     Util/XmlArchive.cpp
     Util/XmlArchive.h
     Util/XmlHistoryManager.cpp

Code/Tools/CMakeLists.txt

@@ -14,7 +14,6 @@ add_subdirectory(AssetProcessor)
 add_subdirectory(AWSNativeSDKInit)
 add_subdirectory(AzTestRunner)
 add_subdirectory(CrashHandler)
-add_subdirectory(CryCommonTools)
 add_subdirectory(News)
 add_subdirectory(PythonBindingsExample)
 add_subdirectory(RemoteConsole)

Code/Tools/CryCommonTools/CMakeLists.txt

@@ -1,30 +0,0 @@
-#
-# 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.
-#
-
-if (NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME CryCommonTools STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        crycommontools_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-        PUBLIC
-            Legacy::CryCommon
-            AZ::AzFramework
-)

Code/Tools/CryCommonTools/crycommontools_files.cmake

@@ -1,15 +0,0 @@
-#
-# 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
-    StringHelpers.cpp
-    StringHelpers.h
-)

Gems/PhysX/Code/CMakeLists.txt

@@ -107,7 +107,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::SceneCore
                 AZ::SceneData
                 Legacy::CryCommon
-                Legacy::CryCommonTools
                 Gem::LmbrCentral
                 Gem::PhysX.NumericalMethods
                 Gem::PhysX.Static

scripts/build/package/Platform/Windows/package_filelists/atom.json

@@ -37,7 +37,6 @@
                 "AssetBundler/**": "#include",
                 "AzTestRunner/**": "#include",
                 "CrashHandler/**": "#include",
-                "CryCommonTools/**": "#include",
                 "DeltaCataloger/**": "#include",
                 "GridHub/**": "#include",
                 "News/**": "#include",