mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-16 00:34:19 +00:00
Changed the way module code is wrapped by the Introjucer.
This commit is contained in:
Julian Storer
parent
4808d9c318
commit
693132a6e5
252 changed files with 15540 additions and 17524 deletions
|
|
@ -28,7 +28,6 @@
|
|||
#include "jucer_ProjectExporter.h"
|
||||
#include "jucer_ProjectSaver.h"
|
||||
#include "jucer_AudioPluginModule.h"
|
||||
#include "jucer_JuceLibraryModule.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
|
|
@ -65,7 +64,7 @@ void ModuleList::rescan()
|
|||
|
||||
if (moduleDef.exists())
|
||||
{
|
||||
ScopedPointer<JuceLibraryModule> m (new JuceLibraryModule (moduleDef));
|
||||
ScopedPointer<LibraryModule> m (new LibraryModule (moduleDef));
|
||||
jassert (m->isValid());
|
||||
|
||||
if (m->isValid())
|
||||
|
|
@ -87,7 +86,7 @@ void ModuleList::rescan()
|
|||
|
||||
LibraryModule* ModuleList::Module::create() const
|
||||
{
|
||||
return new JuceLibraryModule (file);
|
||||
return new LibraryModule (file);
|
||||
}
|
||||
|
||||
LibraryModule* ModuleList::loadModule (const String& uid) const
|
||||
|
|
@ -108,8 +107,7 @@ const ModuleList::Module* ModuleList::findModuleInfo (const String& uid) const
|
|||
|
||||
void ModuleList::getDependencies (const String& moduleID, StringArray& dependencies) const
|
||||
{
|
||||
ScopedPointer<LibraryModule> lib (loadModule (moduleID));
|
||||
JuceLibraryModule* m = dynamic_cast<JuceLibraryModule*> (static_cast <LibraryModule*> (lib));
|
||||
ScopedPointer<LibraryModule> m (loadModule (moduleID));
|
||||
|
||||
if (m != nullptr)
|
||||
{
|
||||
|
|
@ -134,8 +132,7 @@ void ModuleList::getDependencies (const String& moduleID, StringArray& dependenc
|
|||
|
||||
void ModuleList::createDependencies (const String& moduleID, OwnedArray<LibraryModule>& modules) const
|
||||
{
|
||||
ScopedPointer<LibraryModule> lib (loadModule (moduleID));
|
||||
JuceLibraryModule* m = dynamic_cast<JuceLibraryModule*> (static_cast <LibraryModule*> (lib));
|
||||
ScopedPointer<LibraryModule> m (loadModule (moduleID));
|
||||
|
||||
if (m != nullptr)
|
||||
{
|
||||
|
|
@ -155,3 +152,305 @@ void ModuleList::createDependencies (const String& moduleID, OwnedArray<LibraryM
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
LibraryModule::LibraryModule (const File& file)
|
||||
: moduleInfo (JSON::parse (file)),
|
||||
moduleFile (file),
|
||||
moduleFolder (file.getParentDirectory())
|
||||
{
|
||||
jassert (isValid());
|
||||
}
|
||||
|
||||
String LibraryModule::getID() const { return moduleInfo ["id"].toString(); };
|
||||
bool LibraryModule::isValid() const { return getID().isNotEmpty(); }
|
||||
|
||||
bool LibraryModule::isPluginClient() const { return getID() == "juce_audio_plugin_client"; }
|
||||
bool LibraryModule::isAUPluginHost (const Project& project) const { return getID() == "juce_audio_processors" && project.isConfigFlagEnabled ("JUCE_PLUGINHOST_AU"); }
|
||||
bool LibraryModule::isVSTPluginHost (const Project& project) const { return getID() == "juce_audio_processors" && project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST"); }
|
||||
|
||||
void LibraryModule::writeIncludes (ProjectSaver& projectSaver, OutputStream& out)
|
||||
{
|
||||
File header (getInclude (getModuleTargetFolder (projectSaver)));
|
||||
|
||||
StringArray paths, guards;
|
||||
createMultipleIncludes (projectSaver.getProject(), getPathToModuleFile (projectSaver, header),
|
||||
paths, guards);
|
||||
|
||||
ProjectSaver::writeGuardedInclude (out, paths, guards);
|
||||
}
|
||||
|
||||
void LibraryModule::prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const
|
||||
{
|
||||
Project& project = exporter.getProject();
|
||||
|
||||
File localFolder (getModuleTargetFolder (projectSaver));
|
||||
|
||||
if (localFolder != moduleFolder && ! localFolder.isDirectory())
|
||||
moduleFolder.copyDirectoryTo (localFolder);
|
||||
|
||||
{
|
||||
Array<File> compiled;
|
||||
findAndAddCompiledCode (exporter, projectSaver, localFolder, compiled);
|
||||
|
||||
if (project.shouldShowAllModuleFilesInProject (getID()).getValue())
|
||||
addBrowsableCode (exporter, compiled, localFolder);
|
||||
}
|
||||
|
||||
if (isVSTPluginHost (project))
|
||||
VSTHelpers::addVSTFolderToPath (exporter, exporter.extraSearchPaths);
|
||||
|
||||
if (isAUPluginHost (project))
|
||||
exporter.xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit", false);
|
||||
|
||||
if (isPluginClient())
|
||||
{
|
||||
if (shouldBuildVST (project).getValue()) VSTHelpers::prepareExporter (exporter, projectSaver);
|
||||
if (shouldBuildRTAS (project).getValue()) RTASHelpers::prepareExporter (exporter, projectSaver, localFolder);
|
||||
if (shouldBuildAU (project).getValue()) AUHelpers::prepareExporter (exporter, projectSaver);
|
||||
}
|
||||
}
|
||||
|
||||
void LibraryModule::createPropertyEditors (const ProjectExporter& exporter, Array <PropertyComponent*>& props) const
|
||||
{
|
||||
if (isVSTPluginHost (exporter.getProject()))
|
||||
VSTHelpers::createVSTPathEditor (exporter, props);
|
||||
|
||||
if (isPluginClient())
|
||||
{
|
||||
if (shouldBuildVST (exporter.getProject()).getValue()) VSTHelpers::createPropertyEditors (exporter, props);
|
||||
if (shouldBuildRTAS (exporter.getProject()).getValue()) RTASHelpers::createPropertyEditors (exporter, props);
|
||||
}
|
||||
}
|
||||
|
||||
void LibraryModule::getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const
|
||||
{
|
||||
const File header (getInclude (moduleFolder));
|
||||
jassert (header.exists());
|
||||
|
||||
StringArray lines;
|
||||
header.readLines (lines);
|
||||
|
||||
for (int i = 0; i < lines.size(); ++i)
|
||||
{
|
||||
String line (lines[i].trim());
|
||||
|
||||
if (line.startsWith ("/**") && line.containsIgnoreCase ("Config:"))
|
||||
{
|
||||
ScopedPointer <Project::ConfigFlag> config (new Project::ConfigFlag());
|
||||
config->sourceModuleID = getID();
|
||||
config->symbol = line.fromFirstOccurrenceOf (":", false, false).trim();
|
||||
|
||||
if (config->symbol.length() > 2)
|
||||
{
|
||||
++i;
|
||||
|
||||
while (! (lines[i].contains ("*/") || lines[i].contains ("@see")))
|
||||
{
|
||||
if (lines[i].trim().isNotEmpty())
|
||||
config->description = config->description.trim() + " " + lines[i].trim();
|
||||
|
||||
++i;
|
||||
}
|
||||
|
||||
config->description = config->description.upToFirstOccurrenceOf ("*/", false, false);
|
||||
config->value.referTo (project.getConfigFlag (config->symbol));
|
||||
flags.add (config.release());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File LibraryModule::getModuleTargetFolder (ProjectSaver& projectSaver) const
|
||||
{
|
||||
if (projectSaver.getProject().shouldCopyModuleFilesLocally (getID()).getValue())
|
||||
return projectSaver.getGeneratedCodeFolder().getChildFile (getID());
|
||||
|
||||
return moduleFolder;
|
||||
}
|
||||
|
||||
File LibraryModule::getInclude (const File& folder) const
|
||||
{
|
||||
return folder.getChildFile (moduleInfo ["include"]);
|
||||
}
|
||||
|
||||
String LibraryModule::getPathToModuleFile (ProjectSaver& projectSaver, const File& file) const
|
||||
{
|
||||
return file.getRelativePathFrom (getModuleTargetFolder (projectSaver).getParentDirectory().getParentDirectory());
|
||||
}
|
||||
|
||||
bool LibraryModule::fileTargetMatches (ProjectExporter& exporter, const String& target)
|
||||
{
|
||||
if (target.startsWithChar ('!'))
|
||||
return ! fileTargetMatches (exporter, target.substring (1).trim());
|
||||
|
||||
if (target == "xcode") return exporter.isXcode();
|
||||
if (target == "msvc") return exporter.isVisualStudio();
|
||||
if (target == "linux") return exporter.isLinux();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void LibraryModule::findWildcardMatches (const File& localModuleFolder, const String& wildcardPath, Array<File>& result) const
|
||||
{
|
||||
String path (wildcardPath.upToLastOccurrenceOf ("/", false, false));
|
||||
String wildCard (wildcardPath.fromLastOccurrenceOf ("/", false, false));
|
||||
|
||||
Array<File> tempList;
|
||||
FileSorter sorter;
|
||||
|
||||
DirectoryIterator iter (localModuleFolder.getChildFile (path), false, wildCard);
|
||||
while (iter.next())
|
||||
tempList.addSorted (sorter, iter.getFile());
|
||||
|
||||
result.addArray (tempList);
|
||||
}
|
||||
|
||||
void LibraryModule::addFileWithGroups (Project::Item& group, const File& file, const String& path) const
|
||||
{
|
||||
const int slash = path.indexOfChar ('/');
|
||||
|
||||
if (slash >= 0)
|
||||
{
|
||||
const String topLevelGroup (path.substring (0, slash));
|
||||
const String remainingPath (path.substring (slash + 1));
|
||||
|
||||
Project::Item newGroup (group.getOrCreateSubGroup (topLevelGroup));
|
||||
addFileWithGroups (newGroup, file, remainingPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (! group.findItemForFile (file).isValid())
|
||||
group.addFileUnchecked (file, -1, false);
|
||||
}
|
||||
}
|
||||
|
||||
void LibraryModule::findAndAddCompiledCode (ProjectExporter& exporter, ProjectSaver& projectSaver,
|
||||
const File& localModuleFolder, Array<File>& result) const
|
||||
{
|
||||
const var compileArray (moduleInfo ["compile"]); // careful to keep this alive while the array is in use!
|
||||
const Array<var>* const files = compileArray.getArray();
|
||||
|
||||
if (files != nullptr)
|
||||
{
|
||||
for (int i = 0; i < files->size(); ++i)
|
||||
{
|
||||
const var& file = files->getReference(i);
|
||||
const String filename (file ["file"].toString());
|
||||
|
||||
if (filename.isNotEmpty()
|
||||
&& fileTargetMatches (exporter, file ["target"].toString()))
|
||||
{
|
||||
const File compiledFile (localModuleFolder.getChildFile (filename));
|
||||
result.add (compiledFile);
|
||||
|
||||
Project::Item item (projectSaver.addFileToGeneratedGroup (compiledFile));
|
||||
|
||||
if (file ["warnings"].toString().equalsIgnoreCase ("disabled"))
|
||||
item.getShouldInhibitWarningsValue() = true;
|
||||
|
||||
if (file ["stdcall"])
|
||||
item.getShouldUseStdCallValue() = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void LibraryModule::addBrowsableCode (ProjectExporter& exporter, const Array<File>& compiled, const File& localModuleFolder) const
|
||||
{
|
||||
if (sourceFiles.size() == 0)
|
||||
{
|
||||
const var filesArray (moduleInfo ["browse"]);
|
||||
const Array<var>* const files = filesArray.getArray();
|
||||
|
||||
for (int i = 0; i < files->size(); ++i)
|
||||
findWildcardMatches (localModuleFolder, files->getReference(i), sourceFiles);
|
||||
}
|
||||
|
||||
Project::Item sourceGroup (Project::Item::createGroup (exporter.getProject(), getID(), "__mainsourcegroup" + getID()));
|
||||
|
||||
int i;
|
||||
for (i = 0; i < sourceFiles.size(); ++i)
|
||||
addFileWithGroups (sourceGroup, sourceFiles.getReference(i),
|
||||
sourceFiles.getReference(i).getRelativePathFrom (localModuleFolder));
|
||||
|
||||
sourceGroup.addFile (localModuleFolder.getChildFile (moduleFile.getRelativePathFrom (moduleFolder)), -1, false);
|
||||
sourceGroup.addFile (getInclude (localModuleFolder), -1, false);
|
||||
|
||||
for (i = 0; i < compiled.size(); ++i)
|
||||
addFileWithGroups (sourceGroup, compiled.getReference(i),
|
||||
compiled.getReference(i).getRelativePathFrom (localModuleFolder));
|
||||
|
||||
exporter.getModulesGroup().getNode().addChild (sourceGroup.getNode().createCopy(), -1, nullptr);
|
||||
}
|
||||
|
||||
void LibraryModule::writeSourceWrapper (OutputStream& out, Project& project, const String& pathFromJuceFolder)
|
||||
{
|
||||
const String appConfigFileName (project.getAppConfigFilename());
|
||||
|
||||
ProjectSaver::writeAutoGenWarningComment (out);
|
||||
|
||||
out << " This file pulls in a module's source code, and builds it using the settings" << newLine
|
||||
<< " defined in " << appConfigFileName << "." << newLine
|
||||
<< newLine
|
||||
<< "*/"
|
||||
<< newLine
|
||||
<< newLine
|
||||
<< "#define JUCE_WRAPPED_FILE 1" << newLine
|
||||
<< newLine
|
||||
<< CodeHelpers::createIncludeStatement (appConfigFileName) << newLine;
|
||||
|
||||
writeInclude (project, out, pathFromJuceFolder);
|
||||
}
|
||||
|
||||
void LibraryModule::createMultipleIncludes (Project& project, const String& pathFromLibraryFolder,
|
||||
StringArray& paths, StringArray& guards)
|
||||
{
|
||||
for (int i = project.getNumExporters(); --i >= 0;)
|
||||
{
|
||||
ScopedPointer <ProjectExporter> exporter (project.createExporter (i));
|
||||
|
||||
if (exporter != nullptr)
|
||||
{
|
||||
paths.add (exporter->getIncludePathForFileInJuceFolder (pathFromLibraryFolder, project.getAppIncludeFile()));
|
||||
guards.add ("defined (" + exporter->getExporterIdentifierMacro() + ")");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void LibraryModule::writeInclude (Project& project, OutputStream& out, const String& pathFromJuceFolder)
|
||||
{
|
||||
StringArray paths, guards;
|
||||
createMultipleIncludes (project, pathFromJuceFolder, paths, guards);
|
||||
|
||||
StringArray uniquePaths (paths);
|
||||
uniquePaths.removeDuplicates (false);
|
||||
|
||||
if (uniquePaths.size() == 1)
|
||||
{
|
||||
out << "#include " << paths[0] << newLine;
|
||||
}
|
||||
else
|
||||
{
|
||||
int i = paths.size();
|
||||
for (; --i >= 0;)
|
||||
{
|
||||
for (int j = i; --j >= 0;)
|
||||
{
|
||||
if (paths[i] == paths[j] && guards[i] == guards[j])
|
||||
{
|
||||
paths.remove (i);
|
||||
guards.remove (i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < paths.size(); ++i)
|
||||
{
|
||||
out << (i == 0 ? "#if " : "#elif ") << guards[i] << newLine
|
||||
<< " #include " << paths[i] << newLine;
|
||||
}
|
||||
|
||||
out << "#endif" << newLine;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue