mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Remove Code::Blocks exporter

Browse source
This commit is contained in:
reuk 2024-06-26 12:10:07 +01:00
parent 3c4aa8d0ce
commit ffc5061937
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
25 changed files with 140 additions and 1228 deletions
Download patch file Download diff file Expand all files Collapse all files

17
extras/Projucer/Source/BinaryData/Icons/export_codeBlocks.svg
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 43.1 (39012) - http://www.bohemiancoding.com/sketch -->
<title>Group</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Artboard" transform="translate(-33.000000, -4.000000)">
<g id="Group" transform="translate(33.000000, 4.000000)">
<polygon id="Rectangle-5-Copy-4" fill="#FD3535" points="7.36842105 -1.87919855e-13 9.47368421 4.21052632 9.47368421 9.47368421 4.21052632 9.47368421 6.83692868e-14 7.36842105 3.55271368e-15 -1.67409946e-14"></polygon>
<polygon id="Rectangle-5-Copy-5" fill="#6AC300" transform="translate(15.263158, 4.736842) scale(-1, 1) translate(-15.263158, -4.736842) " points="17.8947368 -1.87919855e-13 20 4.21052632 20 9.47368421 14.7368421 9.47368421 10.5263158 7.36842105 10.5263158 -1.67409946e-14"></polygon>
<polygon id="Rectangle-5-Copy-7" fill="#EBBF20" transform="translate(4.736842, 15.263158) scale(1, -1) translate(-4.736842, -15.263158) " points="7.36842105 10.5263158 9.47368421 14.7368421 9.47368421 20 4.21052632 20 6.83692868e-14 17.8947368 3.55271368e-15 10.5263158"></polygon>
<polygon id="Rectangle-5-Copy-6" fill="#1F6CE9" transform="translate(15.263158, 15.263158) scale(-1, -1) translate(-15.263158, -15.263158) " points="17.8947368 10.5263158 20 14.7368421 20 20 14.7368421 20 10.5263158 17.8947368 10.5263158 10.5263158"></polygon>
</g>
</g>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

8
extras/Projucer/Source/Project/Modules/jucer_Modules.cpp
View file

@ -75,9 +75,6 @@ void LibraryModule::addSearchPathsToExporter (ProjectExporter& exporter) const
if (exporter.isLinux())
return "Linux";
if (exporter.isCodeBlocks() && exporter.isWindows())
return "MinGW";
return exporter.getTypeInfoForExporter (exporter.getExporterIdentifier()).targetFolder;
}();
@ -163,10 +160,7 @@ void LibraryModule::addLibsToExporter (ProjectExporter& exporter) const
}
else if (exporter.isWindows())
{
if (exporter.isCodeBlocks())
parseAndAddLibsToList (exporter.mingwLibs, moduleInfo["mingwLibs"].toString());
else
parseAndAddLibsToList (exporter.windowsLibs, moduleInfo["windowsLibs"].toString());
parseAndAddLibsToList (exporter.windowsLibs, moduleInfo["windowsLibs"].toString());
}
else if (exporter.isAndroid())
{

1
extras/Projucer/Source/Project/UI/Sidebar/jucer_ExporterTreeItems.h
View file

@ -67,7 +67,6 @@ public:
if (e->isXcode()) return Icon (getIcons().xcode, Colours::transparentBlack);
else if (e->isVisualStudio()) return Icon (getIcons().visualStudio, Colours::transparentBlack);
else if (e->isAndroid()) return Icon (getIcons().android, Colours::transparentBlack);
else if (e->isCodeBlocks()) return Icon (getIcons().codeBlocks, Colours::transparentBlack);
else if (e->isMakefile()) return Icon (getIcons().linux, Colours::transparentBlack);
}

1
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
View file

@ -42,7 +42,6 @@ public:
//==============================================================================
bool isXcode() const override { return false; }
bool isVisualStudio() const override { return false; }
bool isCodeBlocks() const override { return false; }
bool isMakefile() const override { return false; }
bool isAndroidStudio() const override { return true; }

1001
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h
View file

File diff suppressed because it is too large Load diff

1
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h
View file

