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

Refactoring: moved getVST/AAX/RTASFolder() into Exporter so it can use a DependencyPathValueSource instead of the project setting.

Browse source
This commit is contained in:
Timur Doumler 2015-08-13 15:13:33 +01:00
parent f4c91eca99
commit 7ea0ab19fd
2 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h
View file

@ -114,6 +114,10 @@ public:
Value getUserNotes() { return getSetting (Ids::userNotes); }
Value getVSTPathValue (bool isVST3) const { return isVST3 ? vst3Path : vst2Path; }
Value getRTASPathValue() const { return rtasPath; }
Value getAAXPathValue() const { return aaxPath; }
// NB: this is the path to the parent "modules" folder that contains the named module, not the
// module folder itself.
Value getPathForModuleValue (const String& moduleID);
@ -329,6 +333,7 @@ protected:
const ProjectType& projectType;
const String projectName;
const File projectFolder;
Value vst2Path, vst3Path, rtasPath, aaxPath; // these must be initialised in the specific exporter c'tors!
mutable Array<Project::Item> itemGroups;
void initItemGroups() const;

58
extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
View file

@ -239,15 +239,9 @@ namespace
//==============================================================================
namespace VSTHelpers
{
static Value getVSTFolder (ProjectExporter& exporter, bool isVST3)
{
return exporter.getSetting (isVST3 ? Ids::vst3Folder
: Ids::vstFolder);
}
static void addVSTFolderToPath (ProjectExporter& exporter, bool isVST3)
{
const String vstFolder (getVSTFolder (exporter, isVST3).toString());
const String vstFolder (exporter.getVSTPathValue (isVST3).toString());
if (vstFolder.isNotEmpty())
{
@ -264,10 +258,8 @@ namespace VSTHelpers
{
const String vstFormat (isVST3 ? "VST3" : "VST");
props.add (new DependencyPathPropertyComponent (getVSTFolder (exporter, isVST3),
vstFormat + " Folder",
isVST3 ? DependencyPath::vst3KeyName : DependencyPath::vst2KeyName,
getDependencyPathOS (exporter)),
props.add (new DependencyPathPropertyComponent (exporter.getVSTPathValue (isVST3),
vstFormat + " Folder"),
"If you're building a " + vstFormat + ", this must be the folder containing the " + vstFormat + " SDK. This should be an absolute path.");
}
@ -326,15 +318,19 @@ namespace VSTHelpers
//==============================================================================
namespace RTASHelpers
{
static Value getRTASFolder (ProjectExporter& exporter) { return exporter.getSetting (Ids::rtasFolder); }
static RelativePath getRTASFolderPath (ProjectExporter& exporter) { return RelativePath (exporter.getSettingString (Ids::rtasFolder),
RelativePath::projectFolder); }
static RelativePath getRTASRelativeFolderPath (ProjectExporter& exporter)
{
return RelativePath (exporter.getRTASPathValue().toString(), RelativePath::projectFolder);
}
static bool isExporterSupported (ProjectExporter& exporter) { return exporter.isVisualStudio() || exporter.isXcode(); }
static bool isExporterSupported (ProjectExporter& exporter)
{
return exporter.isVisualStudio() || exporter.isXcode();
}
static void addExtraSearchPaths (ProjectExporter& exporter)
{
RelativePath rtasFolder (getRTASFolderPath (exporter));
RelativePath rtasFolder (getRTASRelativeFolderPath (exporter));
if (exporter.isVisualStudio())
{
@ -419,7 +415,7 @@ namespace RTASHelpers
{
fixMissingXcodePostBuildScript (exporter);
const RelativePath rtasFolder (getRTASFolderPath (exporter));
const RelativePath rtasFolder (getRTASRelativeFolderPath (exporter));
if (exporter.isVisualStudio())
{
@ -474,10 +470,8 @@ namespace RTASHelpers
{
fixMissingXcodePostBuildScript (exporter);
props.add (new DependencyPathPropertyComponent (getRTASFolder (exporter),
"RTAS Folder",
DependencyPath::rtasKeyName,
getDependencyPathOS (exporter)),
props.add (new DependencyPathPropertyComponent (exporter.getRTASPathValue(),
"RTAS Folder"),
"If you're building an RTAS, this must be the folder containing the RTAS SDK. This should be an absolute path.");
}
}
@ -611,15 +605,19 @@ namespace AUHelpers
//==============================================================================
namespace AAXHelpers
{
static Value getAAXFolder (ProjectExporter& exporter) { return exporter.getSetting (Ids::aaxFolder); }
static RelativePath getAAXFolderPath (ProjectExporter& exporter) { return RelativePath (exporter.getSettingString (Ids::aaxFolder),
RelativePath::projectFolder); }
static RelativePath getAAXRelativeFolderPath (ProjectExporter& exporter)
{
return RelativePath (exporter.getAAXPathValue().toString(), RelativePath::projectFolder);
}
static bool isExporterSupported (ProjectExporter& exporter) { return exporter.isVisualStudio() || exporter.isXcode(); }
static bool isExporterSupported (ProjectExporter& exporter)
{
return exporter.isVisualStudio() || exporter.isXcode();
}
static void addExtraSearchPaths (ProjectExporter& exporter)
{
const RelativePath aaxFolder (getAAXFolderPath (exporter));
const RelativePath aaxFolder (getAAXRelativeFolderPath (exporter));
exporter.addToExtraSearchPaths (aaxFolder);
exporter.addToExtraSearchPaths (aaxFolder.getChildFile ("Interfaces"));
@ -632,7 +630,7 @@ namespace AAXHelpers
{
fixMissingXcodePostBuildScript (exporter);
const RelativePath aaxLibsFolder (getAAXFolderPath (exporter).getChildFile ("Libs"));
const RelativePath aaxLibsFolder (getAAXRelativeFolderPath (exporter).getChildFile ("Libs"));
if (exporter.isVisualStudio())
{
@ -661,10 +659,8 @@ namespace AAXHelpers
{
fixMissingXcodePostBuildScript (exporter);
props.add (new DependencyPathPropertyComponent (getAAXFolder (exporter),
"AAX SDK Folder",
DependencyPath::aaxKeyName,
getDependencyPathOS (exporter)),
props.add (new DependencyPathPropertyComponent (exporter.getAAXPathValue(),
"AAX SDK Folder"),
"If you're building an AAX, this must be the folder containing the AAX SDK. This should be an absolute path.");
}
}