Skip to content

Commit e56fe61

Browse files
author
jantje
committed
enable paths and setting in project properties #1126
Though not everything is used (and probably I will not use it) and most of it doesn't work; I'm checking it in to avoid lost work.
1 parent 7cfcaca commit e56fe61

File tree

14 files changed

+283
-101
lines changed

14 files changed

+283
-101
lines changed

io.sloeber.autoBuild.ui/OSGI-INF/l10n/bundle.properties

+102-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,111 @@ WBB.settings=Behavior
66
Refresh.policy=Refresh Policy
77
EnvironmentTab.name = (Single) Environment
88
CPropertyVarsTab.name = (Single) CDT Vars (macros)
9-
CDTBuildProperty.name=Settings
9+
toolchain.settings=Toolchain Settings
1010
ProjectSettingsTab.name=Project Settings
1111
CDTProjectProperty.name=Project Settings
1212

1313
Tool.settings=Tool Settings
1414
Build.steps=Build Steps
1515
Binary.parsers=Binary Parsers
16-
Error.parsers=Error Parsers
16+
Error.parsers=Error Parsers
17+
18+
19+
category.build.name=C/C++ Build
20+
category.build.description= C/C++ Build Actions
21+
22+
# The property pages
23+
MngBuildProp.name=C/C++ Build
24+
MngOtherProp.name= Error/Binary Parsers
25+
26+
# The preference pages
27+
MakeBuildPref.name=Makefile Project
28+
MngBuildPref.name=Managed Build
29+
NewCDTWizardPref.name=New C/C++ Project Wizard
30+
varsPrefName=Build Variables
31+
envPrefName=Environment
32+
propSettingsPrefName=Property Pages Settings
33+
34+
# The Resource Property page
35+
MngResourceProp.name=C/C++ Build
36+
37+
# Build/clean commands and the corresponding menu items.
38+
command.buildFiles.label=Build Selected &File(s)
39+
command.buildFiles.name=Build Selected File(s)
40+
command.buildFiles.description=Rebuilds the selected source files
41+
command.cleanFiles.label=C&lean Selected File(s)
42+
command.cleanFiles.name=Clean Selected File(s)
43+
command.cleanFiles.description=Deletes build output files for the selected source files
44+
command.buildAllConfigurations.label=Build All
45+
command.buildAllConfigurations.name=Build All Configurations
46+
command.cleanAllConfigurations.label=Clean All
47+
command.cleanAllConfigurations.name=Clean All Configurations
48+
command.rebuildConfigurations.label=Build Selected...
49+
command.rebuildConfigurations.name=Build Selected Configurations
50+
51+
# The Project Converter page
52+
command.convertTarget.label=Convert To...
53+
command.convertTarget.name=Convert To
54+
55+
# New CDT project model - property pages names
56+
page.c.build=C/C++ Build
57+
PathSymbolsProperty.name=Paths and Symbols
58+
CDTExpPathSymbolsProperty.name=Export Settings
59+
CDTBuildProperty.name=Settings
60+
CDTToolchainProperty.name=Tool Chain Editor
61+
CDTToolchainProperty.keyword.toolchain1=toolchain
62+
CDTToolchainProperty.keyword.toolchain2=tool chain
63+
CDTVariablesProperty.name=Build Variables
64+
Discovery.options=Discovery Options
65+
Environment=Environment
66+
67+
Build.System.Wizard=Build System Wizard
68+
Make.Project.Wizard=Make Project Wizard
69+
70+
MBS.create.configuration=Create New Configuration
71+
72+
WizardConvertMakeProject.name=Convert to a C/C++ Project (Adds C/C++ Nature)
73+
WizardConvertMakeProject.description=Convert to a C/C++ Project
74+
75+
WizardMakeProjFromExisting.name=Existing Code as Makefile Project
76+
WizardMakeProjFromExisting.description=Create a new Makefile project in a directory containing existing code
77+
78+
NewMakeFromExisting.name=Makefile Project with Existing Code
79+
80+
Tool.settings=Tool Settings
81+
Build.steps=Build Steps
82+
Build.artifact=Build Artifact
83+
Builder.settings=Builder Settings
84+
WBB.settings=Behavior
85+
Refresh.policy=Refresh Policy
86+
Includes=Includes
87+
Includes.tooltip=Includes list
88+
IncludeFiles=Include Files
89+
IncludeFiles.tooltip=Include Files list
90+
Symbols=Symbols
91+
Symbols.tooltip=Macros list
92+
Libraries=Libraries
93+
Libraries.tooltip=Libraries list
94+
Library.paths=Library Paths
95+
References=References
96+
Source.location=Source Location
97+
Output.location=Output Location
98+
Binary.parsers=Binary Parsers
99+
Error.parsers=Error Parsers
100+
Data.hierarchy=Data Hierarchy
101+
Preferred.toolchains=Preferred Toolchains
102+
Wizard.defaults=Wizard Defaults
103+
PropertyPage.defaults=Property Page Settings
104+
MBSPerProjectProfile.name=Managed Build System - per project scanner info profile
105+
multicfg=Multiple Configurations Edit
106+
107+
DiscoveryTab.name = (Single) Discovery Options
108+
CPropertyVarsTab.name = (Single) CDT Vars (macros)
109+
ToolChainEditTab.name = (Single) Tool chain edit
110+
EnvironmentTab.name = (Single) Environment
111+
112+
# menu labels
113+
Configurations.menu=Build Configurations
114+
115+
buildDefinitionsUI.ep.name = Build Definitions UI
116+
extension-point.name = Custom MBS New Wizard Pages
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pluginName=Arduino Eclipse Plugin named Sloeber
1+
pluginName=AutoBuild Plugin user interface
22
providerName=Jan Baeyens

