Skip to content

Commit 4cfbe34

Browse files
alicetrifualicetrifu
committed
Created JSON Compilation Database Generator preference page and set file
1 parent eacd9eb commit 4cfbe34

34 files changed

+990
-82
lines changed

‎build/org.eclipse.cdt.managedbuilder.ui/.settings/org.eclipse.pde.ds.annotations.prefs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dsVersion=V1_3
2+
eclipse.preferences.version=1
3+
enabled=true
4+
generateBundleActivationPolicyLazy=true
5+
path=OSGI-INF
6+
validationErrorLevel=error
7+
validationErrorLevel.missingImplicitUnbindMethod=error

‎build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF

+7
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,10 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
2727
Bundle-ActivationPolicy: lazy
2828
Bundle-RequiredExecutionEnvironment: JavaSE-17
2929
Automatic-Module-Name: org.eclipse.cdt.managedbuilder.ui
30+
Service-Component: OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.BuiltinEditorOptionsDefault.xml,
31+
OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.DefaultConfigurationVisibility.xml,
32+
OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.EditorConfigurationAccess.xml,
33+
OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.EditorMetadataDefaults.xml,
34+
OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.BuiltinPreferedOptionsDefaults.xml,
35+
OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceConfigurationAccess.xml,
36+
OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceMetadataDefaults.xml

‎build/org.eclipse.cdt.managedbuilder.ui/OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.BuiltinPreferedOptionsDefaults.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.BuiltinPreferedOptionsDefaults">
3+
<service>
4+
<provide interface="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceOptionsDefaults"/>
5+
</service>
6+
<implementation class="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.BuiltinPreferedOptionsDefaults"/>
7+
</scr:component>

‎build/org.eclipse.cdt.managedbuilder.ui/OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceConfigurationAccess.xml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceConfigurationAccess">
3+
<service>
4+
<provide interface="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.Configuration"/>
5+
</service>
6+
<reference cardinality="0..1" field="enable" interface="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.GenerateCDBEnable" name="enable"/>
7+
<reference cardinality="1..1" field="metadata" interface="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferencesMetadata" name="metadata"/>
8+
<reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
9+
<implementation class="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceConfigurationAccess"/>
10+
</scr:component>

‎build/org.eclipse.cdt.managedbuilder.ui/OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceMetadataDefaults.xml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceMetadataDefaults">
3+
<service>
4+
<provide interface="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferencesMetadata"/>
5+
</service>
6+
<reference cardinality="1..1" field="defaults" interface="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceOptionsDefaults" name="defaults"/>
7+
<implementation class="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceMetadataDefaults"/>
8+
</scr:component>

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ bin.includes = plugin.xml,\
1616
about.html,\
1717
icons/,\
1818
.,\
19-
META-INF/
19+
META-INF/,\
20+
OSGI-INF/
2021
src.includes = schema/,\
2122
about.html
2223
source.. = src/

‎build/org.eclipse.cdt.managedbuilder.ui/plugin.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
</page>
343343
<page
344344
category="org.eclipse.cdt.ui.preferences.BuildSettings"
345-
class="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.JsonCdbGeneratorPreferencePage"
345+
class="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.CompilationDatabaseGeneratorBlock"
346346
id="org.eclipse.cdt.managedbuilder.ui.compilationdatabase.JsonCdbPreferencePage"
347347
name="%JSONCompilatioDatabaseGeneratorPage.name">
348348
</page>
@@ -817,7 +817,7 @@
817817
</page>
818818
<page
819819
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
820-
class="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.JsonCdbGeneratorPropertyPage"
820+
class="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.CompilationDatabaseGeneratorBlock"
821821
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_JsonCompilationDatabaseGenerator"
822822
name="%JSONCompilatioDatabaseGeneratorPage.name">
823823
</page>

‎build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/compilationdatabase/BuiltinPreferedOptionsDefaults.java

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
3+
* This program and the accompanying materials are made
4+
* available under the terms of the Eclipse Public License 2.0
5+
* which is available at https://www.eclipse.org/legal/epl-2.0/
6+
*
7+
* SPDX-License-Identifier: EPL-2.0
8+
*
9+
* Contributors:
10+
* See git history
11+
*******************************************************************************/
12+
13+
package org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase;
14+
15+
import org.osgi.service.component.annotations.Component;
16+
17+
@Component
18+
public class BuiltinPreferedOptionsDefaults implements PreferenceOptionsDefaults {
19+
20+
@Override
21+
public boolean generateCDB() {
22+
return false;
23+
}
24+
25+
}

0 commit comments

Comments
 (0)