Bug 564349 - rename packages & projects o.e.cdt.cmake.is to o.e.cdt.jsoncdb
Change-Id: I29e4e0fdc988b6d9cdccfb50f73ad16591645fa4
Signed-off-by: Martin Weber <fifteenknots505@gmail.com>
diff --git a/cmake/org.eclipse.cdt.cmake-feature/feature.xml b/cmake/org.eclipse.cdt.cmake-feature/feature.xml
index cf48e6d..2403c32 100644
--- a/cmake/org.eclipse.cdt.cmake-feature/feature.xml
+++ b/cmake/org.eclipse.cdt.cmake-feature/feature.xml
@@ -45,20 +45,20 @@
unpack="false"/>
<plugin
- id="org.eclipse.cdt.cmake.is.core"
+ id="org.eclipse.cdt.jsoncdb.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.cdt.cmake.is.core.doc"
+ id="org.eclipse.cdt.jsoncdb.core.doc"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
- id="org.eclipse.cdt.cmake.is.core.ui"
+ id="org.eclipse.cdt.jsoncdb.core.ui"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF
index 6f3e05b..a39ba29 100644
--- a/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
org.eclipse.cdt.core;bundle-version="5.12.0",
org.eclipse.tools.templates.freemarker;bundle-version="1.0.0";visibility:=reexport,
com.google.gson,
- org.eclipse.cdt.cmake.is.core,
+ org.eclipse.cdt.jsoncdb.core,
org.yaml.snakeyaml;bundle-version="1.14.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
index c06f8fb..c7bb2f9 100644
--- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
+++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
@@ -31,9 +31,9 @@
import org.eclipse.cdt.cmake.core.properties.ICMakeProperties;
import org.eclipse.cdt.cmake.core.properties.ICMakePropertiesController;
import org.eclipse.cdt.cmake.core.properties.IOsOverrides;
-import org.eclipse.cdt.cmake.is.core.CompileCommandsJsonParser;
-import org.eclipse.cdt.cmake.is.core.IIndexerInfoConsumer;
-import org.eclipse.cdt.cmake.is.core.ParseRequest;
+import org.eclipse.cdt.jsoncdb.core.CompileCommandsJsonParser;
+import org.eclipse.cdt.jsoncdb.core.IIndexerInfoConsumer;
+import org.eclipse.cdt.jsoncdb.core.ParseRequest;
import org.eclipse.cdt.core.CommandLauncherManager;
import org.eclipse.cdt.core.ConsoleOutputStream;
import org.eclipse.cdt.core.ErrorParserManager;
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.project b/cmake/org.eclipse.cdt.cmake.is.arm.tests/.project
deleted file mode 100644
index 459bb6a..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.cmake.is.arm.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.project b/cmake/org.eclipse.cdt.cmake.is.arm/.project
deleted file mode 100644
index 9572c02..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.arm/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.cmake.is.arm</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml
deleted file mode 100644
index 83400aa..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contentExtension>
- <contribution content="doc/compiler.xhtml#lsp"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
- <contribution content="doc/compiler.xhtml#builtins"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
-</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/pom.xml b/cmake/org.eclipse.cdt.cmake.is.core.doc/pom.xml
deleted file mode 100644
index 3d0e94d..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core.doc/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
-
- This program and the accompanying materials
- are made available under the terms of the Eclipse Public License 2.0
- which accompanies this distribution, and is available at
- https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>10.4.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.cmake.is.core.doc</artifactId>
- <!-- always use .qualifier in manifest, we do not plan to publish this plugin
- to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 1468da5..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.core.tests
-Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.cdt.cmake.is.core
-Import-Package: org.junit
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.core.tests
-Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.core.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 0fa6190..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#Properties file for org.eclipse.cdt.cmake.is.core.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.core.tests
-Bundle-Vendor = Eclipse CDT
-Bundle-Copyright = 2020 Martin Weber\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/pom.xml b/cmake/org.eclipse.cdt.cmake.is.core.tests/pom.xml
deleted file mode 100644
index 12c5f84..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
-
- This program and the accompanying materials
- are made available under the terms of the Eclipse Public License 2.0
- which accompanies this distribution, and is available at
- https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>10.4.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.cmake.is.core.tests</artifactId>
- <!-- always use .qualifier in manifest, we do not plan to publish this plugin
- to a maven repo. (The repository version is a different thing) -->
- <version>1.0.100-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/plugin.xml b/cmake/org.eclipse.cdt.cmake.is.core.ui/plugin.xml
deleted file mode 100644
index c6b59d1..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.cdt.cmake.ui.page1"
- class="org.eclipse.cdt.cmake.is.core.ui.internal.IndexerSupportPreferencePage"
- id="org.eclipse.cdt.cmake.is.core.ui.IndexerSupportPreferencePage"
- name="%page.name">
- </page>
- </extension>
-
-</plugin>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/pom.xml b/cmake/org.eclipse.cdt.cmake.is.core.ui/pom.xml
deleted file mode 100644
index 2366d09..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
-
- This program and the accompanying materials
- are made available under the terms of the Eclipse Public License 2.0
- which accompanies this distribution, and is available at
- https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>10.4.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.cmake.is.core.ui</artifactId>
- <!-- always use .qualifier in manifest, we do not plan to publish this plugin
- to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.options b/cmake/org.eclipse.cdt.cmake.is.core/.options
deleted file mode 100644
index 1ba287d..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core/.options
+++ /dev/null
@@ -1,10 +0,0 @@
-# Debugging options for the org.eclipse.cdt.cmake.is.core plugin.
-
-# Trace total time for parsing compile_commands.json files
-org.eclipse.cdt.cmake.is.core/debug/performance=false
-# Trace compile_commands.json Parser tool detection participant lookup
-org.eclipse.cdt.cmake.is.core/debug/participant=false
-# Trace how compiler command-line arguments are detected and parsed
-org.eclipse.cdt.cmake.is.core/debug/arglets=false
-# Trace detected preprocessor symbols and include path entries as passed to the indexer
-org.eclipse.cdt.cmake.is.core/debug/detected.entries=false
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 6a6c0e3..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Description: %bundleDescription
-Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.core;singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.cdt.cmake.is.core.internal.Plugin
-Export-Package: org.eclipse.cdt.cmake.is.core;x-friends:="org.eclipse.cdt.cmake.is.core.ui";
- uses:="org.eclipse.core.runtime,
- org.eclipse.cdt.core.settings.model,
- org.eclipse.cdt.cmake.is.core.builtins",
- org.eclipse.cdt.cmake.is.core.participant;uses:="org.eclipse.core.runtime,org.eclipse.cdt.cmake.is.core.participant.builtins",
- org.eclipse.cdt.cmake.is.core.participant.builtins;uses:="org.eclipse.cdt.cmake.is.core.participant"
-Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.8.0",
- org.eclipse.cdt.ui,
- org.eclipse.core.resources;bundle-version="3.13.700",
- org.eclipse.core.runtime;bundle-version="3.17.100",
- org.eclipse.cdt.core,
- org.eclipse.jface,
- com.google.gson,
- org.apache.commons.io;bundle-version="2.6.0"
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.core
-Import-Package: org.eclipse.e4.core.contexts;version="1.7.0",
- org.osgi.service.component.annotations;version="1.2.0"
-Service-Component: OSGI-INF/org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess.xml
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/OSGI-INF/org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess.xml b/cmake/org.eclipse.cdt.cmake.is.core/OSGI-INF/org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess.xml
deleted file mode 100644
index 2e38abe..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.core/OSGI-INF/org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess">
- <service>
- <provide interface="org.eclipse.cdt.cmake.is.core.IParserPreferencesAccess"/>
- </service>
- <implementation class="org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess"/>
-</scr:component>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 6233711..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.hpenonstop.tests
-Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.cdt.cmake.is.hpenonstop
-Import-Package: org.junit
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.hpenonstop.tests
-Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index f0a6c97..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#Properties file for org.eclipse.cdt.cmake.is.hpenonstop.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.hpenonstop.tests
-Bundle-Vendor = Eclipse CDT
-Bundle-Copyright = 2020 Martin Weber\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.project b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.project
deleted file mode 100644
index 1434de8..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.cmake.is.hpenonstop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/META-INF/MANIFEST.MF
deleted file mode 100644
index 50a2ea2..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.hpenonstop;singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
- org.eclipse.help,
- org.eclipse.cdt.cmake.is.core;bundle-version="1.0.0"
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.hpenonstop
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml
deleted file mode 100644
index 83400aa..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contentExtension>
- <contribution content="doc/compiler.xhtml#lsp"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
- <contribution content="doc/compiler.xhtml#builtins"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
-</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.xml b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.xml
deleted file mode 100644
index 86ee082..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension point="org.eclipse.cdt.cmake.is.core.detectionParticipant">
- <tool class="org.eclipse.cdt.cmake.is.hpenonstop.HpeC89ToolDetectionParticipant"
- displayName="HPE NonStop c89 C & C++"/>
- <tool class="org.eclipse.cdt.cmake.is.hpenonstop.HpeC99ToolDetectionParticipant"
- displayName="HPE NonStop c99 C & C++"/>
- <tool class="org.eclipse.cdt.cmake.is.hpenonstop.HpeC11ToolDetectionParticipant"
- displayName="HPE NonStop c11 C & C++"/>
- </extension>
- <extension
- point="org.eclipse.help.contentExtension">
- <contentExtension
- file="help_content_extension.xml">
- </contentExtension>
- </extension>
-</plugin>
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/pom.xml b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/pom.xml
deleted file mode 100644
index 66907ed..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
-
- This program and the accompanying materials
- are made available under the terms of the Eclipse Public License 2.0
- which accompanies this distribution, and is available at
- https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>10.4.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.cmake.is.hpenonstop</artifactId>
- <!-- always use .qualifier in manifest, we do not plan to publish this plugin
- to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.project b/cmake/org.eclipse.cdt.cmake.is.intel/.project
deleted file mode 100644
index ca25c2a..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.intel/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.cmake.is.intel</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.intel/META-INF/MANIFEST.MF
deleted file mode 100644
index b9de640..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.intel/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.intel;singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
- org.eclipse.help,
- org.eclipse.cdt.cmake.is.core;bundle-version="1.0.0"
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.intel
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml
deleted file mode 100644
index b71d054..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contentExtension>
- <contribution content="doc/compiler.xhtml#lsp"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
-<!-- built-ins detection is not supported
- <contribution content="doc/compiler.xhtml#builtins"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
--->
-</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/plugin.xml b/cmake/org.eclipse.cdt.cmake.is.intel/plugin.xml
deleted file mode 100644
index 6f93997..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.intel/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension point="org.eclipse.cdt.cmake.is.core.detectionParticipant">
- <tool class="org.eclipse.cdt.cmake.is.intel.IccToolDetectionParticipant"
- displayName="Intel icc, C, Linux & OS X, EDG"/>
- <tool class="org.eclipse.cdt.cmake.is.intel.IclCandCppToolDetectionParticipant"
- displayName="Intel icl, C & C++, Windows"/>
- <tool class="org.eclipse.cdt.cmake.is.intel.IclToolDetectionParticipant"
- displayName="Intel icl, C, OS X, clang"/>
- <tool class="org.eclipse.cdt.cmake.is.intel.IcpcClangToolDetectionParticipant"
- displayName="Intel icpc, C++, OS X, clang"/>
- <tool class="org.eclipse.cdt.cmake.is.intel.IcpcToolDetectionParticipant"
- displayName="Intel icpc, C++, Linux & OS X, EDG"/>
- </extension>
- <extension
- point="org.eclipse.help.contentExtension">
- <contentExtension
- file="help_content_extension.xml">
- </contentExtension>
- </extension>
-</plugin>
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/pom.xml b/cmake/org.eclipse.cdt.cmake.is.intel/pom.xml
deleted file mode 100644
index 1108f9b..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.intel/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
-
- This program and the accompanying materials
- are made available under the terms of the Eclipse Public License 2.0
- which accompanies this distribution, and is available at
- https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>10.4.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.cmake.is.intel</artifactId>
- <!-- always use .qualifier in manifest, we do not plan to publish this plugin
- to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.project b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.project
deleted file mode 100644
index bdea848..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.cmake.is.microsoft.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index a693780b..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.microsoft.tests
-Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.cdt.cmake.is.microsoft
-Import-Package: org.junit
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.microsoft.tests
-Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 4fcf342..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#Properties file for org.eclipse.cdt.cmake.is.microsoft.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.microsoft.tests
-Bundle-Vendor = Eclipse CDT
-Bundle-Copyright = 2020 Martin Weber\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/pom.xml b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/pom.xml
deleted file mode 100644
index 57e8f10..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
-
- This program and the accompanying materials
- are made available under the terms of the Eclipse Public License 2.0
- which accompanies this distribution, and is available at
- https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>10.4.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.cmake.is.microsoft.tests</artifactId>
- <!-- always use .qualifier in manifest, we do not plan to publish this plugin
- to a maven repo. (The repository version is a different thing) -->
- <version>1.0.100-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.project b/cmake/org.eclipse.cdt.cmake.is.microsoft/.project
deleted file mode 100644
index 46f83e3..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.cmake.is.microsoft</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml
deleted file mode 100644
index b6ca8d5..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contentExtension>
- <contribution content="doc/compiler.xhtml#lsp"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
-</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 4e3deab..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#Properties file for org.eclipse.cdt.cmake.is.nvidia.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.nvidia.tests
-Bundle-Vendor = Eclipse CDT
-Bundle-Copyright = 2020 Martin Weber\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml
deleted file mode 100644
index a1788aa..0000000
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contentExtension>
- <contribution content="doc/compiler.xhtml#lsp"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
- <contribution content="doc/compiler.xhtml#builtins"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
- <contribution content="doc/compiler.xhtml#builtins_enhanced"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_enhanced_list"/>
-</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.project
similarity index 90%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.project
index 6b54c75..eb5f453 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.nvidia.tests</name>
+ <name>org.eclipse.cdt.jsoncdb.arm.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/META-INF/MANIFEST.MF
similarity index 61%
copy from cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF
copy to cmake/org.eclipse.cdt.jsoncdb.arm.tests/META-INF/MANIFEST.MF
index 5c0abc0..e0ea1a5 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.arm.tests
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.arm.tests
Bundle-Version: 1.0.100.qualifier
Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.cdt.cmake.is.arm
+Fragment-Host: org.eclipse.cdt.jsoncdb.arm
Import-Package: org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.arm.tests
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.arm.tests
Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/OSGI-INF/l10n/bundle.properties
similarity index 73%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/OSGI-INF/l10n/bundle.properties
index 8f0e3b6..ab6ad0c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
-#Properties file for org.eclipse.cdt.cmake.is.arm.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.arm.tests
+#Properties file for org.eclipse.cdt.jsoncdb.arm.tests
+Bundle-Name = org.eclipse.cdt.jsoncdb.arm.tests
Bundle-Vendor = Eclipse CDT
Bundle-Copyright = 2020 Martin Weber\n\
\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/about.html b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/build.properties b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/pom.xml
similarity index 94%
copy from cmake/org.eclipse.cdt.cmake.is.arm.tests/pom.xml
copy to cmake/org.eclipse.cdt.jsoncdb.arm.tests/pom.xml
index 2bc7784..645eae2 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/pom.xml
@@ -19,7 +19,7 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.arm.tests</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.arm.tests</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
<version>1.0.100-SNAPSHOT</version>
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/src/org/eclipse/cdt/cmake/is/arm/ToolDetectionParticipantTest.java b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/src/org/eclipse/cdt/jsoncdb/arm/ToolDetectionParticipantTest.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/src/org/eclipse/cdt/cmake/is/arm/ToolDetectionParticipantTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.arm.tests/src/org/eclipse/cdt/jsoncdb/arm/ToolDetectionParticipantTest.java
index 17d6741..f8c7cab 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/src/org/eclipse/cdt/cmake/is/arm/ToolDetectionParticipantTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm.tests/src/org/eclipse/cdt/jsoncdb/arm/ToolDetectionParticipantTest.java
@@ -6,15 +6,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.arm;
+package org.eclipse.cdt.jsoncdb.arm;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Locale;
-import org.eclipse.cdt.cmake.is.core.participant.IToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.ParticipantTestUtil;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.ParticipantTestUtil;
import org.junit.Test;
/**
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.classpath b/cmake/org.eclipse.cdt.jsoncdb.arm/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.arm/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project b/cmake/org.eclipse.cdt.jsoncdb.arm/.project
similarity index 93%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia/.project
copy to cmake/org.eclipse.cdt.jsoncdb.arm/.project
index 577ca14..6491517 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.nvidia</name>
+ <name>org.eclipse.cdt.jsoncdb.arm</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.arm/META-INF/MANIFEST.MF
similarity index 61%
copy from cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF
copy to cmake/org.eclipse.cdt.jsoncdb.arm/META-INF/MANIFEST.MF
index 7ced5d2..db36667 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.arm;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.arm;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
org.eclipse.help,
- org.eclipse.cdt.cmake.is.core;bundle-version="1.0.0"
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.arm
+ org.eclipse.cdt.jsoncdb.core;bundle-version="1.0.0"
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.arm
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/about.html b/cmake/org.eclipse.cdt.jsoncdb.arm/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.arm/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/build.properties b/cmake/org.eclipse.cdt.jsoncdb.arm/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.arm/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/doc/compiler.xhtml b/cmake/org.eclipse.cdt.jsoncdb.arm/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/doc/compiler.xhtml
rename to cmake/org.eclipse.cdt.jsoncdb.arm/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/help_content_extension.xml b/cmake/org.eclipse.cdt.jsoncdb.arm/help_content_extension.xml
new file mode 100644
index 0000000..8d21362
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm/help_content_extension.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<contentExtension>
+ <contribution content="doc/compiler.xhtml#lsp"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
+ <contribution content="doc/compiler.xhtml#builtins"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
+</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/plugin.properties b/cmake/org.eclipse.cdt.jsoncdb.arm/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/plugin.properties
rename to cmake/org.eclipse.cdt.jsoncdb.arm/plugin.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/plugin.xml b/cmake/org.eclipse.cdt.jsoncdb.arm/plugin.xml
similarity index 62%
rename from cmake/org.eclipse.cdt.cmake.is.arm/plugin.xml
rename to cmake/org.eclipse.cdt.jsoncdb.arm/plugin.xml
index 1e610a6..6e82800 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/plugin.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm/plugin.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension point="org.eclipse.cdt.cmake.is.core.detectionParticipant">
- <tool class="org.eclipse.cdt.cmake.is.arm.ArmccToolDetectionParticipant"
+ <extension point="org.eclipse.cdt.jsoncdb.core.detectionParticipant">
+ <tool class="org.eclipse.cdt.jsoncdb.arm.ArmccToolDetectionParticipant"
displayName="ARM.com armcc, C & C++"/>
- <tool class="org.eclipse.cdt.cmake.is.arm.ArmClangToolDetectionParticipant"
+ <tool class="org.eclipse.cdt.jsoncdb.arm.ArmClangToolDetectionParticipant"
displayName="ARM.com armclang, C & C++"/>
</extension>
<extension
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.arm/pom.xml
similarity index 91%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml
copy to cmake/org.eclipse.cdt.jsoncdb.arm/pom.xml
index 9f35113..0a51470 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm/pom.xml
@@ -19,10 +19,10 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.nvidia</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.arm</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmClangToolDetectionParticipant.java
similarity index 73%
rename from cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmClangToolDetectionParticipant.java
index 1d491d7..fe78365 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmClangToolDetectionParticipant.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.arm;
+package org.eclipse.cdt.jsoncdb.arm;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
/**
* armclang C & C++.
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccBuiltinDetectionBehavior.java
similarity index 80%
rename from cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java
rename to cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccBuiltinDetectionBehavior.java
index 335d40b..a1c0a38 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccBuiltinDetectionBehavior.java
@@ -7,14 +7,14 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.arm;
+package org.eclipse.cdt.jsoncdb.arm;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.GccOutputProcessor;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.GccOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsOutputProcessor;
/**
* The {link IBuiltinsDetectionBehavior} for the ARM C or C++ version 5
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccToolDetectionParticipant.java
similarity index 77%
rename from cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccToolDetectionParticipant.java
index b3f7132..1b8c1a9 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccToolDetectionParticipant.java
@@ -7,12 +7,12 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.arm;
+package org.eclipse.cdt.jsoncdb.arm;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
/**
* armcc C & C++.
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/.project b/cmake/org.eclipse.cdt.jsoncdb.core.doc/.project
similarity index 90%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/.project
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/.project
index 76aa450..aee2425 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.doc/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.doc/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.core.doc</name>
+ <name>org.eclipse.cdt.jsoncdb.core.doc</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.core.doc/META-INF/MANIFEST.MF
similarity index 72%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/META-INF/MANIFEST.MF
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/META-INF/MANIFEST.MF
index b461180..854fc3d 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.doc/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.doc/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@
Bundle-Name: %bundleName
Bundle-Description: %Bundle-Description
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.core.doc;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.core.doc;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/about.html b/cmake/org.eclipse.cdt.jsoncdb.core.doc/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties b/cmake/org.eclipse.cdt.jsoncdb.core.doc/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml b/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/notices.html b/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/notices.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/notices.html
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/notices.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/supported-compilers.xhtml b/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/supported-compilers.xhtml
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/toc.xml b/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/toc.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/doc/toc.xml
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/toc.xml
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/topics_Tasks.xml b/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/topics_Tasks.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/doc/topics_Tasks.xml
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/topics_Tasks.xml
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/plugin.properties b/cmake/org.eclipse.cdt.jsoncdb.core.doc/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/plugin.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/plugin.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/plugin.xml b/cmake/org.eclipse.cdt.jsoncdb.core.doc/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.doc/plugin.xml
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/plugin.xml
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.core.doc/pom.xml
similarity index 91%
rename from cmake/org.eclipse.cdt.cmake.is.arm/pom.xml
rename to cmake/org.eclipse.cdt.jsoncdb.core.doc/pom.xml
index f37ec55..56049ee 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.doc/pom.xml
@@ -19,10 +19,9 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.arm</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.core.doc</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-
</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.project b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.project
similarity index 92%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.project
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.project
index ad22946..7d07b2d 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.core.tests</name>
+ <name>org.eclipse.cdt.jsoncdb.core.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.core.tests/META-INF/MANIFEST.MF
similarity index 61%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/META-INF/MANIFEST.MF
index 5c0abc0..3cb3a33 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.arm.tests
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.core.tests
Bundle-Version: 1.0.100.qualifier
Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.cdt.cmake.is.arm
+Fragment-Host: org.eclipse.cdt.jsoncdb.core
Import-Package: org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.arm.tests
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.core.tests
Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.jsoncdb.core.tests/OSGI-INF/l10n/bundle.properties
similarity index 73%
copy from cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
copy to cmake/org.eclipse.cdt.jsoncdb.core.tests/OSGI-INF/l10n/bundle.properties
index 8f0e3b6..ad3ee3f 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
-#Properties file for org.eclipse.cdt.cmake.is.arm.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.arm.tests
+#Properties file for org.eclipse.cdt.jsoncdb.core.tests
+Bundle-Name = org.eclipse.cdt.jsoncdb.core.tests
Bundle-Vendor = Eclipse CDT
Bundle-Copyright = 2020 Martin Weber\n\
\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/about.html b/cmake/org.eclipse.cdt.jsoncdb.core.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/build.properties b/cmake/org.eclipse.cdt.jsoncdb.core.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.core.tests/pom.xml
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/pom.xml
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/pom.xml
index 2bc7784..3926917 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/pom.xml
@@ -19,7 +19,7 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.arm.tests</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.core.tests</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
<version>1.0.100-SNAPSHOT</version>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectLangStd_GCC_Test.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectLangStd_GCC_Test.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectLangStd_GCC_Test.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectLangStd_GCC_Test.java
index 1d33de3..ac8a998 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectLangStd_GCC_Test.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectLangStd_GCC_Test.java
@@ -6,12 +6,12 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.LangStd_GCC;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.LangStd_GCC;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectSysroot_GCC_Test.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectSysroot_GCC_Test.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectSysroot_GCC_Test.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectSysroot_GCC_Test.java
index c9f08bc..6347ba3 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectSysroot_GCC_Test.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectSysroot_GCC_Test.java
@@ -6,12 +6,12 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.Sysroot_GCC;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.Sysroot_GCC;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludeFile_GCCTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludeFile_GCCTest.java
similarity index 97%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludeFile_GCCTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludeFile_GCCTest.java
index 68a7557..e3fdc91 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludeFile_GCCTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludeFile_GCCTest.java
@@ -6,11 +6,11 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.IncludeFile_GCC;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.IncludeFile_GCC;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludePath_C_POSIXTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludePath_C_POSIXTest.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludePath_C_POSIXTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludePath_C_POSIXTest.java
index 3539ec8..fc60881 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludePath_C_POSIXTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludePath_C_POSIXTest.java
@@ -6,12 +6,12 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.IncludePath_C_POSIX;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet.IArgumentCollector;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.IncludePath_C_POSIX;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet.IArgumentCollector;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroDefine_C_POSIXTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroDefine_C_POSIXTest.java
similarity index 98%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroDefine_C_POSIXTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroDefine_C_POSIXTest.java
index eed321c..6f373b8 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroDefine_C_POSIXTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroDefine_C_POSIXTest.java
@@ -6,15 +6,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.Map;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.MacroDefine_C_POSIX;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.MacroDefine_C_POSIX;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroUndefine_C_POSIXTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroUndefine_C_POSIXTest.java
similarity index 89%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroUndefine_C_POSIXTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroUndefine_C_POSIXTest.java
index b91a2b5..a954b94 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroUndefine_C_POSIXTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroUndefine_C_POSIXTest.java
@@ -6,12 +6,12 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.MacroUndefine_C_POSIX;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet.IArgumentCollector;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.MacroUndefine_C_POSIX;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet.IArgumentCollector;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacrosFile_GCCTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacrosFile_GCCTest.java
similarity index 97%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacrosFile_GCCTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacrosFile_GCCTest.java
index 61e56c4..0b72350 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacrosFile_GCCTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacrosFile_GCCTest.java
@@ -6,11 +6,11 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.MacrosFile_GCC;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.MacrosFile_GCC;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetectionTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetectionTest.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetectionTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetectionTest.java
index fe7a3ce..2c9bcf0 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetectionTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetectionTest.java
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -23,7 +23,7 @@
/**
* Test method for
- * {@link org.eclipse.cdt.cmake.is.core.internal.ParserDetection#determineDetector(String, String,boolean)}
+ * {@link org.eclipse.cdt.jsoncdb.core.internal.ParserDetection#determineDetector(String, String,boolean)}
* .
*/
@Test
@@ -49,7 +49,7 @@
/**
* Test method for
- * {@link org.eclipse.cdt.cmake.is.core.internal.ParserDetection#determineDetector(String, String,boolean)}
+ * {@link org.eclipse.cdt.jsoncdb.core.internal.ParserDetection#determineDetector(String, String,boolean)}
* . <a href="https://wiki.osdev.org/Target_Triplet"/>
*/
@Test
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserLookupResultTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserLookupResultTest.java
similarity index 88%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserLookupResultTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserLookupResultTest.java
index ad066ee..f34fe71 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserLookupResultTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserLookupResultTest.java
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -16,7 +16,7 @@
public class ParserLookupResultTest {
/**
* Test method for
- * {@link org.eclipse.cdt.cmake.is.core.internal.ParserDetection#determineDetector(String, String,boolean)}
+ * {@link org.eclipse.cdt.jsoncdb.core.internal.ParserDetection#determineDetector(String, String,boolean)}
*/
@Test
public void testCanParse() {
@@ -32,7 +32,7 @@
/**
* Test method for
- * {@link org.eclipse.cdt.cmake.is.core.internal.ParserDetection.ParserDetectionResult#getReducedCommandLine()}.
+ * {@link org.eclipse.cdt.jsoncdb.core.internal.ParserDetection.ParserDetectionResult#getReducedCommandLine()}.
*/
@Test
public void testGetReducedCommandLine() {
@@ -56,7 +56,7 @@
/**
* Test method for
- * {@link org.eclipse.cdt.cmake.is.core.internal.ParserDetection.ParserDetectionResult#getCommandLine()}.
+ * {@link org.eclipse.cdt.jsoncdb.core.internal.ParserDetection.ParserDetectionResult#getCommandLine()}.
*/
@Test
public void testGetCommandLine() {
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_C_Test.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_C_Test.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_C_Test.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_C_Test.java
index a7bd742..ccd819a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_C_Test.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_C_Test.java
@@ -6,13 +6,13 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.IncludePath_C_POSIX;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.SystemIncludePath_C;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet.IArgumentCollector;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.IncludePath_C_POSIX;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.SystemIncludePath_C;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet.IArgumentCollector;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_armcc_Test.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_armcc_Test.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_armcc_Test.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_armcc_Test.java
index ca4e7fe..3c9bba5 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_armcc_Test.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_armcc_Test.java
@@ -6,11 +6,11 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.SystemIncludePath_armcc;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.SystemIncludePath_armcc;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ToolCommandlineParserTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ToolCommandlineParserTest.java
similarity index 92%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ToolCommandlineParserTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ToolCommandlineParserTest.java
index fb6c835..4bf8fdc 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ToolCommandlineParserTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ToolCommandlineParserTest.java
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -16,10 +16,10 @@
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Test;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccOutputProcessorTest.java
similarity index 89%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccOutputProcessorTest.java
index 5eeb55d..785396a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccOutputProcessorTest.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal.builtins;
+package org.eclipse.cdt.jsoncdb.core.internal.builtins;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -16,8 +16,8 @@
import java.io.IOException;
import java.io.InputStream;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.GccOutputProcessor;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.OutputSniffer;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.GccOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.OutputSniffer;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/cbd-gcc.output.txt b/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/cbd-gcc.output.txt
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/cbd-gcc.output.txt
rename to cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/cbd-gcc.output.txt
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.classpath b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.project b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.project
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.project
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.project
index 2c06837..c161f4b 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.core.ui</name>
+ <name>org.eclipse.cdt.jsoncdb.core.ui</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.core.ui/META-INF/MANIFEST.MF
similarity index 62%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/META-INF/MANIFEST.MF
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/META-INF/MANIFEST.MF
index 109f730..65d2fe6 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.ui/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.core.ui;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.core.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
- org.eclipse.cdt.cmake.is.core;bundle-version="1.0.0",
+ org.eclipse.cdt.jsoncdb.core;bundle-version="1.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="2.1.700.v20191222-1048"
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.core.ui
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.core.ui
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.e4.core.contexts
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.jsoncdb.core.ui/OSGI-INF/l10n/bundle.properties
similarity index 86%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/OSGI-INF/l10n/bundle.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/OSGI-INF/l10n/bundle.properties
index 92819ed..0e4af66 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.ui/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,4 @@
-#Properties file for org.eclipse.cdt.cmake.is.core.ui
+#Properties file for org.eclipse.cdt.jsoncdb.core.ui
bundleName=CMake indexer support UI
Bundle-Vendor = Eclipse CDT
Bundle-Copyright = 2013 Martin Weber\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/about.html b/cmake/org.eclipse.cdt.jsoncdb.core.ui/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/build.properties b/cmake/org.eclipse.cdt.jsoncdb.core.ui/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/plugin.xml b/cmake/org.eclipse.cdt.jsoncdb.core.ui/plugin.xml
new file mode 100644
index 0000000..22f161f
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.ui/plugin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.eclipse.cdt.cmake.ui.page1"
+ class="org.eclipse.cdt.jsoncdb.core.ui.internal.IndexerSupportPreferencePage"
+ id="org.eclipse.cdt.jsoncdb.core.ui.IndexerSupportPreferencePage"
+ name="%page.name">
+ </page>
+ </extension>
+
+</plugin>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.core.ui/pom.xml
similarity index 90%
copy from cmake/org.eclipse.cdt.cmake.is.core/pom.xml
copy to cmake/org.eclipse.cdt.jsoncdb.core.ui/pom.xml
index 2dd95d7..1c28d4a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.ui/pom.xml
@@ -19,9 +19,9 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.core</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.core.ui</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
- <version>1.0.300-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/IndexerSupportPreferencePage.java b/cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/IndexerSupportPreferencePage.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/IndexerSupportPreferencePage.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/IndexerSupportPreferencePage.java
index c7dd3bd..b59cf80 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/IndexerSupportPreferencePage.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/IndexerSupportPreferencePage.java
@@ -8,14 +8,14 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.ui.internal;
+package org.eclipse.cdt.jsoncdb.core.ui.internal;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import org.eclipse.cdt.cmake.is.core.IParserPreferences;
-import org.eclipse.cdt.cmake.is.core.IParserPreferencesAccess;
-import org.eclipse.cdt.cmake.is.core.IParserPreferencesMetadata;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferences;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferencesAccess;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferencesMetadata;
import org.eclipse.core.runtime.preferences.PreferenceMetadata;
import org.eclipse.e4.core.contexts.EclipseContextFactory;
import org.eclipse.jface.layout.GridDataFactory;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/Messages.java b/cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
similarity index 85%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/Messages.java
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
index 360b6fe..77bcaaa 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/Messages.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.ui.internal;
+package org.eclipse.cdt.jsoncdb.core.ui.internal;
import org.eclipse.osgi.util.NLS;
@@ -18,7 +18,7 @@
*
*/
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.cdt.cmake.is.core.ui.internal.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.cdt.jsoncdb.core.ui.internal.messages"; //$NON-NLS-1$
public static String IndexerSupportPreferencePage_description;
public static String IndexerSupportPreferencePage_errmsg_suffix_regex;
public static String IndexerSupportPreferencePage_label_suffix_pattern;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/messages.properties b/cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/messages.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/messages.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.classpath b/cmake/org.eclipse.cdt.jsoncdb.core/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.core/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.core/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.core/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.options b/cmake/org.eclipse.cdt.jsoncdb.core/.options
new file mode 100644
index 0000000..e978cfd
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/.options
@@ -0,0 +1,10 @@
+# Debugging options for the org.eclipse.cdt.jsoncdb.core plugin.
+
+# Trace total time for parsing compile_commands.json files
+org.eclipse.cdt.jsoncdb.core/debug/performance=false
+# Trace compile_commands.json Parser tool detection participant lookup
+org.eclipse.cdt.jsoncdb.core/debug/participant=false
+# Trace how compiler command-line arguments are detected and parsed
+org.eclipse.cdt.jsoncdb.core/debug/arglets=false
+# Trace detected preprocessor symbols and include path entries as passed to the indexer
+org.eclipse.cdt.jsoncdb.core/debug/detected.entries=false
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.project b/cmake/org.eclipse.cdt.jsoncdb.core/.project
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core/.project
rename to cmake/org.eclipse.cdt.jsoncdb.core/.project
index d9a1d07..d309ac1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.core</name>
+ <name>org.eclipse.cdt.jsoncdb.core</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.pde.ds.annotations.prefs b/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.ds.annotations.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.pde.ds.annotations.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.ds.annotations.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dde9a9c
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Description: %bundleDescription
+Bundle-Copyright: %Bundle-Copyright
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.core;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.cdt.jsoncdb.core.internal.Plugin
+Export-Package: org.eclipse.cdt.jsoncdb.core;x-friends:="org.eclipse.cdt.jsoncdb.core.ui";
+ uses:="org.eclipse.core.runtime,
+ org.eclipse.cdt.core.settings.model,
+ org.eclipse.cdt.jsoncdb.core.builtins",
+ org.eclipse.cdt.jsoncdb.core.participant;uses:="org.eclipse.core.runtime,org.eclipse.cdt.jsoncdb.core.participant.builtins",
+ org.eclipse.cdt.jsoncdb.core.participant.builtins;uses:="org.eclipse.cdt.jsoncdb.core.participant"
+Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.8.0",
+ org.eclipse.cdt.ui,
+ org.eclipse.core.resources;bundle-version="3.13.700",
+ org.eclipse.core.runtime;bundle-version="3.17.100",
+ org.eclipse.cdt.core,
+ org.eclipse.jface,
+ com.google.gson,
+ org.apache.commons.io;bundle-version="2.6.0"
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.core
+Import-Package: org.eclipse.e4.core.contexts;version="1.7.0",
+ org.osgi.service.component.annotations;version="1.2.0"
+Service-Component: OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml b/cmake/org.eclipse.cdt.jsoncdb.core/OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml
new file mode 100644
index 0000000..849ed3a
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess">
+ <service>
+ <provide interface="org.eclipse.cdt.jsoncdb.core.IParserPreferencesAccess"/>
+ </service>
+ <implementation class="org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess"/>
+</scr:component>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/about.html b/cmake/org.eclipse.cdt.jsoncdb.core/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.core/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/build.properties b/cmake/org.eclipse.cdt.jsoncdb.core/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/plugin.properties b/cmake/org.eclipse.cdt.jsoncdb.core/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/plugin.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core/plugin.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/plugin.xml b/cmake/org.eclipse.cdt.jsoncdb.core/plugin.xml
similarity index 86%
rename from cmake/org.eclipse.cdt.cmake.is.core/plugin.xml
rename to cmake/org.eclipse.cdt.jsoncdb.core/plugin.xml
index 0e629fc..aa2999e 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/plugin.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.4"?>
<plugin>
<extension-point id="detectionParticipant" name="%extension-point.name" schema="schema/participant.exsd"/>
-"org.eclipse.cdt.cmake.is.core.internal.ui.CompileCommandsJsonParserOptionPage">
+"org.eclipse.cdt.jsoncdb.core.internal.ui.CompileCommandsJsonParserOptionPage">
<extension
id="CompileCommandsJsonParserMarker"
name="%CompileCommandsJsonParserMarker.name"
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.core/pom.xml
similarity index 91%
rename from cmake/org.eclipse.cdt.cmake.is.core/pom.xml
rename to cmake/org.eclipse.cdt.jsoncdb.core/pom.xml
index 2dd95d7..9492271 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/pom.xml
@@ -19,9 +19,9 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.core</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.core</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
- <version>1.0.300-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd b/cmake/org.eclipse.cdt.jsoncdb.core/schema/participant.exsd
similarity index 78%
rename from cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd
rename to cmake/org.eclipse.cdt.jsoncdb.core/schema/participant.exsd
index f51c944..c326abf 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/schema/participant.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.cmake.is.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.cdt.jsoncdb.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.cdt.cmake.is.core" id="detectionParticipant" name="Tool Detection Participants"/>
+ <meta.schema plugin="org.eclipse.cdt.jsoncdb.core" id="detectionParticipant" name="Tool Detection Participants"/>
</appinfo>
<documentation>
Allows plug-ins to contribute to detection of compiler include paths and preprocessor defines from a command-line text.
@@ -60,11 +60,11 @@
<attribute name="class" type="string" use="required">
<annotation>
<documentation>
- The fully qualified name of a class that implements <code>org.eclipse.cdt.cmake.is.participant.IToolDetectionParticipant</code>, The implementation must provide a public no-argument constructor.<br/>
-You may want to consider sub-classing <code>org.eclipse.cdt.cmake.is.participant.DefaultToolDetectionParticipant</code> for convenience instead of directly implementing the interface.
+ The fully qualified name of a class that implements <code>org.eclipse.cdt.jsoncdb.participant.IToolDetectionParticipant</code>, The implementation must provide a public no-argument constructor.<br/>
+You may want to consider sub-classing <code>org.eclipse.cdt.jsoncdb.participant.DefaultToolDetectionParticipant</code> for convenience instead of directly implementing the interface.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.cdt.cmake.is.participant.IToolDetectionParticipant"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.cdt.jsoncdb.participant.IToolDetectionParticipant"/>
</appinfo>
</annotation>
</attribute>
@@ -103,7 +103,7 @@
<p>This participant detects the preprocessor macros and include directories for the C compiler made by
the Foobar company:
<pre>
-<extension point="org.eclipse.cdt.cmake.is.core.detectionParticipant">
+<extension point="org.eclipse.cdt.jsoncdb.core.detectionParticipant">
<tool class="com.foobar.ToolDetectionParticipant" displayName="Foobar C" />
</extension>
</pre>
@@ -111,7 +111,7 @@
<p>
To provide online help that lists the supported compilers along with the recognized arguments,
the extension point <code>org.eclipse.help.contentExtension</code> can be used.<br/>
-Plugin <i>org.eclipse.cdt.cmake.is.core.doc</i> provides predefined help-anchors that allow to integrate the online help:
+Plugin <i>org.eclipse.cdt.jsoncdb.core.doc</i> provides predefined help-anchors that allow to integrate the online help:
<ol>
<li><i>extra_detection_participant_list</i> for the commandline parser,</li>
<li><i>extra_detection_participant_builtins_list</i> and
@@ -121,16 +121,16 @@
<pre>
<contentExtension>
<contribution content="doc/compiler.xhtml#lsp"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
<contribution content="doc/compiler.xhtml#builtins"
- path="/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
</contentExtension>
</pre>
</p>
<p>
-The easiest way to implement a tool detection participant would be to sub-class <code>org.eclipse.cdt.cmake.is.participant.DefaultToolDetectionParticipant</code>.
-To configure your class, pass an instance of <code>org.eclipse.cdt.cmake.is.participant.DefaultToolCommandlineParser</code> in its super-constructor.<br/>
+The easiest way to implement a tool detection participant would be to sub-class <code>org.eclipse.cdt.jsoncdb.participant.DefaultToolDetectionParticipant</code>.
+To configure your class, pass an instance of <code>org.eclipse.cdt.jsoncdb.participant.DefaultToolCommandlineParser</code> in its super-constructor.<br/>
Some predifined parsers for tool arguments can be found in the classes <code>Arglets</code> and <code>ResponseFileArglets</code>.
</p>
</documentation>
@@ -142,8 +142,8 @@
<meta.section type="implementation"/>
</appinfo>
<documentation>
- The plugin <i>org.eclipse.cdt.cmake.is.intel<i> provides implementations for various compiler made by Intel Corp.</br>
-See, for example <code>org.eclipse.cdt.cmake.is.intel.IcpcToolDetectionParticipant.java</code>.
+ The plugin <i>org.eclipse.cdt.jsoncdb.intel<i> provides implementations for various compiler made by Intel Corp.</br>
+See, for example <code>org.eclipse.cdt.jsoncdb.intel.IcpcToolDetectionParticipant.java</code>.
</documentation>
</annotation>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CommandEntry.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CommandEntry.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CommandEntry.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CommandEntry.java
index 2d585aa..78da5aa 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CommandEntry.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CommandEntry.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core;
+package org.eclipse.cdt.jsoncdb.core;
/**
* Represents a parsed command entry of a compile_commands.json file.
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java
index 922edf9..4261a28 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core;
+package org.eclipse.cdt.jsoncdb.core;
import java.io.File;
import java.io.FileReader;
@@ -26,17 +26,17 @@
import java.util.stream.Stream;
import org.apache.commons.io.FilenameUtils;
-import org.eclipse.cdt.cmake.is.core.internal.ParserDetection;
-import org.eclipse.cdt.cmake.is.core.internal.ParserDetection.DetectorWithMethod;
-import org.eclipse.cdt.cmake.is.core.internal.ParserDetection.ParserDetectionResult;
-import org.eclipse.cdt.cmake.is.core.internal.Plugin;
-import org.eclipse.cdt.cmake.is.core.internal.builtins.CompilerBuiltinsDetector;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfo;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser.IResult;
-import org.eclipse.cdt.cmake.is.core.participant.IToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.internal.ParserDetection;
+import org.eclipse.cdt.jsoncdb.core.internal.ParserDetection.DetectorWithMethod;
+import org.eclipse.cdt.jsoncdb.core.internal.ParserDetection.ParserDetectionResult;
+import org.eclipse.cdt.jsoncdb.core.internal.Plugin;
+import org.eclipse.cdt.jsoncdb.core.internal.builtins.CompilerBuiltinsDetector;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawIndexerInfo;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser.IResult;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IIndexerInfoConsumer.java
similarity index 98%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IIndexerInfoConsumer.java
index bd2f300..230d361 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IIndexerInfoConsumer.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core;
+package org.eclipse.cdt.jsoncdb.core;
import java.util.List;
import java.util.Map;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferences.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferences.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferences.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferences.java
index 0dfaa93..e5b44fc 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferences.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferences.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core;
+package org.eclipse.cdt.jsoncdb.core;
/**
* Preferences to configure the {@code compile_commands.json} parser.
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesAccess.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesAccess.java
index a13a30f..b0fd225 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesAccess.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core;
+package org.eclipse.cdt.jsoncdb.core;
/**
* Provides access to the {@code compile_commands.json} parser preferences and its preference metadata.<br>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesMetadata.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesMetadata.java
index db3da66..9f9c192 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesMetadata.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core;
+package org.eclipse.cdt.jsoncdb.core;
import org.eclipse.core.runtime.preferences.PreferenceMetadata;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/Messages.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
similarity index 90%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/Messages.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
index f443500..9b48b96 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/Messages.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core;
+package org.eclipse.cdt.jsoncdb.core;
import org.eclipse.osgi.util.NLS;
@@ -18,7 +18,7 @@
*
*/
/* package */ public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.cdt.cmake.is.core.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.cdt.jsoncdb.core.messages"; //$NON-NLS-1$
public static String CompileCommandsJsonParser_errmsg_empty_json;
public static String CompileCommandsJsonParser_errmsg_file_not_found;
public static String CompileCommandsJsonParser_errmsg_no_parser_for_commandline;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/ParseRequest.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ParseRequest.java
similarity index 98%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/ParseRequest.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ParseRequest.java
index d6ab7b1..6b5c91f 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/ParseRequest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ParseRequest.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core;
+package org.eclipse.cdt.jsoncdb.core;
import java.util.Objects;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Messages.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
similarity index 87%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Messages.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
index a49ee88..3fd1f48 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Messages.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import org.eclipse.osgi.util.NLS;
@@ -18,7 +18,7 @@
*
*/
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.cdt.cmake.is.core.internal.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.cdt.jsoncdb.core.internal.messages"; //$NON-NLS-1$
public static String ParserPreferencesAccess_e_get_preferences;
public static String ParserPreferencesMetadata_label_console;
public static String ParserPreferencesMetadata_label_suffix;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParseContext.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParseContext.java
similarity index 78%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParseContext.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParseContext.java
index 89a5f34..191b2b0 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParseContext.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParseContext.java
@@ -7,14 +7,14 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.cdt.cmake.is.core.internal.builtins.RawIndexerInfo;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.internal.builtins.RawIndexerInfo;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser;
/**
* Default implementation of IArgumentCollector.
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetection.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetection.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetection.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetection.java
index 5adb1cd..b7e2b6b 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetection.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetection.java
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import java.io.File;
import java.io.IOException;
@@ -17,17 +17,17 @@
import java.util.Optional;
import java.util.function.Consumer;
-import org.eclipse.cdt.cmake.is.core.internal.builtins.GccBuiltinDetectionBehavior;
-import org.eclipse.cdt.cmake.is.core.internal.builtins.MaybeGccBuiltinDetectionBehavior;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.IToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IToolDetectionParticipant.MatchResult;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.internal.builtins.GccBuiltinDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.internal.builtins.MaybeGccBuiltinDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolDetectionParticipant.MatchResult;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.ILog;
@@ -117,7 +117,7 @@
*/
private static void loadExtentionsSorted(Consumer<? super IToolDetectionParticipant> consumer) {
IConfigurationElement[] elements = Platform.getExtensionRegistry()
- .getConfigurationElementsFor("org.eclipse.cdt.cmake.is.core.detectionParticipant");
+ .getConfigurationElementsFor("org.eclipse.cdt.jsoncdb.core.detectionParticipant");
Map<IToolDetectionParticipant, Integer> sortMap = new HashMap<>();
for (IConfigurationElement e : elements) {
try {
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferences.java
similarity index 91%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferences.java
index 16784f9..d58db06 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferences.java
@@ -9,12 +9,12 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import java.util.Objects;
-import org.eclipse.cdt.cmake.is.core.IParserPreferences;
-import org.eclipse.cdt.cmake.is.core.IParserPreferencesMetadata;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferences;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferencesMetadata;
import org.eclipse.core.runtime.preferences.IPreferenceMetadataStore;
/**
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesAccess.java
similarity index 89%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesAccess.java
index 939736c..52e96d3 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesAccess.java
@@ -9,13 +9,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import java.util.Optional;
-import org.eclipse.cdt.cmake.is.core.IParserPreferences;
-import org.eclipse.cdt.cmake.is.core.IParserPreferencesAccess;
-import org.eclipse.cdt.cmake.is.core.IParserPreferencesMetadata;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferences;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferencesAccess;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferencesMetadata;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IPreferenceMetadataStore;
import org.eclipse.core.runtime.preferences.IScopeContext;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesMetadata.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesMetadata.java
index 3364927..52b2d6f 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesMetadata.java
@@ -9,9 +9,9 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
-import org.eclipse.cdt.cmake.is.core.IParserPreferencesMetadata;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferencesMetadata;
import org.eclipse.core.runtime.preferences.PreferenceMetadata;
/**
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Plugin.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Plugin.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Plugin.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Plugin.java
index 20d0460..bf73b5a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Plugin.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Plugin.java
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal;
+package org.eclipse.cdt.jsoncdb.core.internal;
import java.text.MessageFormat;
@@ -18,7 +18,7 @@
*/
public class Plugin extends AbstractUIPlugin {
- public static final String PLUGIN_ID = "org.eclipse.cdt.cmake.is.core"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.cdt.jsoncdb.core"; //$NON-NLS-1$
// The shared instance.
private static Plugin plugin;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/AbstractConsole.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/AbstractConsole.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/AbstractConsole.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/AbstractConsole.java
index 434894e..ead0294 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/AbstractConsole.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/AbstractConsole.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal.builtins;
+package org.eclipse.cdt.jsoncdb.core.internal.builtins;
import org.eclipse.cdt.core.ConsoleOutputStream;
import org.eclipse.cdt.core.resources.IConsole;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
index a16f97d..f9ce627 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal.builtins;
+package org.eclipse.cdt.jsoncdb.core.internal.builtins;
import java.io.IOException;
import java.nio.file.Files;
@@ -17,13 +17,13 @@
import java.util.List;
import java.util.Objects;
-import org.eclipse.cdt.cmake.is.core.IParserPreferences;
-import org.eclipse.cdt.cmake.is.core.IParserPreferencesAccess;
-import org.eclipse.cdt.cmake.is.core.internal.Plugin;
-import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfo;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsOutputProcessor;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.OutputSniffer;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferences;
+import org.eclipse.cdt.jsoncdb.core.IParserPreferencesAccess;
+import org.eclipse.cdt.jsoncdb.core.internal.Plugin;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawIndexerInfo;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.OutputSniffer;
import org.eclipse.cdt.core.ConsoleOutputStream;
import org.eclipse.cdt.core.ICommandLauncher;
import org.eclipse.cdt.core.resources.IConsole;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/DetectorConsole.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/DetectorConsole.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/DetectorConsole.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/DetectorConsole.java
index 2f7d86d..37b7798 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/DetectorConsole.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/DetectorConsole.java
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal.builtins;
+package org.eclipse.cdt.jsoncdb.core.internal.builtins;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.IBuildConsoleManager;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccBuiltinDetectionBehavior.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccBuiltinDetectionBehavior.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccBuiltinDetectionBehavior.java
index 8acb341..30d5b71 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccBuiltinDetectionBehavior.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccBuiltinDetectionBehavior.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal.builtins;
+package org.eclipse.cdt.jsoncdb.core.internal.builtins;
/**
* The {link IBuiltinsDetectionBehavior} for the GNU C and GNU C++ compiler
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
similarity index 82%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
index 6f2e610..f0bc88c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
@@ -7,14 +7,14 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal.builtins;
+package org.eclipse.cdt.jsoncdb.core.internal.builtins;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.GccOutputProcessor;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.GccOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsOutputProcessor;
/**
* The {link IBuiltinsDetectionBehavior} for the GNU C and GNU C++ compiler
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/Messages.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
similarity index 84%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/Messages.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
index 15987bc..df36000 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/Messages.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal.builtins;
+package org.eclipse.cdt.jsoncdb.core.internal.builtins;
import org.eclipse.osgi.util.NLS;
@@ -18,7 +18,7 @@
*
*/
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.cdt.cmake.is.core.internal.builtins.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.cdt.jsoncdb.core.internal.builtins.messages"; //$NON-NLS-1$
public static String CompilerBuiltinsDetector_errmsg_command_failed;
public static String CompilerBuiltinsDetector_msg_detection_finished;
public static String CompilerBuiltinsDetector_msg_detection_start;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/RawIndexerInfo.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/RawIndexerInfo.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/RawIndexerInfo.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/RawIndexerInfo.java
index 640a16d..63e6ec3 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/RawIndexerInfo.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/RawIndexerInfo.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.internal.builtins;
+package org.eclipse.cdt.jsoncdb.core.internal.builtins;
import java.util.ArrayList;
import java.util.Collections;
@@ -20,9 +20,9 @@
import java.util.Map.Entry;
import java.util.Objects;
-import org.eclipse.cdt.cmake.is.core.internal.Plugin;
-import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfo;
-import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfoCollector;
+import org.eclipse.cdt.jsoncdb.core.internal.Plugin;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawIndexerInfo;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawIndexerInfoCollector;
import org.eclipse.core.runtime.Platform;
/**
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/messages.properties b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/messages.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/messages.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/messages.properties b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/messages.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/messages.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/messages.properties b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/messages.properties
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/messages.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/package-info.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/package-info.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/package-info.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/package-info.java
index 305c5ab..7fe1dc3 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/package-info.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/package-info.java
@@ -15,4 +15,4 @@
*
* @author Martin Weber
*/
-package org.eclipse.cdt.cmake.is.core;
\ No newline at end of file
+package org.eclipse.cdt.jsoncdb.core;
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/Arglets.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/Arglets.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java
index 4233ade..b12bf03 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/Arglets.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java
@@ -6,12 +6,12 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet.IArgumentCollector;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet.IArgumentCollector;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -155,7 +155,7 @@
public static class MacroUndefineGeneric {
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgument(java.util.List, java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgument(java.util.List, java.lang.String)
*/
protected final int processArgument(IArgumentCollector resultCollector, String argsLine,
NameOptionMatcher optionMatcher) {
@@ -179,7 +179,7 @@
/**
* @param isSystemIncludePath <code>true</code> if the include path is a system include path otherwise <code>false</code>
* @param cwd the current working directory of the compiler at its invocation
- * @see org.eclipse.cdt.cmake.is.core.participant.IArglet#processArgument(IArgumentCollector,
+ * @see org.eclipse.cdt.jsoncdb.core.participant.IArglet#processArgument(IArgumentCollector,
* IPath, String)
*/
protected final int processArgument(boolean isSystemIncludePath, IArgumentCollector resultCollector, IPath cwd,
@@ -291,7 +291,7 @@
new NameValueOptionMatcher("-D" + REGEX_MACRO_NAME_SKIP_LEADING_WS, 1, -1), };
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
@@ -312,7 +312,7 @@
"-U" + REGEX_MACRO_NAME_SKIP_LEADING_WS, 1);
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgument(java.util.List, java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgument(java.util.List, java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
@@ -334,7 +334,7 @@
new NameOptionMatcher("-I" + REGEX_INCLUDEPATH_UNQUOTED_DIR, 1) };
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
@@ -356,7 +356,7 @@
new NameOptionMatcher("-isystem" + REGEX_INCLUDEPATH_UNQUOTED_DIR, 1), };
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
@@ -379,7 +379,7 @@
new NameOptionMatcher("-J" + "([^\\s]+)", 1), };
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
@@ -401,7 +401,7 @@
*/
public static abstract class BuiltinDetctionArgsGeneric {
/**
- * @see org.eclipse.cdt.cmake.is.core.participant.IArglet#processArgument(IArgumentCollector,
+ * @see org.eclipse.cdt.jsoncdb.core.participant.IArglet#processArgument(IArgumentCollector,
* IPath, String)
*/
protected final int processArgument(IArgumentCollector resultCollector, String argsLine,
@@ -475,7 +475,7 @@
Pattern.compile("--no-sysroot-prefix").matcher(EMPTY_STR) };
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
@@ -494,7 +494,7 @@
Pattern.compile("-ansi").matcher(EMPTY_STR), };
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolCommandlineParser.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolCommandlineParser.java
index ee65bab..8e92a0b 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolCommandlineParser.java
@@ -6,15 +6,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import java.util.Arrays;
import java.util.Objects;
import java.util.Optional;
-import org.eclipse.cdt.cmake.is.core.internal.ParseContext;
-import org.eclipse.cdt.cmake.is.core.internal.Plugin;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.internal.ParseContext;
+import org.eclipse.cdt.jsoncdb.core.internal.Plugin;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
@@ -185,7 +185,7 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.cdt.cmake.is.IParserHandler# getCompilerWorkingDirectory()
+ * @see org.eclipse.cdt.jsoncdb.IParserHandler# getCompilerWorkingDirectory()
*/
@Override
public IPath getCompilerWorkingDirectory() {
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolDetectionParticipant.java
similarity index 99%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolDetectionParticipant.java
index 5e5f7f3b..30a4e1c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolDetectionParticipant.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import java.util.Locale;
import java.util.Optional;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IArglet.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IArglet.java
similarity index 97%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IArglet.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IArglet.java
index 10a5bba..5fb6a4d 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IArglet.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IArglet.java
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import org.eclipse.core.runtime.IPath;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IParserHandler.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IParserHandler.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IParserHandler.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IParserHandler.java
index 0a15b70..f2fb17b 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IParserHandler.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IParserHandler.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import org.eclipse.core.runtime.IPath;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfo.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawIndexerInfo.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfo.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawIndexerInfo.java
index 5c19172..fdb675d 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfo.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawIndexerInfo.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import java.util.List;
import java.util.Map;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfoCollector.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawIndexerInfoCollector.java
similarity index 97%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfoCollector.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawIndexerInfoCollector.java
index 6fc3f34..f225d67 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfoCollector.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawIndexerInfoCollector.java
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
/**
* Gathers information about C preprocessor symbols and include paths collected
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IResponseFileArglet.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IResponseFileArglet.java
similarity index 96%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IResponseFileArglet.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IResponseFileArglet.java
index 631dae7..79e170b 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IResponseFileArglet.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IResponseFileArglet.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
/**
* Parses a 'response file' tool argument and its content.
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolCommandlineParser.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolCommandlineParser.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolCommandlineParser.java
index 6b275b1..f78d002 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolCommandlineParser.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolCommandlineParser.java
@@ -6,12 +6,12 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import java.util.List;
import java.util.Optional;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
import org.eclipse.core.runtime.IPath;
/**
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolDetectionParticipant.java
similarity index 97%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolDetectionParticipant.java
index 1a3578f..fbbf9b1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolDetectionParticipant.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import java.util.Optional;
@@ -19,7 +19,7 @@
* {@code compile_commands.json} file produced by cmake.
* <p>
* This interface is the expected interface for extensions provided for the
- * {@code org.eclipse.cdt.cmake.is.core.detectionParticipant} extension point.
+ * {@code org.eclipse.cdt.jsoncdb.core.detectionParticipant} extension point.
* </p>
*
* @author Martin Weber
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ParticipantTestUtil.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ParticipantTestUtil.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ParticipantTestUtil.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ParticipantTestUtil.java
index 4435a54..0f55e7f 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ParticipantTestUtil.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ParticipantTestUtil.java
@@ -7,9 +7,9 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
-import org.eclipse.cdt.cmake.is.core.internal.ParserDetection;
+import org.eclipse.cdt.jsoncdb.core.internal.ParserDetection;
/**
* Utility methods for unit testing.
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ResponseFileArglets.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ResponseFileArglets.java
similarity index 91%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ResponseFileArglets.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ResponseFileArglets.java
index e71354c..6f6f646 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ResponseFileArglets.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ResponseFileArglets.java
@@ -7,14 +7,14 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant;
+package org.eclipse.cdt.jsoncdb.core.participant;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.regex.Matcher;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.NameOptionMatcher;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.NameOptionMatcher;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -49,8 +49,8 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.cdt.cmake.is.IResponseFileArglet
- * #process(org.eclipse.cdt.cmake.is.IParserHandler, java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IResponseFileArglet
+ * #process(org.eclipse.cdt.jsoncdb.IParserHandler, java.lang.String)
*/
@Override
public int process(IParserHandler parserHandler, String argsLine) {
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/GccOutputProcessor.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
similarity index 97%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/GccOutputProcessor.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
index d8ab0fe..a04dd26 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/GccOutputProcessor.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant.builtins;
+package org.eclipse.cdt.jsoncdb.core.participant.builtins;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfoCollector;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawIndexerInfoCollector;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.core.settings.model.util.CDataUtil;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsDetectionBehavior.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsDetectionBehavior.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsDetectionBehavior.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsDetectionBehavior.java
index a56bedd..ff4b06c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsDetectionBehavior.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsDetectionBehavior.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant.builtins;
+package org.eclipse.cdt.jsoncdb.core.participant.builtins;
import java.util.List;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsOutputProcessor.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsOutputProcessor.java
similarity index 88%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsOutputProcessor.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsOutputProcessor.java
index 1e00aae..3f49773 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsOutputProcessor.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsOutputProcessor.java
@@ -7,9 +7,9 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant.builtins;
+package org.eclipse.cdt.jsoncdb.core.participant.builtins;
-import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfoCollector;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawIndexerInfoCollector;
/**
* Responsible for parsing the output that is produced when a compiler is
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/OutputSniffer.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/OutputSniffer.java
similarity index 94%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/OutputSniffer.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/OutputSniffer.java
index fea13e8..572dad8 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/OutputSniffer.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/OutputSniffer.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.participant.builtins;
+package org.eclipse.cdt.jsoncdb.core.participant.builtins;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Objects;
-import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfoCollector;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawIndexerInfoCollector;
/**
* An OutputStream that passes each line written to it to a
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/package-info.java b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/package-info.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/package-info.java
rename to cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/package-info.java
index 5ad4901..720f806 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/package-info.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/package-info.java
@@ -15,4 +15,4 @@
*
* @author Martin Weber
*/
-package org.eclipse.cdt.cmake.is.core.participant;
\ No newline at end of file
+package org.eclipse.cdt.jsoncdb.core.participant;
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.project b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.project
similarity index 89%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.project
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.project
index d1914c9..43e26b9 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.hpenonstop.tests</name>
+ <name>org.eclipse.cdt.jsoncdb.hpenonstop.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..2550512
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Copyright: %Bundle-Copyright
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.hpenonstop.tests
+Bundle-Version: 1.0.100.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Fragment-Host: org.eclipse.cdt.jsoncdb.hpenonstop
+Import-Package: org.junit
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.hpenonstop.tests
+Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
similarity index 71%
copy from cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
copy to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
index 8f0e3b6..e4e1f61 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
-#Properties file for org.eclipse.cdt.cmake.is.arm.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.arm.tests
+#Properties file for org.eclipse.cdt.jsoncdb.hpenonstop.tests
+Bundle-Name = org.eclipse.cdt.jsoncdb.hpenonstop.tests
Bundle-Vendor = Eclipse CDT
Bundle-Copyright = 2020 Martin Weber\n\
\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/about.html b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/build.properties b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/pom.xml
similarity index 93%
copy from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/pom.xml
copy to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/pom.xml
index d66cc20..a7b9a07 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/pom.xml
@@ -18,7 +18,7 @@
<version>10.4.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.hpenonstop.tests</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.hpenonstop.tests</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
<version>1.0.100-SNAPSHOT</version>
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/src/org/eclipse/cdt/cmake/is/hpenonstop/ToolDetectionParticipantTest.java b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/src/org/eclipse/cdt/jsoncdb/hpenonstop/ToolDetectionParticipantTest.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/src/org/eclipse/cdt/cmake/is/hpenonstop/ToolDetectionParticipantTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/src/org/eclipse/cdt/jsoncdb/hpenonstop/ToolDetectionParticipantTest.java
index acc2b8b..824645c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/src/org/eclipse/cdt/cmake/is/hpenonstop/ToolDetectionParticipantTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/src/org/eclipse/cdt/jsoncdb/hpenonstop/ToolDetectionParticipantTest.java
@@ -6,15 +6,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.hpenonstop;
+package org.eclipse.cdt.jsoncdb.hpenonstop;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Locale;
-import org.eclipse.cdt.cmake.is.core.participant.IToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.ParticipantTestUtil;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.ParticipantTestUtil;
import org.junit.Test;
/**
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.classpath b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.project
similarity index 93%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia/.project
copy to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.project
index 577ca14..2ad5219 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.nvidia</name>
+ <name>org.eclipse.cdt.jsoncdb.hpenonstop</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/META-INF/MANIFEST.MF
similarity index 61%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/META-INF/MANIFEST.MF
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/META-INF/MANIFEST.MF
index ddba325..1ca4746 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.microsoft;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.hpenonstop;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
org.eclipse.help,
- org.eclipse.cdt.cmake.is.core;bundle-version="1.0.0"
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.microsoft
+ org.eclipse.cdt.jsoncdb.core;bundle-version="1.0.0"
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.hpenonstop
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/about.html b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/build.properties b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/doc/compiler.xhtml b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/doc/compiler.xhtml
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/help_content_extension.xml b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/help_content_extension.xml
new file mode 100644
index 0000000..8d21362
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/help_content_extension.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<contentExtension>
+ <contribution content="doc/compiler.xhtml#lsp"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
+ <contribution content="doc/compiler.xhtml#builtins"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
+</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.properties b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.properties
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.xml b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.xml
new file mode 100644
index 0000000..9c0a03c
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension point="org.eclipse.cdt.jsoncdb.core.detectionParticipant">
+ <tool class="org.eclipse.cdt.jsoncdb.hpenonstop.HpeC89ToolDetectionParticipant"
+ displayName="HPE NonStop c89 C & C++"/>
+ <tool class="org.eclipse.cdt.jsoncdb.hpenonstop.HpeC99ToolDetectionParticipant"
+ displayName="HPE NonStop c99 C & C++"/>
+ <tool class="org.eclipse.cdt.jsoncdb.hpenonstop.HpeC11ToolDetectionParticipant"
+ displayName="HPE NonStop c11 C & C++"/>
+ </extension>
+ <extension
+ point="org.eclipse.help.contentExtension">
+ <contentExtension
+ file="help_content_extension.xml">
+ </contentExtension>
+ </extension>
+</plugin>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/pom.xml
similarity index 90%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/pom.xml
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/pom.xml
index 4b1a591..b63e18c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/pom.xml
@@ -19,10 +19,10 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.microsoft</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.hpenonstop</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC11ToolDetectionParticipant.java
similarity index 72%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC11ToolDetectionParticipant.java
index 03c596e..02982a6 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC11ToolDetectionParticipant.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.hpenonstop;
+package org.eclipse.cdt.jsoncdb.hpenonstop;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
/**
* HPE NonStop c11 C & C++.
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC89ToolDetectionParticipant.java
similarity index 72%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC89ToolDetectionParticipant.java
index 51b7082..52ed265 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC89ToolDetectionParticipant.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.hpenonstop;
+package org.eclipse.cdt.jsoncdb.hpenonstop;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
/**
* HPE NonStop c89 C & C++.
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC99ToolDetectionParticipant.java
similarity index 72%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC99ToolDetectionParticipant.java
index 130674e..7902ea0 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC99ToolDetectionParticipant.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.hpenonstop;
+package org.eclipse.cdt.jsoncdb.hpenonstop;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
/**
* HPE NonStop c99 C & C++.
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.classpath b/cmake/org.eclipse.cdt.jsoncdb.intel/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.intel/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project b/cmake/org.eclipse.cdt.jsoncdb.intel/.project
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.project
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.project
index 577ca14..d09a18a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.nvidia</name>
+ <name>org.eclipse.cdt.jsoncdb.intel</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.intel/META-INF/MANIFEST.MF
similarity index 61%
rename from cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF
rename to cmake/org.eclipse.cdt.jsoncdb.intel/META-INF/MANIFEST.MF
index 7ced5d2..797ea55 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.arm;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.intel;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
org.eclipse.help,
- org.eclipse.cdt.cmake.is.core;bundle-version="1.0.0"
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.arm
+ org.eclipse.cdt.jsoncdb.core;bundle-version="1.0.0"
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.intel
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/about.html b/cmake/org.eclipse.cdt.jsoncdb.intel/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.intel/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/build.properties b/cmake/org.eclipse.cdt.jsoncdb.intel/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.intel/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/doc/compiler.xhtml b/cmake/org.eclipse.cdt.jsoncdb.intel/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/doc/compiler.xhtml
rename to cmake/org.eclipse.cdt.jsoncdb.intel/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/help_content_extension.xml b/cmake/org.eclipse.cdt.jsoncdb.intel/help_content_extension.xml
new file mode 100644
index 0000000..1601ab5
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/help_content_extension.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<contentExtension>
+ <contribution content="doc/compiler.xhtml#lsp"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
+<!-- built-ins detection is not supported
+ <contribution content="doc/compiler.xhtml#builtins"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
+-->
+</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/plugin.properties b/cmake/org.eclipse.cdt.jsoncdb.intel/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/plugin.properties
rename to cmake/org.eclipse.cdt.jsoncdb.intel/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/plugin.xml b/cmake/org.eclipse.cdt.jsoncdb.intel/plugin.xml
new file mode 100644
index 0000000..8d07340
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/plugin.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension point="org.eclipse.cdt.jsoncdb.core.detectionParticipant">
+ <tool class="org.eclipse.cdt.jsoncdb.intel.IccToolDetectionParticipant"
+ displayName="Intel icc, C, Linux & OS X, EDG"/>
+ <tool class="org.eclipse.cdt.jsoncdb.intel.IclCandCppToolDetectionParticipant"
+ displayName="Intel icl, C & C++, Windows"/>
+ <tool class="org.eclipse.cdt.jsoncdb.intel.IclToolDetectionParticipant"
+ displayName="Intel icl, C, OS X, clang"/>
+ <tool class="org.eclipse.cdt.jsoncdb.intel.IcpcClangToolDetectionParticipant"
+ displayName="Intel icpc, C++, OS X, clang"/>
+ <tool class="org.eclipse.cdt.jsoncdb.intel.IcpcToolDetectionParticipant"
+ displayName="Intel icpc, C++, Linux & OS X, EDG"/>
+ </extension>
+ <extension
+ point="org.eclipse.help.contentExtension">
+ <contentExtension
+ file="help_content_extension.xml">
+ </contentExtension>
+ </extension>
+</plugin>
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.intel/pom.xml
similarity index 91%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml
copy to cmake/org.eclipse.cdt.jsoncdb.intel/pom.xml
index 9f35113..800c172 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/pom.xml
@@ -19,10 +19,10 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.nvidia</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.intel</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IccToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IccToolDetectionParticipant.java
similarity index 86%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IccToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IccToolDetectionParticipant.java
index b149ffe..9c20601 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IccToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IccToolDetectionParticipant.java
@@ -7,9 +7,9 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.intel;
+package org.eclipse.cdt.jsoncdb.intel;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
/**
* C, Linux & OS X, EDG.
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclCandCppToolDetectionParticipant.java
similarity index 73%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclCandCppToolDetectionParticipant.java
index 7335582..e1b9708 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclCandCppToolDetectionParticipant.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.intel;
+package org.eclipse.cdt.jsoncdb.intel;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
/**
* C + C++, Windows, EDG.
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclToolDetectionParticipant.java
similarity index 84%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclToolDetectionParticipant.java
index 147e70d..0449999 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclToolDetectionParticipant.java
@@ -7,9 +7,9 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.intel;
+package org.eclipse.cdt.jsoncdb.intel;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
/**
* C, OS X, clang.
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcClangToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcClangToolDetectionParticipant.java
similarity index 84%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcClangToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcClangToolDetectionParticipant.java
index 1380675..054ba6f 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcClangToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcClangToolDetectionParticipant.java
@@ -7,9 +7,9 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.intel;
+package org.eclipse.cdt.jsoncdb.intel;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
/**
* C++, OS X, clang.
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcToolDetectionParticipant.java
similarity index 84%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcToolDetectionParticipant.java
index a273d2d..148ffae 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcToolDetectionParticipant.java
@@ -7,9 +7,9 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.intel;
+package org.eclipse.cdt.jsoncdb.intel;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
/**
* C++, Linux & OS X, EDG.
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCToolCommandlineParser.java
similarity index 73%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCToolCommandlineParser.java
index 8484b00..f5188c9 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCToolCommandlineParser.java
@@ -7,12 +7,12 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.intel;
+package org.eclipse.cdt.jsoncdb.intel;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
/**
* An {@link IToolCommandlineParser} for the Intel C compilers.
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCppToolCommandlineParser.java
similarity index 73%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCppToolCommandlineParser.java
index cb90991..eca4db5 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCppToolCommandlineParser.java
@@ -7,12 +7,12 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.intel;
+package org.eclipse.cdt.jsoncdb.intel;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
/**
* An {@link IToolCommandlineParser} for the Intel C compilers.
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.project
similarity index 90%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project
copy to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.project
index 6b54c75..f691105 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.nvidia.tests</name>
+ <name>org.eclipse.cdt.jsoncdb.microsoft.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..12ee515
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Copyright: %Bundle-Copyright
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.microsoft.tests
+Bundle-Version: 1.0.100.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Fragment-Host: org.eclipse.cdt.jsoncdb.microsoft
+Import-Package: org.junit
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.microsoft.tests
+Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/OSGI-INF/l10n/bundle.properties
similarity index 71%
copy from cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
copy to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/OSGI-INF/l10n/bundle.properties
index 8f0e3b6..7af033a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
-#Properties file for org.eclipse.cdt.cmake.is.arm.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.arm.tests
+#Properties file for org.eclipse.cdt.jsoncdb.microsoft.tests
+Bundle-Name = org.eclipse.cdt.jsoncdb.microsoft.tests
Bundle-Vendor = Eclipse CDT
Bundle-Copyright = 2020 Martin Weber\n\
\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/about.html b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/build.properties b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/pom.xml
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/pom.xml
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/pom.xml
index d66cc20..7d1a7f1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/pom.xml
@@ -18,7 +18,8 @@
<version>10.4.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.hpenonstop.tests</artifactId>
+
+ <artifactId>org.eclipse.cdt.jsoncdb.microsoft.tests</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
<version>1.0.100-SNAPSHOT</version>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/src/org/eclipse/cdt/cmake/is/microsoft/ToolDetectionParticipantTest.java b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/src/org/eclipse/cdt/jsoncdb/microsoft/ToolDetectionParticipantTest.java
similarity index 91%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/src/org/eclipse/cdt/cmake/is/microsoft/ToolDetectionParticipantTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/src/org/eclipse/cdt/jsoncdb/microsoft/ToolDetectionParticipantTest.java
index e702bcd..7920a64 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/src/org/eclipse/cdt/cmake/is/microsoft/ToolDetectionParticipantTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/src/org/eclipse/cdt/jsoncdb/microsoft/ToolDetectionParticipantTest.java
@@ -6,15 +6,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.microsoft;
+package org.eclipse.cdt.jsoncdb.microsoft;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Locale;
-import org.eclipse.cdt.cmake.is.core.participant.IToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.ParticipantTestUtil;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.ParticipantTestUtil;
import org.junit.Test;
/**
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.classpath b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.project
similarity index 93%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia/.project
copy to cmake/org.eclipse.cdt.jsoncdb.microsoft/.project
index 577ca14..6fb72bd 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.nvidia</name>
+ <name>org.eclipse.cdt.jsoncdb.microsoft</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.microsoft/META-INF/MANIFEST.MF
similarity index 60%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/META-INF/MANIFEST.MF
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/META-INF/MANIFEST.MF
index d0c949a..66e4422 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.nvidia;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.microsoft;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
org.eclipse.help,
- org.eclipse.cdt.cmake.is.core;bundle-version="1.0.0"
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.nvidia
+ org.eclipse.cdt.jsoncdb.core;bundle-version="1.0.0"
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.microsoft
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/about.html b/cmake/org.eclipse.cdt.jsoncdb.microsoft/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/build.properties b/cmake/org.eclipse.cdt.jsoncdb.microsoft/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/doc/compiler.xhtml b/cmake/org.eclipse.cdt.jsoncdb.microsoft/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/doc/compiler.xhtml
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/help_content_extension.xml b/cmake/org.eclipse.cdt.jsoncdb.microsoft/help_content_extension.xml
new file mode 100644
index 0000000..faacd16
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft/help_content_extension.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<contentExtension>
+ <contribution content="doc/compiler.xhtml#lsp"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
+</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.properties b/cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.properties
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.xml b/cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.xml
similarity index 67%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.xml
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.xml
index 0ba9229..ae49f49 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension point="org.eclipse.cdt.cmake.is.core.detectionParticipant">
- <tool class="org.eclipse.cdt.cmake.is.microsoft.MsclToolDetectionParticipant"
+ <extension point="org.eclipse.cdt.jsoncdb.core.detectionParticipant">
+ <tool class="org.eclipse.cdt.jsoncdb.microsoft.MsclToolDetectionParticipant"
displayName="Microsoft cl C & C++"/>
</extension>
<extension
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.microsoft/pom.xml
similarity index 91%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml
copy to cmake/org.eclipse.cdt.jsoncdb.microsoft/pom.xml
index 9f35113..d30a5e8 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft/pom.xml
@@ -19,10 +19,10 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.nvidia</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.microsoft</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java b/cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolCommandlineParser.java
similarity index 81%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolCommandlineParser.java
index d648a49..a2a99f3 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolCommandlineParser.java
@@ -7,17 +7,17 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.microsoft;
+package org.eclipse.cdt.jsoncdb.microsoft;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.IncludePathGeneric;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.MacroDefineGeneric;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.MacroUndefineGeneric;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.NameOptionMatcher;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.NameValueOptionMatcher;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.IncludePathGeneric;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.MacroDefineGeneric;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.MacroUndefineGeneric;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.NameOptionMatcher;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.NameValueOptionMatcher;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
import org.eclipse.core.runtime.IPath;
/**
@@ -60,7 +60,7 @@
new NameOptionMatcher("[-/]I" + REGEX_INCLUDEPATH_UNQUOTED_DIR, 1), }; //$NON-NLS-1$
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
@@ -86,7 +86,7 @@
1, 2), };
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
@@ -104,7 +104,7 @@
"[-/]U" + REGEX_MACRO_NAME_SKIP_LEADING_WS, 1); //$NON-NLS-1$
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgument(java.util.List, java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgument(java.util.List, java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolDetectionParticipant.java
similarity index 84%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolDetectionParticipant.java
index 2fe6dad..7416175 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolDetectionParticipant.java
@@ -7,9 +7,9 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.microsoft;
+package org.eclipse.cdt.jsoncdb.microsoft;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
/**
* Microsoft C and C++ compiler (cl).
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.project
similarity index 90%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project
copy to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.project
index 6b54c75..3a8617f 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.nvidia.tests</name>
+ <name>org.eclipse.cdt.jsoncdb.nvidia.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/META-INF/MANIFEST.MF
similarity index 62%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/META-INF/MANIFEST.MF
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/META-INF/MANIFEST.MF
index 1ac831e..3a70ac3 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.nvidia.tests
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.nvidia.tests
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.cdt.cmake.is.nvidia
+Fragment-Host: org.eclipse.cdt.jsoncdb.nvidia
Import-Package: org.eclipse.cdt.core.settings.model,
org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.nvidia.tests
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.nvidia.tests
Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/OSGI-INF/l10n/bundle.properties
similarity index 72%
copy from cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
copy to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/OSGI-INF/l10n/bundle.properties
index 8f0e3b6..ece8440 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
-#Properties file for org.eclipse.cdt.cmake.is.arm.tests
-Bundle-Name = org.eclipse.cdt.cmake.is.arm.tests
+#Properties file for org.eclipse.cdt.jsoncdb.nvidia.tests
+Bundle-Name = org.eclipse.cdt.jsoncdb.nvidia.tests
Bundle-Vendor = Eclipse CDT
Bundle-Copyright = 2020 Martin Weber\n\
\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/about.html b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/build.properties b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/pom.xml
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/pom.xml
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/pom.xml
index aec848f..d2f069f 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/pom.xml
@@ -19,7 +19,7 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.nvidia.tests</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.nvidia.tests</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
<version>1.0.0-SNAPSHOT</version>
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathTest.java
similarity index 91%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathTest.java
index 8239101..76ac388 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathTest.java
@@ -6,12 +6,12 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.nvidia;
+package org.eclipse.cdt.jsoncdb.nvidia;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser.IResult;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser.IResult;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/ToolDetectionParticipantTest.java b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/ToolDetectionParticipantTest.java
similarity index 91%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/ToolDetectionParticipantTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/ToolDetectionParticipantTest.java
index 772885e..3ce009a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/ToolDetectionParticipantTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/ToolDetectionParticipantTest.java
@@ -6,15 +6,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.nvidia;
+package org.eclipse.cdt.jsoncdb.nvidia;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Locale;
-import org.eclipse.cdt.cmake.is.core.participant.IToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.ParticipantTestUtil;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.ParticipantTestUtil;
import org.junit.Test;
/**
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
index efe4205..1cfb803 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
@@ -6,13 +6,13 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.nvidia.builtins;
+package org.eclipse.cdt.jsoncdb.nvidia.builtins;
import static org.junit.Assert.assertEquals;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.IToolCommandlineParser.IResult;
-import org.eclipse.cdt.cmake.is.nvidia.NvccLangStdArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.IToolCommandlineParser.IResult;
+import org.eclipse.cdt.jsoncdb.nvidia.NvccLangStdArglet;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.junit.Before;
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccOutputProcessorTest.java
similarity index 90%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccOutputProcessorTest.java
index 0d2c75e..eaf3825 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccOutputProcessorTest.java
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.nvidia.builtins;
+package org.eclipse.cdt.jsoncdb.nvidia.builtins;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -20,9 +20,9 @@
import java.util.Map;
import java.util.Objects;
-import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfoCollector;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.GccOutputProcessor;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.OutputSniffer;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawIndexerInfoCollector;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.GccOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.OutputSniffer;
import org.junit.Before;
import org.junit.Test;
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/cbd-nvcc.output.txt b/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/cbd-nvcc.output.txt
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/cbd-nvcc.output.txt
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/cbd-nvcc.output.txt
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.classpath b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.classpath
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.classpath
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.gitignore b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.gitignore
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.gitignore
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.project
similarity index 93%
copy from cmake/org.eclipse.cdt.cmake.is.nvidia/.project
copy to cmake/org.eclipse.cdt.jsoncdb.nvidia/.project
index 577ca14..f6e5f9d 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/.project
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.cmake.is.nvidia</name>
+ <name>org.eclipse.cdt.jsoncdb.nvidia</name>
<comment></comment>
<projects>
</projects>
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.core.resources.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.jdt.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.jdt.launching.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.jdt.ui.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.m2e.core.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.m2e.core.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.pde.api.tools.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/.settings/org.eclipse.pde.prefs
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF
similarity index 61%
copy from cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF
copy to cmake/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF
index 7ced5d2..5a60bae 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Copyright: %Bundle-Copyright
-Bundle-SymbolicName: org.eclipse.cdt.cmake.is.arm;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.nvidia;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
org.eclipse.help,
- org.eclipse.cdt.cmake.is.core;bundle-version="1.0.0"
-Automatic-Module-Name: org.eclipse.cdt.cmake.is.arm
+ org.eclipse.cdt.jsoncdb.core;bundle-version="1.0.0"
+Automatic-Module-Name: org.eclipse.cdt.jsoncdb.nvidia
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/about.html b/cmake/org.eclipse.cdt.jsoncdb.nvidia/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/about.html
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/build.properties b/cmake/org.eclipse.cdt.jsoncdb.nvidia/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/build.properties
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/build.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/doc/compiler.xhtml b/cmake/org.eclipse.cdt.jsoncdb.nvidia/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/doc/compiler.xhtml
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/help_content_extension.xml b/cmake/org.eclipse.cdt.jsoncdb.nvidia/help_content_extension.xml
new file mode 100644
index 0000000..823e61c
--- /dev/null
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/help_content_extension.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<contentExtension>
+ <contribution content="doc/compiler.xhtml#lsp"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml#extra_detection_participant_list"/>
+ <contribution content="doc/compiler.xhtml#builtins"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
+ <contribution content="doc/compiler.xhtml#builtins_enhanced"
+ path="/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_enhanced_list"/>
+</contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.properties b/cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.properties
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.xml b/cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.xml
similarity index 68%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.xml
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.xml
index 33ccc75..ec56aee 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension point="org.eclipse.cdt.cmake.is.core.detectionParticipant">
+ <extension point="org.eclipse.cdt.jsoncdb.core.detectionParticipant">
<tool
- class="org.eclipse.cdt.cmake.is.nvidia.NvccToolDetectionParticipant"
+ class="org.eclipse.cdt.jsoncdb.nvidia.NvccToolDetectionParticipant"
displayName="NVidia.com nvcc, CUDA"/>
</extension>
<extension
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml b/cmake/org.eclipse.cdt.jsoncdb.nvidia/pom.xml
similarity index 91%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/pom.xml
index 9f35113..5909871 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/pom.xml
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/pom.xml
@@ -19,10 +19,10 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.cdt.cmake.is.nvidia</artifactId>
+ <artifactId>org.eclipse.cdt.jsoncdb.nvidia</artifactId>
<!-- always use .qualifier in manifest, we do not plan to publish this plugin
to a maven repo. (The repository version is a different thing) -->
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccBuiltinDetectionBehavior.java
similarity index 81%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccBuiltinDetectionBehavior.java
index 8f2df0b..248341f 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccBuiltinDetectionBehavior.java
@@ -7,14 +7,14 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.nvidia;
+package org.eclipse.cdt.jsoncdb.nvidia;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.GccOutputProcessor;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
-import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.GccOutputProcessor;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
+import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsOutputProcessor;
/**
* The {link IBuiltinsDetectionBehavior} for the NVidia CUDA compiler.
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java b/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java
similarity index 81%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java
index f369a12..576e404 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.nvidia;
+package org.eclipse.cdt.jsoncdb.nvidia;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.BuiltinDetctionArgsGeneric;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.BuiltinDetctionArgsGeneric;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
import org.eclipse.core.runtime.IPath;
/**
@@ -25,7 +25,7 @@
Pattern.compile("-std \\S+").matcher(""), }; //$NON-NLS-1$ //$NON-NLS-2$
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java b/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathArglet.java
similarity index 80%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathArglet.java
index 4750399..3590acb 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathArglet.java
@@ -7,11 +7,11 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.nvidia;
+package org.eclipse.cdt.jsoncdb.nvidia;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.IncludePathGeneric;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets.NameOptionMatcher;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.IncludePathGeneric;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets.NameOptionMatcher;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
import org.eclipse.core.runtime.IPath;
/**
@@ -30,7 +30,7 @@
new NameOptionMatcher("-isystem=" + "([^\\s]+)", 1), }; //$NON-NLS-1$ //$NON-NLS-2$
/*-
- * @see org.eclipse.cdt.cmake.is.IArglet#processArgs(java.lang.String)
+ * @see org.eclipse.cdt.jsoncdb.IArglet#processArgs(java.lang.String)
*/
@Override
public int processArgument(IArgumentCollector resultCollector, IPath cwd, String argsLine) {
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java b/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccToolDetectionParticipant.java
similarity index 75%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccToolDetectionParticipant.java
index 64797d3..9737df7 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java
+++ b/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccToolDetectionParticipant.java
@@ -7,13 +7,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-package org.eclipse.cdt.cmake.is.nvidia;
+package org.eclipse.cdt.jsoncdb.nvidia;
-import org.eclipse.cdt.cmake.is.core.participant.Arglets;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolCommandlineParser;
-import org.eclipse.cdt.cmake.is.core.participant.DefaultToolDetectionParticipant;
-import org.eclipse.cdt.cmake.is.core.participant.IArglet;
-import org.eclipse.cdt.cmake.is.core.participant.ResponseFileArglets;
+import org.eclipse.cdt.jsoncdb.core.participant.Arglets;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolCommandlineParser;
+import org.eclipse.cdt.jsoncdb.core.participant.DefaultToolDetectionParticipant;
+import org.eclipse.cdt.jsoncdb.core.participant.IArglet;
+import org.eclipse.cdt.jsoncdb.core.participant.ResponseFileArglets;
/**
* CUDA: nvcc compilers (POSIX compatible).
diff --git a/cmake/pom.xml b/cmake/pom.xml
index 4929d49..012a40e 100644
--- a/cmake/pom.xml
+++ b/cmake/pom.xml
@@ -30,18 +30,18 @@
<module>org.eclipse.cdt.cmake.core.tests</module>
<module>org.eclipse.cdt.cmake.ui</module>
<module>org.eclipse.cdt.cmake-feature</module>
- <module>org.eclipse.cdt.cmake.is.core.doc</module>
- <module>org.eclipse.cdt.cmake.is.core</module>
- <module>org.eclipse.cdt.cmake.is.core.tests</module>
- <module>org.eclipse.cdt.cmake.is.core.ui</module>
- <module>org.eclipse.cdt.cmake.is.arm</module>
- <module>org.eclipse.cdt.cmake.is.arm.tests</module>
- <module>org.eclipse.cdt.cmake.is.hpenonstop</module>
- <module>org.eclipse.cdt.cmake.is.hpenonstop.tests</module>
- <module>org.eclipse.cdt.cmake.is.intel</module>
- <module>org.eclipse.cdt.cmake.is.nvidia</module>
- <module>org.eclipse.cdt.cmake.is.nvidia.tests</module>
- <module>org.eclipse.cdt.cmake.is.microsoft</module>
- <module>org.eclipse.cdt.cmake.is.microsoft.tests</module>
+ <module>org.eclipse.cdt.jsoncdb.core.doc</module>
+ <module>org.eclipse.cdt.jsoncdb.core</module>
+ <module>org.eclipse.cdt.jsoncdb.core.tests</module>
+ <module>org.eclipse.cdt.jsoncdb.core.ui</module>
+ <module>org.eclipse.cdt.jsoncdb.arm</module>
+ <module>org.eclipse.cdt.jsoncdb.arm.tests</module>
+ <module>org.eclipse.cdt.jsoncdb.hpenonstop</module>
+ <module>org.eclipse.cdt.jsoncdb.hpenonstop.tests</module>
+ <module>org.eclipse.cdt.jsoncdb.intel</module>
+ <module>org.eclipse.cdt.jsoncdb.nvidia</module>
+ <module>org.eclipse.cdt.jsoncdb.nvidia.tests</module>
+ <module>org.eclipse.cdt.jsoncdb.microsoft</module>
+ <module>org.eclipse.cdt.jsoncdb.microsoft.tests</module>
</modules>
</project>
diff --git a/doc/org.eclipse.cdt.doc.isv/guide/deprecated_API_removals.html b/doc/org.eclipse.cdt.doc.isv/guide/deprecated_API_removals.html
index c0ab241..b5ef018 100644
--- a/doc/org.eclipse.cdt.doc.isv/guide/deprecated_API_removals.html
+++ b/doc/org.eclipse.cdt.doc.isv/guide/deprecated_API_removals.html
@@ -20,14 +20,12 @@
</p>
<p>
- API Changes prior to CDT 10.0 / 2020-09.
+ API Changes in CDT 10.4.0
</p>
- <p>
- Prior to CDT 10 release API changes were published as part of the <a
- href="https://wiki.eclipse.org/CDT/User/NewInCDT">New and Noteworthy</a> entries for that release. From CDT 10
- forward breaking API changes are included in this document.
- </p>
-
+ <ol>
+ <li><a href="#jsoncdb">Package org.eclipse.cdt.cmake.is.core.participant has been renamed to
+ org.eclipse.cdt.jsoncdb.core.participant.</a></li>
+ </ol>
<p>
API Changes in CDT 10.0.
</p>
@@ -66,8 +64,27 @@
<li><a href="#GnuMakefileGenerator.addDefaultHeader">Changed methods from static to non-static</a></li>
</ol>
- <hr>
+ <p>
+ API Changes prior to CDT 10.0 / 2020-09.
+ </p>
+ <p>
+ Prior to CDT 10 release API changes were published as part of the <a
+ href="https://wiki.eclipse.org/CDT/User/NewInCDT">New and Noteworthy</a> entries for that release. From CDT 10
+ forward breaking API changes are included in this document.
+ </p>
+ <hr>
+ <h2>API Changes in CDT 10.4.0.</h2>
+ <h3>1. <a name="jsoncdb">Package org.eclipse.cdt.cmake.is.core.participant has been renamed to
+ org.eclipse.cdt.jsoncdb.core.participant.</a></h3>
+ <p>
+ Affects CMake build, indexer support.<br> Package org.eclipse.cdt.cmake.is.core.participant was inadvertently not marked as experimental.
+ Third-party compiler vendors that provide a plugin teaching Eclipse CDT their compiler specific command-line options
+ will have to update the import statements in their plugin's code.
+ See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=564349" target="_blank">Bug 564349</a>.
+ </p>
+
+ <hr>
<h2>API Changes in CDT 10.0.</h2>
<h3>1. <a name="java11">Eclipse CDT requires Java 11 as a minimum to build and run.</a></h3>
<p>
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index f8b6d69..19b44bc 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -224,34 +224,34 @@
<bundle id="org.eclipse.tools.templates.freemarker.source" version="0.0.0"/>
<bundle id="org.eclipse.tools.templates.ui" version="0.0.0"/>
<bundle id="org.eclipse.tools.templates.ui.source" version="0.0.0"/>
- <bundle id="org.eclipse.cdt.cmake.is.arm">
+ <bundle id="org.eclipse.cdt.jsoncdb.arm">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.arm.source">
+ <bundle id="org.eclipse.cdt.jsoncdb.arm.source">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.hpenonstop">
+ <bundle id="org.eclipse.cdt.jsoncdb.hpenonstop">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.hpenonstop.source">
+ <bundle id="org.eclipse.cdt.jsoncdb.hpenonstop.source">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.intel">
+ <bundle id="org.eclipse.cdt.jsoncdb.intel">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.intel.source">
+ <bundle id="org.eclipse.cdt.jsoncdb.intel.source">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.microsoft">
+ <bundle id="org.eclipse.cdt.jsoncdb.microsoft">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.microsoft.source">
+ <bundle id="org.eclipse.cdt.jsoncdb.microsoft.source">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.nvidia">
+ <bundle id="org.eclipse.cdt.jsoncdb.nvidia">
<category name="extra"/>
</bundle>
- <bundle id="org.eclipse.cdt.cmake.is.nvidia.source">
+ <bundle id="org.eclipse.cdt.jsoncdb.nvidia.source">
<category name="extra"/>
</bundle>
<category-def name="main" label="CDT Main Features"/>