io.sloeber.autoBuild.ui/plugin.xml

+84-34
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<extension
2626
point="org.eclipse.ui.propertyPages">
2727
<page
28-
class="io.sloeber.autoBuild.integrations.Page_head_build"
28+
class="io.sloeber.autoBuild.ui.pages.Page_head_build"
2929
id="io.sloeber.autoBuild.projectProperties.main"
3030
name="%page.c.build"
3131
>
@@ -37,7 +37,7 @@
3737
</enabledWhen>
3838
</page>
3939
<page
40-
class="io.sloeber.autoBuild.integrations.Page_Variables"
40+
class="io.sloeber.autoBuild.ui.pages.Page_Variables"
4141
id="io.sloeber.autoBuild.projectProperties.macro"
4242
category="io.sloeber.autoBuild.projectProperties.main"
4343
name="%CDTVariablesProperty.name"
@@ -51,7 +51,7 @@
5151
</page>
5252
<page
5353
category="io.sloeber.autoBuild.projectProperties.main"
54-
class="io.sloeber.autoBuild.integrations.Page_Environment"
54+
class="io.sloeber.autoBuild.ui.pages.Page_Environment"
5555
id="io.sloeber.autoBuild.projectProperties.EnvironmentVars"
5656
name="%Environment">
5757
<enabledWhen>
@@ -66,9 +66,9 @@
6666
</page>
6767
<page
6868
category="io.sloeber.autoBuild.projectProperties.main"
69-
class="io.sloeber.autoBuild.integrations.Page_BuildSettings"
69+
class="io.sloeber.autoBuild.ui.pages.Page_BuildSettings"
7070
id="io.sloeber.autoBuild.projectProperties.Page_BuildSettings"
71-
name="%CDTBuildProperty.name">
71+
name="%toolchain.settings">
7272
<enabledWhen>
7373
<adapt
7474
type="org.eclipse.core.resources.IResource">
@@ -81,7 +81,7 @@
8181
</page>
8282
<page
8383
category="io.sloeber.autoBuild.projectProperties.main"
84-
class="io.sloeber.autoBuild.integrations.Page_ProjectSettings"
84+
class="io.sloeber.autoBuild.ui.pages.Page_ProjectSettings"
8585
id="io.sloeber.autoBuild.projectProperties.Page_ProjectSettings"
8686
name="%CDTProjectProperty.name">
8787
<enabledWhen>
@@ -94,27 +94,24 @@
9494
</adapt>
9595
</enabledWhen>
9696
</page>
97-
<!--
98-
<page
99-
class="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
100-
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
101-
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build_2"
102-
name="%CDTBuildProperty.name"
97+
98+
<page
99+
category="org.eclipse.cdt.ui.newui.Page_head_general"
100+
class="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"
101+
id="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"
102+
name="%PathSymbolsProperty.name"
103103
>
104-
<enabledWhen>
105-
<adapt type="org.eclipse.core.resources.IResource">
106-
<test property="org.eclipse.core.resources.projectNature"
107-
value="io.sloeber.autoBuildNature"/>
108-
</adapt>
109-
</enabledWhen>
110-
<keywordReference
111-
id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain1">
112-
</keywordReference>
113-
<keywordReference
114-
id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain2">
115-
</keywordReference>
104+
<enabledWhen>
105+
<adapt
106+
type="org.eclipse.core.resources.IProject">
107+
<test
108+
property="org.eclipse.core.resources.projectNature"
109+
value="io.sloeber.autoBuildNature">
110+
</test>
111+
</adapt>
112+
</enabledWhen>
116113
</page>
117-
-->
114+
118115
</extension>
119116
<extension
120117
point="org.eclipse.cdt.ui.cPropertyTab">
@@ -123,68 +120,121 @@
123120
helpId="cdt_u_prop_build"
124121
icon="icons/obj16/build_settings.gif"
125122
name="%Builder.settings"
126-
parent="io.sloeber.autoBuild.integrations.Page_head_build"
123+
parent="io.sloeber.autoBuild.ui.pages.Page_head_build"
127124
weight="040">
128125
</tab>
129126
<tab
130127
class="io.sloeber.autoBuild.ui.tabs.BuildBehaviourTab"
131128
helpId="cdt_u_prop_build"
132129
icon="icons/obj16/target_obj.gif"
133130
name="%WBB.settings"
134-
parent="io.sloeber.autoBuild.integrations.Page_head_build"
131+
parent="io.sloeber.autoBuild.ui.pages.Page_head_build"
135132
weight="050">
136133
</tab>
137134
<tab
138135
class="io.sloeber.autoBuild.ui.tabs.CPropertyVarsTab"
139136
helpId="cdt_u_prop_build_variables"
140137
name="%CPropertyVarsTab.name"
141-
parent="io.sloeber.autoBuild.integrations.Page_Variables">
138+
parent="io.sloeber.autoBuild.ui.pages.Page_Variables">
142139
</tab>
143140
<tab
144141
class="org.eclipse.cdt.ui.newui.EnvironmentTab"
145142
helpId="cdt_u_prop_build_environment"
146143
icon="icons/obj16/environment.gif"
147144
name="%EnvironmentTab.name"
148-
parent="io.sloeber.autoBuild.integrations.Page_Environment">
145+
parent="io.sloeber.autoBuild.ui.pages.Page_Environment">
149146
</tab>
150147
<tab
151148
class="io.sloeber.autoBuild.ui.tabs.ToolSettingsTab"
152149
helpId="cdt_u_prop_build_setting_tool"
153150
icon="icons/elcl16/config-tool.gif"
154151
name="%Tool.settings"
155-
parent="io.sloeber.autoBuild.integrations.Page_BuildSettings"
152+
parent="io.sloeber.autoBuild.ui.pages.Page_BuildSettings"
156153
weight="010">
157154
</tab>
158155
<tab
159156
class="io.sloeber.autoBuild.ui.tabs.BuildStepsTab"
160157
helpId="cdt_u_prop_build_setting_steps"
161158
icon="icons/obj16/steps.gif"
162159
name="%Build.steps"
163-
parent="io.sloeber.autoBuild.integrations.Page_BuildSettings"
160+
parent="io.sloeber.autoBuild.ui.pages.Page_BuildSettings"
164161
weight="020">
165162
</tab>
166163
<tab
167164
class="org.eclipse.cdt.ui.newui.BinaryParsTab"
168165
helpId="cdt_u_prop_build_setting_binparser"
169166
icon="icons/obj16/bin_obj.gif"
170167
name="%Binary.parsers"
171-
parent="io.sloeber.autoBuild.integrations.Page_BuildSettings"
168+
parent="io.sloeber.autoBuild.ui.pages.Page_BuildSettings"
172169
weight="060">
173170
</tab>
174171
<tab
175172
class="org.eclipse.cdt.ui.newui.ErrorParsTab"
176173
helpId="cdt_u_prop_build_setting_errparser"
177174
icon="icons/obj16/error_obj.gif"
178175
name="%Error.parsers"
179-
parent="io.sloeber.autoBuild.integrations.Page_BuildSettings"
176+
parent="io.sloeber.autoBuild.ui.pages.Page_BuildSettings"
180177
weight="070">
181178
</tab>
182179
<tab
183180
class="io.sloeber.autoBuild.ui.tabs.ProjectSettingsTab"
184181
icon="icons/obj16/environment.gif"
185182
name="%ProjectSettingsTab.name"
186-
parent="io.sloeber.autoBuild.integrations.Page_ProjectSettings">
183+
parent="io.sloeber.autoBuild.ui.pages.Page_ProjectSettings">
187184
</tab>
185+
<tab
186+
class="org.eclipse.cdt.ui.newui.IncludeTab"
187+
icon="icons/obj16/hfolder_obj.gif"
188+
name="%Includes"
189+
weight="010"
190+
helpId="cdt_u_prop_pns_inc"
191+
parent="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"
192+
tooltip="%Includes.tooltip"/>
193+
<tab
194+
class="org.eclipse.cdt.ui.newui.IncludeFileTab"
195+
icon="icons/obj16/h_file_obj.gif"
196+
name="%IncludeFiles"
197+
weight="015"
198+
helpId="cdt_u_prop_pns_inc"
199+
parent="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"
200+
tooltip="%IncludeFiles.tooltip"/>
201+
<tab
202+
class="org.eclipse.cdt.ui.newui.SymbolTab"
203+
icon="icons/obj16/define_obj.gif"
204+
name="%Symbols"
205+
weight="020"
206+
helpId="cdt_u_prop_pns_sym"
207+
parent="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"
208+
tooltip="%Symbols.tooltip"/>
209+
<tab
210+
class="org.eclipse.cdt.ui.newui.LibraryTab"
211+
icon="icons/obj16/lib_obj.gif"
212+
name="%Libraries"
213+
weight="030"
214+
helpId="cdt_u_prop_pns_lib"
215+
parent="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"
216+
tooltip="%Libraries.tooltip"/>
217+
<tab
218+
class="org.eclipse.cdt.ui.newui.LibraryPathTab"
219+
icon="icons/obj16/fldr_lib_obj.gif"
220+
name="%Library.paths"
221+
weight="040"
222+
helpId="cdt_u_prop_pns_libpath"
223+
parent="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"/>
224+
<tab
225+
class="org.eclipse.cdt.ui.newui.RefsTab"
226+
icon="icons/obj16/search_ref_obj.gif"
227+
name="%References"
228+
weight="100"
229+
helpId="cdt_u_prop_pns_ref"
230+
parent="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"/>
231+
<tab
232+
class="org.eclipse.cdt.ui.newui.CLocationSourceTab"
233+
icon="icons/obj16/sroot_obj.gif"
234+
name="%Source.location"
235+
weight="080"
236+
helpId="cdt_u_prop_pns_src"
237+
parent="io.sloeber.autoBuild.ui.pages.Page_PathAndSymb"/>
188238
</extension>
189239

