From 0a609b307ef2e152b9614a649b866c0c1e9fd8ee Mon Sep 17 00:00:00 2001 From: reuk Date: Mon, 19 Jul 2021 19:00:25 +0100 Subject: [PATCH] build_tools: Tidy up BuildHelperFunctions and remove some unnecessary namespaces --- .../utils/juce_BuildHelperFunctions.cpp | 64 ++++++++++--------- .../juce_build_tools/utils/juce_Icons.cpp | 4 +- .../juce_build_tools/utils/juce_ProjectType.h | 2 +- .../utils/juce_RelativePath.h | 2 +- .../utils/juce_VersionNumbers.cpp | 6 +- .../utils/juce_VersionNumbers.h | 6 +- 6 files changed, 44 insertions(+), 40 deletions(-) diff --git a/extras/Build/juce_build_tools/utils/juce_BuildHelperFunctions.cpp b/extras/Build/juce_build_tools/utils/juce_BuildHelperFunctions.cpp index 1e193e5880..3097c74d92 100644 --- a/extras/Build/juce_build_tools/utils/juce_BuildHelperFunctions.cpp +++ b/extras/Build/juce_build_tools/utils/juce_BuildHelperFunctions.cpp @@ -54,31 +54,33 @@ namespace build_tools String getXcodePackageType (ProjectType::Target::Type type) { + using Type = ProjectType::Target::Type; + switch (type) { - case ProjectType::Target::Type::GUIApp: - case ProjectType::Target::Type::StandalonePlugIn: + case Type::GUIApp: + case Type::StandalonePlugIn: return "APPL"; - case ProjectType::Target::Type::VSTPlugIn: - case ProjectType::Target::Type::VST3PlugIn: - case ProjectType::Target::Type::AudioUnitPlugIn: - case ProjectType::Target::Type::UnityPlugIn: + case Type::VSTPlugIn: + case Type::VST3PlugIn: + case Type::AudioUnitPlugIn: + case Type::UnityPlugIn: return "BNDL"; - case ProjectType::Target::Type::AudioUnitv3PlugIn: + case Type::AudioUnitv3PlugIn: return "XPC!"; - case ProjectType::Target::Type::AAXPlugIn: - case ProjectType::Target::Type::RTASPlugIn: + case Type::AAXPlugIn: + case Type::RTASPlugIn: return "TDMw"; - case ProjectType::Target::Type::ConsoleApp: - case ProjectType::Target::Type::StaticLibrary: - case ProjectType::Target::Type::DynamicLibrary: - case ProjectType::Target::Type::SharedCodeTarget: - case ProjectType::Target::Type::AggregateTarget: - case ProjectType::Target::Type::unspecified: + case Type::ConsoleApp: + case Type::StaticLibrary: + case Type::DynamicLibrary: + case Type::SharedCodeTarget: + case Type::AggregateTarget: + case Type::unspecified: default: return {}; } @@ -86,27 +88,29 @@ namespace build_tools String getXcodeBundleSignature (ProjectType::Target::Type type) { + using Type = ProjectType::Target::Type; + switch (type) { - case ProjectType::Target::Type::GUIApp: - case ProjectType::Target::Type::VSTPlugIn: - case ProjectType::Target::Type::VST3PlugIn: - case ProjectType::Target::Type::AudioUnitPlugIn: - case ProjectType::Target::Type::StandalonePlugIn: - case ProjectType::Target::Type::AudioUnitv3PlugIn: - case ProjectType::Target::Type::UnityPlugIn: + case Type::GUIApp: + case Type::VSTPlugIn: + case Type::VST3PlugIn: + case Type::AudioUnitPlugIn: + case Type::StandalonePlugIn: + case Type::AudioUnitv3PlugIn: + case Type::UnityPlugIn: return "????"; - case ProjectType::Target::Type::AAXPlugIn: - case ProjectType::Target::Type::RTASPlugIn: + case Type::AAXPlugIn: + case Type::RTASPlugIn: return "PTul"; - case ProjectType::Target::Type::ConsoleApp: - case ProjectType::Target::Type::StaticLibrary: - case ProjectType::Target::Type::DynamicLibrary: - case ProjectType::Target::Type::SharedCodeTarget: - case ProjectType::Target::Type::AggregateTarget: - case ProjectType::Target::Type::unspecified: + case Type::ConsoleApp: + case Type::StaticLibrary: + case Type::DynamicLibrary: + case Type::SharedCodeTarget: + case Type::AggregateTarget: + case Type::unspecified: default: return {}; } diff --git a/extras/Build/juce_build_tools/utils/juce_Icons.cpp b/extras/Build/juce_build_tools/utils/juce_Icons.cpp index c0e51acc81..1429cc0ae0 100644 --- a/extras/Build/juce_build_tools/utils/juce_Icons.cpp +++ b/extras/Build/juce_build_tools/utils/juce_Icons.cpp @@ -288,12 +288,12 @@ namespace build_tools void writeMacIcon (const Icons& icons, const File& file) { - writeStreamToFile (file, [&] (juce::MemoryOutputStream& mo) { writeMacIcon (icons, mo); }); + writeStreamToFile (file, [&] (MemoryOutputStream& mo) { writeMacIcon (icons, mo); }); } void writeWinIcon (const Icons& icons, const File& file) { - writeStreamToFile (file, [&] (juce::MemoryOutputStream& mo) { writeWinIcon (icons, mo); }); + writeStreamToFile (file, [&] (MemoryOutputStream& mo) { writeWinIcon (icons, mo); }); } Image rescaleImageForIcon (Drawable& d, const int size) diff --git a/extras/Build/juce_build_tools/utils/juce_ProjectType.h b/extras/Build/juce_build_tools/utils/juce_ProjectType.h index d4f1bfb5ea..dd02787461 100644 --- a/extras/Build/juce_build_tools/utils/juce_ProjectType.h +++ b/extras/Build/juce_build_tools/utils/juce_ProjectType.h @@ -121,7 +121,7 @@ namespace build_tools return "undefined"; } - static Type typeFromName (const juce::String& name) + static Type typeFromName (const String& name) { if (name == "App") return Type::GUIApp; if (name == "ConsoleApp") return Type::ConsoleApp; diff --git a/extras/Build/juce_build_tools/utils/juce_RelativePath.h b/extras/Build/juce_build_tools/utils/juce_RelativePath.h index 7940902520..c7393d0c70 100644 --- a/extras/Build/juce_build_tools/utils/juce_RelativePath.h +++ b/extras/Build/juce_build_tools/utils/juce_RelativePath.h @@ -64,7 +64,7 @@ namespace build_tools String getFileNameWithoutExtension() const { return getFakeFile().getFileNameWithoutExtension(); } String getFileExtension() const { return getFakeFile().getFileExtension(); } - bool hasFileExtension (juce::StringRef extension) const { return getFakeFile().hasFileExtension (extension); } + bool hasFileExtension (StringRef extension) const { return getFakeFile().hasFileExtension (extension); } bool isAbsolute() const { return isAbsolutePath (path); } RelativePath withFileExtension (const String& extension) const diff --git a/extras/Build/juce_build_tools/utils/juce_VersionNumbers.cpp b/extras/Build/juce_build_tools/utils/juce_VersionNumbers.cpp index 83ccefe31b..3f2d523fe5 100644 --- a/extras/Build/juce_build_tools/utils/juce_VersionNumbers.cpp +++ b/extras/Build/juce_build_tools/utils/juce_VersionNumbers.cpp @@ -27,7 +27,7 @@ namespace juce { namespace build_tools { - StringArray getVersionSegments (juce::StringRef p) + StringArray getVersionSegments (StringRef p) { auto segments = StringArray::fromTokens (p, ",.", ""); segments.trim(); @@ -47,12 +47,12 @@ namespace build_tools return value; } - int getVersionAsHexInteger (juce::StringRef versionString) + int getVersionAsHexInteger (StringRef versionString) { return getVersionAsHexIntegerFromParts (getVersionSegments (versionString)); } - String getVersionAsHex (juce::StringRef versionString) + String getVersionAsHex (StringRef versionString) { return "0x" + String::toHexString (getVersionAsHexInteger (versionString)); } diff --git a/extras/Build/juce_build_tools/utils/juce_VersionNumbers.h b/extras/Build/juce_build_tools/utils/juce_VersionNumbers.h index c52c9500f9..931b67f9d5 100644 --- a/extras/Build/juce_build_tools/utils/juce_VersionNumbers.h +++ b/extras/Build/juce_build_tools/utils/juce_VersionNumbers.h @@ -27,11 +27,11 @@ namespace juce { namespace build_tools { - StringArray getVersionSegments (juce::StringRef p); + StringArray getVersionSegments (StringRef p); int getVersionAsHexIntegerFromParts (const StringArray& versionString); - int getVersionAsHexInteger (juce::StringRef versionString); + int getVersionAsHexInteger (StringRef versionString); - String getVersionAsHex (juce::StringRef versionString); + String getVersionAsHex (StringRef versionString); } }