Browse Source

Code::Blocks: Deprecate the Code::Blocks exporter

v7.0.9
Tom Poole 2 years ago
parent
commit
3604accc0f
3 changed files with 38 additions and 12 deletions
  1. +28
    -9
      extras/Projucer/Source/Project/jucer_Project.cpp
  2. +8
    -1
      extras/Projucer/Source/Project/jucer_Project.h
  3. +2
    -2
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h

+ 28
- 9
extras/Projucer/Source/Project/jucer_Project.cpp View File

@@ -906,6 +906,25 @@ void Project::updateModuleWarnings()
updateModuleNotFoundWarning (moduleNotFound); updateModuleNotFoundWarning (moduleNotFound);
} }
void Project::updateExporterWarnings()
{
const Identifier deprecatedExporters[] = { "CODEBLOCKS_WINDOWS", "CODEBLOCKS_LINUX" };
for (const auto exporter : getExporters())
{
for (const auto& name : deprecatedExporters)
{
if (exporter.getType() == name)
{
addProjectMessage (ProjectMessages::Ids::deprecatedExporter, {});
return;
}
}
}
removeProjectMessage (ProjectMessages::Ids::deprecatedExporter);
}
void Project::updateCppStandardWarning (bool showWarning) void Project::updateCppStandardWarning (bool showWarning)
{ {
if (showWarning) if (showWarning)
@@ -1139,24 +1158,24 @@ void Project::valueTreePropertyChanged (ValueTree& tree, const Identifier& prope
changed(); changed();
} }
void Project::valueTreeChildAdded (ValueTree& parent, ValueTree& child)
void Project::valueTreeChildAddedOrRemoved (ValueTree& parent, ValueTree& child)
{ {
ignoreUnused (parent);
if (child.getType() == Ids::MODULE) if (child.getType() == Ids::MODULE)
updateModuleWarnings(); updateModuleWarnings();
else if (parent.getType() == Ids::EXPORTFORMATS)
updateExporterWarnings();
changed(); changed();
} }
void Project::valueTreeChildRemoved (ValueTree& parent, ValueTree& child, int index)
void Project::valueTreeChildAdded (ValueTree& parent, ValueTree& child)
{ {
ignoreUnused (parent, index);
if (child.getType() == Ids::MODULE)
updateModuleWarnings();
valueTreeChildAddedOrRemoved (parent, child);
}
changed();
void Project::valueTreeChildRemoved (ValueTree& parent, ValueTree& child, int)
{
valueTreeChildAddedOrRemoved (parent, child);
} }
void Project::valueTreeChildOrderChanged (ValueTree&, int, int) void Project::valueTreeChildOrderChanged (ValueTree&, int, int)


+ 8
- 1
extras/Projucer/Source/Project/jucer_Project.h View File

@@ -51,6 +51,7 @@ namespace ProjectMessages
DECLARE_ID (newVersionAvailable); DECLARE_ID (newVersionAvailable);
DECLARE_ID (pluginCodeInvalid); DECLARE_ID (pluginCodeInvalid);
DECLARE_ID (manufacturerCodeInvalid); DECLARE_ID (manufacturerCodeInvalid);
DECLARE_ID (deprecatedExporter);
DECLARE_ID (notification); DECLARE_ID (notification);
DECLARE_ID (warning); DECLARE_ID (warning);
@@ -64,7 +65,8 @@ namespace ProjectMessages
{ {
static Identifier warnings[] = { Ids::incompatibleLicense, Ids::cppStandard, Ids::moduleNotFound, static Identifier warnings[] = { Ids::incompatibleLicense, Ids::cppStandard, Ids::moduleNotFound,
Ids::jucePath, Ids::jucerFileModified, Ids::missingModuleDependencies, Ids::jucePath, Ids::jucerFileModified, Ids::missingModuleDependencies,
Ids::oldProjucer, Ids::pluginCodeInvalid, Ids::manufacturerCodeInvalid };
Ids::oldProjucer, Ids::pluginCodeInvalid, Ids::manufacturerCodeInvalid,
Ids::deprecatedExporter };
if (std::find (std::begin (warnings), std::end (warnings), message) != std::end (warnings)) if (std::find (std::begin (warnings), std::end (warnings), message) != std::end (warnings))
return Ids::warning; return Ids::warning;
@@ -88,6 +90,7 @@ namespace ProjectMessages
if (message == Ids::newVersionAvailable) return "New Version Available"; if (message == Ids::newVersionAvailable) return "New Version Available";
if (message == Ids::pluginCodeInvalid) return "Invalid Plugin Code"; if (message == Ids::pluginCodeInvalid) return "Invalid Plugin Code";
if (message == Ids::manufacturerCodeInvalid) return "Invalid Manufacturer Code"; if (message == Ids::manufacturerCodeInvalid) return "Invalid Manufacturer Code";
if (message == Ids::deprecatedExporter) return "Deprecated Exporter";
jassertfalse; jassertfalse;
return {}; return {};
@@ -105,6 +108,7 @@ namespace ProjectMessages
if (message == Ids::newVersionAvailable) return "A new version of JUCE is available to download."; if (message == Ids::newVersionAvailable) return "A new version of JUCE is available to download.";
if (message == Ids::pluginCodeInvalid) return "The plugin code should be exactly four characters in length."; if (message == Ids::pluginCodeInvalid) return "The plugin code should be exactly four characters in length.";
if (message == Ids::manufacturerCodeInvalid) return "The manufacturer code should be exactly four characters in length."; if (message == Ids::manufacturerCodeInvalid) return "The manufacturer code should be exactly four characters in length.";
if (message == Ids::deprecatedExporter) return "The project includes a deprecated exporter.";
jassertfalse; jassertfalse;
return {}; return {};
@@ -551,6 +555,8 @@ private:
void valueTreeChildRemoved (ValueTree&, ValueTree&, int) override; void valueTreeChildRemoved (ValueTree&, ValueTree&, int) override;
void valueTreeChildOrderChanged (ValueTree&, int, int) override; void valueTreeChildOrderChanged (ValueTree&, int, int) override;
void valueTreeChildAddedOrRemoved (ValueTree&, ValueTree&);
//============================================================================== //==============================================================================
template <typename This> template <typename This>
static auto& getEnabledModulesImpl (This&); static auto& getEnabledModulesImpl (This&);
@@ -646,6 +652,7 @@ private:
void updateJUCEPathWarning(); void updateJUCEPathWarning();
void updateModuleWarnings(); void updateModuleWarnings();
void updateExporterWarnings();
void updateCppStandardWarning (bool showWarning); void updateCppStandardWarning (bool showWarning);
void updateMissingModuleDependenciesWarning (bool showWarning); void updateMissingModuleDependenciesWarning (bool showWarning);
void updateOldProjucerWarning (bool showWarning); void updateOldProjucerWarning (bool showWarning);


+ 2
- 2
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h View File

@@ -38,8 +38,8 @@ public:
}; };
//============================================================================== //==============================================================================
static String getDisplayNameWindows() { return "Code::Blocks (Windows)"; }
static String getDisplayNameLinux() { return "Code::Blocks (Linux)"; }
static String getDisplayNameWindows() { return "[Deprecated] Code::Blocks (Windows)"; }
static String getDisplayNameLinux() { return "[Deprecated] Code::Blocks (Linux)"; }
static String getValueTreeTypeNameWindows() { return "CODEBLOCKS_WINDOWS"; } static String getValueTreeTypeNameWindows() { return "CODEBLOCKS_WINDOWS"; }
static String getValueTreeTypeNameLinux() { return "CODEBLOCKS_LINUX"; } static String getValueTreeTypeNameLinux() { return "CODEBLOCKS_LINUX"; }


Loading…
Cancel
Save