190240
</plugin>

io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/pages/Page_BuildSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.sloeber.autoBuild.integrations;
1+
package io.sloeber.autoBuild.ui.pages;
22

33
import org.eclipse.cdt.ui.newui.AbstractPage;
44

io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/pages/Page_Environment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Contributors:
1212
* Intel Corporation - initial API and implementation
1313
*******************************************************************************/
14-
package io.sloeber.autoBuild.integrations;
14+
package io.sloeber.autoBuild.ui.pages;
1515

1616
import org.eclipse.cdt.ui.newui.AbstractPage;
1717

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2007, 2010 Intel Corporation and others.
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
6+
* which accompanies this distribution, and is available at
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
10+
*
11+
* Contributors:
12+
* Intel Corporation - initial API and implementation
13+
*******************************************************************************/
14+
package io.sloeber.autoBuild.ui.pages;
15+
16+
import org.eclipse.cdt.ui.newui.AbstractPage;
17+
18+
/**
19+
* The class have the same functionality as superclass.
20+
* The only need to create it is distinguishing tabs.
21+
*
22+
*/
23+
/**
24+
* @noextend This class is not intended to be subclassed by clients.
25+
* @noinstantiate This class is not intended to be instantiated by clients.
26+
*/
27+
public class Page_PathAndSymb extends AbstractPage {
28+
29+
@Override
30+
protected boolean isSingle() {
31+
return false;
32+
}
33+
34+
}

io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/pages/Page_ProjectSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.sloeber.autoBuild.integrations;
1+
package io.sloeber.autoBuild.ui.pages;
22

33
import org.eclipse.cdt.ui.newui.AbstractPage;
44

0 commit comments

Comments
 (0)