Skip to content

Commit 7109992

Browse files
committed
Resolve confusion about Makefile projects in wizards.
The following confusions are resolved: * To create a legacy non-managed project one had to select a "Managed Build" project. * The label "Makefile Project" was used for both lecacy Managed Build and new Core Build Makefile projects. After discussion in #1305 we came to the following renaming of labels in Makefile project wizards: * Legacy projects, based on the Managed Build System (can be managed and non-managed), will be named "Classic C/C++" projects. * Makefile projects based on the new Core Build System will be named "Core Makefile" projects. Fixes #1149
1 parent 559c9a6 commit 7109992

File tree

26 files changed

+173
-111
lines changed

26 files changed

+173
-111
lines changed

FAQ/README.md

Lines changed: 70 additions & 70 deletions
Large diffs are not rendered by default.

build/org.eclipse.cdt.make.ui/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@
626626
<template
627627
icon="icons/cdt_logo_48.png"
628628
id="org.eclipse.cdt.make.ui.template"
629-
label="Makefile Project"
629+
label="Core Makefile Project"
630630
wizard="org.eclipse.cdt.make.internal.ui.wizards.NewMakefileProjectWizard">
631631
<description>
632632
Create a Makefile project using CDT&apos;s new Core Build System. Over existing content or a new project with optional Hello World example.

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/NewMakefileProjectWizard.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017 QNX Software Systems and others.
2+
* Copyright (c) 2017, 2025 QNX Software Systems and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -32,7 +32,7 @@ public class NewMakefileProjectWizard extends TemplateWizard {
3232
@Override
3333
public void setContainer(IWizardContainer wizardContainer) {
3434
super.setContainer(wizardContainer);
35-
setWindowTitle("New Makefile Project");
35+
setWindowTitle("New Core Makefile Project");
3636
}
3737

3838
@Override
@@ -61,7 +61,7 @@ public void widgetSelected(SelectionEvent e) {
6161
Dialog.applyDialogFont(getControl());
6262
}
6363
};
64-
mainPage.setTitle("New Makefile Project");
64+
mainPage.setTitle("New Core Makefile Project");
6565
mainPage.setDescription("Specify properties of new Makefile project.");
6666
this.addPage(mainPage);
6767
}

build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/MakefileHelloWorldCCProject/template.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2007 Symbian Software Private Ltd. and others.
2+
# Copyright (c) 2007, 2025 Symbian Software Private Ltd. and others.
33
#
44
# This program and the accompanying materials
55
# are made available under the terms of the Eclipse Public License 2.0
@@ -13,8 +13,8 @@
1313
###############################################################################
1414

1515
#Template Default Values
16-
MakefileHelloWorld.CCtemplate.label=Hello World C++ Makefile Project
17-
MakefileHelloWorld.CCtemplate.description=A Hello World C++ Makefile Project
16+
MakefileHelloWorld.CCtemplate.label=Hello World C++ Project
17+
MakefileHelloWorld.CCtemplate.description=A Hello World Classic C++ Project
1818
MakefileHelloWorld.basics.label=Basic Settings
1919
MakefileHelloWorld.basics.description=Basic properties of a project
2020
MakefileHelloWorld.author.label=Author

build/org.eclipse.cdt.managedbuilder.ui/plugin.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2003, 2011 IBM Corporation and others.
2+
# Copyright (c) 2003, 2025 IBM Corporation and others.
33
#
44
# This program and the accompanying materials
55
# are made available under the terms of the Eclipse Public License 2.0
@@ -77,7 +77,7 @@ MBS.create.configuration=Create New Configuration
7777
WizardConvertMakeProject.name=Convert to a C/C++ Project (Adds C/C++ Nature)
7878
WizardConvertMakeProject.description=Convert to a C/C++ Project
7979

80-
WizardMakeProjFromExisting.name=Existing Code as Makefile Project
80+
WizardMakeProjFromExisting.name=Existing code as Classic Makefile Project
8181
WizardMakeProjFromExisting.description=Create a new Makefile project in a directory containing existing code
8282

8383
Tool.settings=Tool Settings

build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
public class Messages extends NLS {
2020
public static String AbstractCWizard_0;
21+
public static String AbstractCWizard_1;
2122
public static String AbstractPrefPage_0;
2223
public static String ArtifactTab_0;
2324
public static String ArtifactTab_1;

build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2000, 2011 IBM Corporation, QNX Software Systems, and others.
2+
# Copyright (c) 2000, 2025 IBM Corporation, QNX Software Systems, and others.
33
#
44
# This program and the accompanying materials
55
# are made available under the terms of the Eclipse Public License 2.0
@@ -139,6 +139,7 @@ StdBuildWizard_0=Makefile project
139139
MBSWizardHandler_0=At least one toolchain should be selected
140140
CMainWizardPage_1=Show project types and toolchains only if they are supported on the platform
141141
AbstractCWizard_0=Empty Project
142+
AbstractCWizard_1=Existing code or empty Project
142143

143144
NewMakeProjFromExisting_wizard_title=New Project
144145
NewMakeProjFromExistingPage_show_only_supported=Show only available toolchains that support this platform

build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class StdBuildWizard extends AbstractCWizard {
3030
/**
3131
* @since 5.1
3232
*/
33-
public static final String EMPTY_PROJECT = Messages.AbstractCWizard_0;
33+
public static final String EMPTY_PROJECT = Messages.AbstractCWizard_1;
3434

3535
@Override
3636
public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) {

core/org.eclipse.cdt.ui/plugin.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2003, 2024 IBM Corporation, QNX Software Systems, and others.
2+
# Copyright (c) 2003, 2025 IBM Corporation, QNX Software Systems, and others.
33
#
44
# This program and the accompanying materials
55
# are made available under the terms of the Eclipse Public License 2.0

core/org.eclipse.cdt.ui/plugin.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5162,26 +5162,32 @@
51625162
<template
51635163
icon="icons/cdt_logo_48.png"
51645164
id="org.eclipse.cdt.ui.managed.c"
5165-
label="C Managed Build"
5165+
label="Classic C Project"
51665166
wizard="org.eclipse.cdt.internal.ui.wizards.CProjectWizard2">
51675167
<description>
51685168
A C Project build using the CDT&apos;s managed build system.
51695169
</description>
51705170
<tagReference
51715171
id="org.eclipse.cdt.ui.cdtTag">
51725172
</tagReference>
5173+
<tagReference
5174+
id="org.eclipse.cdt.make.ui.tag">
5175+
</tagReference>
51735176
</template>
51745177
<template
51755178
icon="icons/cdt_logo_48.png"
51765179
id="org.eclipse.cdt.ui.managed.cpp"
5177-
label="C++ Managed Build"
5180+
label="Classic C++ Project"
51785181
wizard="org.eclipse.cdt.internal.ui.wizards.CCProjectWizard2">
51795182
<description>
51805183
A C++ Project build using the CDT&apos;s managed build system.
51815184
</description>
51825185
<tagReference
51835186
id="org.eclipse.cdt.ui.cdtTag">
51845187
</tagReference>
5188+
<tagReference
5189+
id="org.eclipse.cdt.make.ui.tag">
5190+
</tagReference>
51855191
</template>
51865192
</extension>
51875193
<extension

0 commit comments

Comments
 (0)