@ -1543,7 +1543,6 @@ public:
bool isXcode() const override { return false; }
bool isVisualStudio() const override { return true; }
bool isCodeBlocks() const override { return false; }
bool isMakefile() const override { return false; }
bool isAndroidStudio() const override { return false; }

1
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
View file

@ -491,7 +491,6 @@ public:
bool isXcode() const override { return false; }
bool isVisualStudio() const override { return false; }
bool isCodeBlocks() const override { return false; }
bool isMakefile() const override { return true; }
bool isAndroidStudio() const override { return false; }

1
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
View file

@ -404,7 +404,6 @@ public:
bool isXcode() const override { return true; }
bool isVisualStudio() const override { return false; }
bool isCodeBlocks() const override { return false; }
bool isMakefile() const override { return false; }
bool isAndroidStudio() const override { return false; }

16
extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
View file

@ -40,7 +40,6 @@
#include "jucer_ProjectExport_MSVC.h"
#include "jucer_ProjectExport_Xcode.h"
#include "jucer_ProjectExport_Android.h"
#include "jucer_ProjectExport_CodeBlocks.h"
#include "../Utility/UI/PropertyComponents/jucer_FilePathPropertyComponent.h"
@ -87,15 +86,6 @@ std::vector<ProjectExporter::ExporterTypeInfo> ProjectExporter::getExporterTypeI
createExporterTypeInfo<MakefileProjectExporter> (export_linux_svg, export_linux_svgSize),
createExporterTypeInfo<AndroidProjectExporter> (export_android_svg, export_android_svgSize),
{ CodeBlocksProjectExporter::getValueTreeTypeNameWindows(),
CodeBlocksProjectExporter::getDisplayNameWindows(),
CodeBlocksProjectExporter::getTargetFolderNameWindows(),
createIcon (export_codeBlocks_svg, export_codeBlocks_svgSize) },
{ CodeBlocksProjectExporter::getValueTreeTypeNameLinux(),
CodeBlocksProjectExporter::getDisplayNameLinux(),
CodeBlocksProjectExporter::getTargetFolderNameLinux(),
createIcon (export_codeBlocks_svg, export_codeBlocks_svgSize) }
};
return infos;
@ -164,8 +154,7 @@ std::unique_ptr<ProjectExporter> ProjectExporter::createExporterFromSettings (Pr
Tag<MSVCProjectExporterVC2019>{},
Tag<MSVCProjectExporterVC2017>{},
Tag<MakefileProjectExporter>{},
Tag<AndroidProjectExporter>{},
Tag<CodeBlocksProjectExporter>{});
Tag<AndroidProjectExporter>{});
}
bool ProjectExporter::canProjectBeLaunched (Project* project)
@ -762,8 +751,7 @@ static bool areCompatibleExporters (const ProjectExporter& p1, const ProjectExpo
return (p1.isVisualStudio() && p2.isVisualStudio())
|| (p1.isXcode() && p2.isXcode())
|| (p1.isMakefile() && p2.isMakefile())
|| (p1.isAndroidStudio() && p2.isAndroidStudio())
|| (p1.isCodeBlocks() && p2.isCodeBlocks() && p1.isWindows() != p2.isLinux());
|| (p1.isAndroidStudio() && p2.isAndroidStudio());
}
void ProjectExporter::createDefaultModulePaths()

1
extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h
View file

@ -115,7 +115,6 @@ public:
// IDE targeted by exporter
virtual bool isXcode() const = 0;
virtual bool isVisualStudio() const = 0;
virtual bool isCodeBlocks() const = 0;
virtual bool isMakefile() const = 0;
virtual bool isAndroidStudio() const = 0;

3
extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h
View file

@ -149,9 +149,6 @@ namespace Ids
DECLARE_ID (msvcManifestFile);
DECLARE_ID (warningsAreErrors);
DECLARE_ID (linuxArchitecture);
DECLARE_ID (linuxCodeBlocksArchitecture);
DECLARE_ID (windowsCodeBlocksArchitecture);
DECLARE_ID (codeBlocksWindowsTarget);
DECLARE_ID (toolset);
DECLARE_ID (windowsTargetPlatformVersion);
DECLARE_ID (debugInformationFormat);

6
extras/Projucer/Source/Utility/UI/jucer_Icons.cpp
View file

