mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-04 03:40:07 +00:00
Code Activity

build_tools: Tidy up BuildHelperFunctions and remove some unnecessary namespaces

Browse source
This commit is contained in:
reuk 2021-07-19 19:00:25 +01:00
parent 366a626894
commit 0a609b307e
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
6 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

64
extras/Build/juce_build_tools/utils/juce_BuildHelperFunctions.cpp
View file

@ -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 {};
}

4
extras/Build/juce_build_tools/utils/juce_Icons.cpp
View file

@ -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)

2
extras/Build/juce_build_tools/utils/juce_ProjectType.h
View file

@ -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;

2
extras/Build/juce_build_tools/utils/juce_RelativePath.h
View file

@ -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

6
extras/Build/juce_build_tools/utils/juce_VersionNumbers.cpp
View file

@ -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));
}

6
extras/Build/juce_build_tools/utils/juce_VersionNumbers.h
View file

@ -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);
}
}