@ -204,11 +204,6 @@ const uint8 android[] = { 110,109,31,179,128,65,235,31,97,65,98,31,179,128,65,21
64,15,129,3,64,158,66,224,64,202,79,22,64,108,100,34,188,64,224,219,52,63,98,43,16,186,64,28,206,28,63,32,52,182,64,219,111,21,63,164,129,179,64,174,72,36,63,98,40,207,176,64,31,44,51,63,9,76,176,64,156,194,82,63,127,92,178,64,115,215,106,63,108,123,
35,213,64,219,223,31,64,98,38,216,157,64,148,108,83,64,182,34,110,64,196,176,154,64,1,65,100,64,77,218,211,64,108,223,79,117,65,77,218,211,64,98,167,217,114,65,196,176,154,64,10,118,95,65,118,109,83,64,207,208,67,65,189,224,31,64,101,0,0 };
const uint8 codeBlocks[] = { 110,109,0,0,0,0,0,0,0,0,108,0,0,0,0,0,208,235,64,108,0,192,134,64,0,152,23,65,108,0,152,23,65,0,152,23,65,108,0,152,23,65,0,192,134,64,108,0,208,235,64,0,0,0,0,108,0,0,0,0,0,0,0,0,99,109,0,24,74,65,0,0,0,0,108,0,104,40,65,0,192,134,64,108,0,104,40,65,
0,152,23,65,108,255,159,124,65,0,152,23,65,108,0,0,160,65,0,208,235,64,108,0,0,160,65,0,0,0,0,108,0,24,74,65,0,0,0,0,99,109,0,192,134,64,0,104,40,65,108,0,0,0,0,0,24,74,65,108,0,0,0,0,0,0,160,65,108,0,208,235,64,0,0,160,65,108,0,152,23,65,255,159,124,
65,108,0,152,23,65,0,104,40,65,108,0,192,134,64,0,104,40,65,99,109,0,104,40,65,0,104,40,65,108,0,104,40,65,255,159,124,65,108,0,24,74,65,0,0,160,65,108,0,0,160,65,0,0,160,65,108,0,0,160,65,0,24,74,65,108,255,159,124,65,0,104,40,65,108,0,104,40,65,0,104,
40,65,99,101,0,0 };
const uint8 linux[] = { 110,109,0,0,124,66,174,71,130,66,108,0,0,124,66,174,71,130,66,108,162,178,123,66,87,5,130,66,108,186,94,123,66,5,197,129,66,108,128,4,123,66,225,134,129,66,108,45,164,122,66,17,75,129,66,108,254,61,122,66,189,17,129,66,108,52,210,121,66,9,219,128,66,
108,22,97,121,66,24,167,128,66,108,234,234,120,66,11,118,128,66,108,143,194,120,66,102,102,128,66,108,143,194,120,66,102,102,128,66,108,143,194,120,66,102,102,128,66,108,167,246,119,66,12,20,128,66,108,198,34,119,66,200,141,127,66,108,114,71,118,66,65,
254,126,66,108,245,40,118,66,132,235,126,66,108,245,40,118,66,132,235,126,66,108,112,61,117,66,234,81,126,66,108,111,61,117,66,234,81,126,66,108,17,6,115,66,5,193,124,66,108,114,227,112,66,69,20,123,66,108,162,112,111,66,9,215,121,66,108,163,112,111,
@ -660,7 +655,6 @@ Icons::Icons()
JUCE_LOAD_PATH_DATA (singleModule)
JUCE_LOAD_PATH_DATA (plus);
JUCE_LOAD_PATH_DATA (android);
JUCE_LOAD_PATH_DATA (codeBlocks);
JUCE_LOAD_PATH_DATA (linux);
JUCE_LOAD_PATH_DATA (xcode);
JUCE_LOAD_PATH_DATA (visualStudio);

3
extras/Projucer/Source/Utility/UI/jucer_Icons.h
View file

@ -85,8 +85,7 @@ public:
Icons();
Path imageDoc, config, graph, info, warning, user, closedFolder, exporter, fileExplorer, file,
modules, openFolder, settings, singleModule, plus, android, codeBlocks,
linux, xcode, visualStudio;
modules, openFolder, settings, singleModule, plus, android, linux, xcode, visualStudio;
private:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Icons)