diff --git a/cmake/aggregator/pom.xml b/cmake/aggregator/pom.xml index 50156b138fa..adca4a4db77 100644 --- a/cmake/aggregator/pom.xml +++ b/cmake/aggregator/pom.xml @@ -12,12 +12,12 @@ cmake-aggregator pom - + ../../releng/org.eclipse.cdt.target .. - - ../../build/org.eclipse.cdt.cmake.core diff --git a/build/org.eclipse.cdt.cmake-feature/.project b/cmake/org.eclipse.cdt.cmake-feature/.project similarity index 100% rename from build/org.eclipse.cdt.cmake-feature/.project rename to cmake/org.eclipse.cdt.cmake-feature/.project diff --git a/build/org.eclipse.cdt.cmake-feature/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.cmake-feature/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake-feature/.settings/org.eclipse.core.resources.prefs rename to cmake/org.eclipse.cdt.cmake-feature/.settings/org.eclipse.core.resources.prefs diff --git a/build/org.eclipse.cdt.cmake-feature/build.properties b/cmake/org.eclipse.cdt.cmake-feature/build.properties similarity index 100% rename from build/org.eclipse.cdt.cmake-feature/build.properties rename to cmake/org.eclipse.cdt.cmake-feature/build.properties diff --git a/build/org.eclipse.cdt.cmake-feature/feature.properties b/cmake/org.eclipse.cdt.cmake-feature/feature.properties similarity index 100% rename from build/org.eclipse.cdt.cmake-feature/feature.properties rename to cmake/org.eclipse.cdt.cmake-feature/feature.properties diff --git a/build/org.eclipse.cdt.cmake-feature/feature.xml b/cmake/org.eclipse.cdt.cmake-feature/feature.xml similarity index 100% rename from build/org.eclipse.cdt.cmake-feature/feature.xml rename to cmake/org.eclipse.cdt.cmake-feature/feature.xml diff --git a/build/org.eclipse.cdt.cmake.core/.classpath b/cmake/org.eclipse.cdt.cmake.core/.classpath similarity index 100% rename from build/org.eclipse.cdt.cmake.core/.classpath rename to cmake/org.eclipse.cdt.cmake.core/.classpath diff --git a/build/org.eclipse.cdt.cmake.core/.project b/cmake/org.eclipse.cdt.cmake.core/.project similarity index 100% rename from build/org.eclipse.cdt.cmake.core/.project rename to cmake/org.eclipse.cdt.cmake.core/.project diff --git a/build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.core.resources.prefs rename to cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.core.resources.prefs diff --git a/build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.core.prefs rename to cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.core.prefs diff --git a/build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.launching.prefs rename to cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.launching.prefs diff --git a/build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.ui.prefs rename to cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.jdt.ui.prefs diff --git a/build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.pde.api.tools.prefs rename to cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.pde.api.tools.prefs diff --git a/build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.pde.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.core/.settings/org.eclipse.pde.prefs rename to cmake/org.eclipse.cdt.cmake.core/.settings/org.eclipse.pde.prefs diff --git a/build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF similarity index 100% rename from build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF rename to cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF diff --git a/build/org.eclipse.cdt.cmake.core/about.html b/cmake/org.eclipse.cdt.cmake.core/about.html similarity index 100% rename from build/org.eclipse.cdt.cmake.core/about.html rename to cmake/org.eclipse.cdt.cmake.core/about.html diff --git a/build/org.eclipse.cdt.cmake.core/build.properties b/cmake/org.eclipse.cdt.cmake.core/build.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.core/build.properties rename to cmake/org.eclipse.cdt.cmake.core/build.properties diff --git a/build/org.eclipse.cdt.cmake.core/plugin.properties b/cmake/org.eclipse.cdt.cmake.core/plugin.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.core/plugin.properties rename to cmake/org.eclipse.cdt.cmake.core/plugin.properties diff --git a/build/org.eclipse.cdt.cmake.core/plugin.xml b/cmake/org.eclipse.cdt.cmake.core/plugin.xml similarity index 100% rename from build/org.eclipse.cdt.cmake.core/plugin.xml rename to cmake/org.eclipse.cdt.cmake.core/plugin.xml diff --git a/build/org.eclipse.cdt.cmake.core/schema/toolChainProvider.exsd b/cmake/org.eclipse.cdt.cmake.core/schema/toolChainProvider.exsd similarity index 100% rename from build/org.eclipse.cdt.cmake.core/schema/toolChainProvider.exsd rename to cmake/org.eclipse.cdt.cmake.core/schema/toolChainProvider.exsd diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeNature.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeNature.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeNature.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeNature.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeProjectGenerator.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeProjectGenerator.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeProjectGenerator.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeProjectGenerator.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeToolChainEvent.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeToolChainEvent.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeToolChainEvent.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeToolChainEvent.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainFile.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainFile.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainFile.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainFile.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainListener.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainListener.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainListener.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainListener.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainManager.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainManager.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainManager.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainManager.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainProvider.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainProvider.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainProvider.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeToolChainProvider.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/Activator.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/Activator.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/Activator.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/Activator.java diff --git a/build/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 similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfigurationProvider.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfigurationProvider.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfigurationProvider.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfigurationProvider.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeConsoleWrapper.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeConsoleWrapper.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeConsoleWrapper.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeConsoleWrapper.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeExecutionMarkerFactory.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeExecutionMarkerFactory.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeExecutionMarkerFactory.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeExecutionMarkerFactory.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeToolChainFile.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeToolChainFile.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeToolChainFile.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeToolChainFile.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeToolChainManager.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeToolChainManager.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeToolChainManager.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeToolChainManager.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeUtils.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeUtils.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeUtils.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeUtils.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/Messages.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/Messages.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/Messages.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/Messages.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ParsingConsoleOutputStream.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ParsingConsoleOutputStream.java similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ParsingConsoleOutputStream.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ParsingConsoleOutputStream.java diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties diff --git a/build/org.eclipse.cdt.cmake.core/templates/simple/CMakeLists.txt b/cmake/org.eclipse.cdt.cmake.core/templates/simple/CMakeLists.txt similarity index 100% rename from build/org.eclipse.cdt.cmake.core/templates/simple/CMakeLists.txt rename to cmake/org.eclipse.cdt.cmake.core/templates/simple/CMakeLists.txt diff --git a/build/org.eclipse.cdt.cmake.core/templates/simple/main.cpp b/cmake/org.eclipse.cdt.cmake.core/templates/simple/main.cpp similarity index 100% rename from build/org.eclipse.cdt.cmake.core/templates/simple/main.cpp rename to cmake/org.eclipse.cdt.cmake.core/templates/simple/main.cpp diff --git a/build/org.eclipse.cdt.cmake.core/templates/simple/manifest.xml b/cmake/org.eclipse.cdt.cmake.core/templates/simple/manifest.xml similarity index 100% rename from build/org.eclipse.cdt.cmake.core/templates/simple/manifest.xml rename to cmake/org.eclipse.cdt.cmake.core/templates/simple/manifest.xml diff --git a/build/org.eclipse.cdt.cmake.ui.tests/.classpath b/cmake/org.eclipse.cdt.cmake.ui.tests/.classpath similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/.classpath rename to cmake/org.eclipse.cdt.cmake.ui.tests/.classpath diff --git a/build/org.eclipse.cdt.cmake.ui.tests/.project b/cmake/org.eclipse.cdt.cmake.ui.tests/.project similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/.project rename to cmake/org.eclipse.cdt.cmake.ui.tests/.project diff --git a/build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.core.resources.prefs rename to cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.core.resources.prefs diff --git a/build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.core.prefs rename to cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.launching.prefs rename to cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.launching.prefs diff --git a/build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.ui.prefs rename to cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.pde.api.tools.prefs rename to cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.pde.api.tools.prefs diff --git a/build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.pde.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.pde.prefs rename to cmake/org.eclipse.cdt.cmake.ui.tests/.settings/org.eclipse.pde.prefs diff --git a/build/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF rename to cmake/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF diff --git a/build/org.eclipse.cdt.cmake.ui.tests/about.html b/cmake/org.eclipse.cdt.cmake.ui.tests/about.html similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/about.html rename to cmake/org.eclipse.cdt.cmake.ui.tests/about.html diff --git a/build/org.eclipse.cdt.cmake.ui.tests/build.properties b/cmake/org.eclipse.cdt.cmake.ui.tests/build.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/build.properties rename to cmake/org.eclipse.cdt.cmake.ui.tests/build.properties diff --git a/build/org.eclipse.cdt.cmake.ui.tests/plugin.properties b/cmake/org.eclipse.cdt.cmake.ui.tests/plugin.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/plugin.properties rename to cmake/org.eclipse.cdt.cmake.ui.tests/plugin.properties diff --git a/build/org.eclipse.cdt.cmake.ui.tests/pom.xml b/cmake/org.eclipse.cdt.cmake.ui.tests/pom.xml similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/pom.xml rename to cmake/org.eclipse.cdt.cmake.ui.tests/pom.xml diff --git a/build/org.eclipse.cdt.cmake.ui.tests/src/org/eclipse/cdt/cmake/ui/internal/tests/AutomatedIntegrationSuite.java b/cmake/org.eclipse.cdt.cmake.ui.tests/src/org/eclipse/cdt/cmake/ui/internal/tests/AutomatedIntegrationSuite.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/src/org/eclipse/cdt/cmake/ui/internal/tests/AutomatedIntegrationSuite.java rename to cmake/org.eclipse.cdt.cmake.ui.tests/src/org/eclipse/cdt/cmake/ui/internal/tests/AutomatedIntegrationSuite.java diff --git a/build/org.eclipse.cdt.cmake.ui.tests/src/org/eclipse/cdt/cmake/ui/internal/tests/NewCMakeProjectTest.java b/cmake/org.eclipse.cdt.cmake.ui.tests/src/org/eclipse/cdt/cmake/ui/internal/tests/NewCMakeProjectTest.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/src/org/eclipse/cdt/cmake/ui/internal/tests/NewCMakeProjectTest.java rename to cmake/org.eclipse.cdt.cmake.ui.tests/src/org/eclipse/cdt/cmake/ui/internal/tests/NewCMakeProjectTest.java diff --git a/build/org.eclipse.cdt.cmake.ui.tests/swtbot-test-plugin.properties b/cmake/org.eclipse.cdt.cmake.ui.tests/swtbot-test-plugin.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.ui.tests/swtbot-test-plugin.properties rename to cmake/org.eclipse.cdt.cmake.ui.tests/swtbot-test-plugin.properties diff --git a/build/org.eclipse.cdt.cmake.ui/.classpath b/cmake/org.eclipse.cdt.cmake.ui/.classpath similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/.classpath rename to cmake/org.eclipse.cdt.cmake.ui/.classpath diff --git a/build/org.eclipse.cdt.cmake.ui/.project b/cmake/org.eclipse.cdt.cmake.ui/.project similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/.project rename to cmake/org.eclipse.cdt.cmake.ui/.project diff --git a/build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.core.resources.prefs b/cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.core.resources.prefs rename to cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.core.resources.prefs diff --git a/build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.core.prefs b/cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.core.prefs rename to cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.launching.prefs b/cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.launching.prefs rename to cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.launching.prefs diff --git a/build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.ui.prefs b/cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.ui.prefs rename to cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.jdt.ui.prefs diff --git a/build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.pde.api.tools.prefs b/cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.pde.api.tools.prefs rename to cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.pde.api.tools.prefs diff --git a/build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.pde.prefs b/cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.pde.prefs similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.pde.prefs rename to cmake/org.eclipse.cdt.cmake.ui/.settings/org.eclipse.pde.prefs diff --git a/build/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF similarity index 96% rename from build/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF rename to cmake/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF index 2d2f4b2a50d..53d806fc2c8 100644 --- a/build/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF +++ b/cmake/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.cmake.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.100.qualifier Bundle-Activator: org.eclipse.cdt.cmake.ui.internal.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, diff --git a/build/org.eclipse.cdt.cmake.ui/about.html b/cmake/org.eclipse.cdt.cmake.ui/about.html similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/about.html rename to cmake/org.eclipse.cdt.cmake.ui/about.html diff --git a/build/org.eclipse.cdt.cmake.ui/about.ini b/cmake/org.eclipse.cdt.cmake.ui/about.ini similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/about.ini rename to cmake/org.eclipse.cdt.cmake.ui/about.ini diff --git a/build/org.eclipse.cdt.cmake.ui/about.mappings b/cmake/org.eclipse.cdt.cmake.ui/about.mappings similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/about.mappings rename to cmake/org.eclipse.cdt.cmake.ui/about.mappings diff --git a/build/org.eclipse.cdt.cmake.ui/about.properties b/cmake/org.eclipse.cdt.cmake.ui/about.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/about.properties rename to cmake/org.eclipse.cdt.cmake.ui/about.properties diff --git a/build/org.eclipse.cdt.cmake.ui/build.properties b/cmake/org.eclipse.cdt.cmake.ui/build.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/build.properties rename to cmake/org.eclipse.cdt.cmake.ui/build.properties diff --git a/build/org.eclipse.cdt.cmake.ui/cdt_logo_icon32.png b/cmake/org.eclipse.cdt.cmake.ui/cdt_logo_icon32.png similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/cdt_logo_icon32.png rename to cmake/org.eclipse.cdt.cmake.ui/cdt_logo_icon32.png diff --git a/build/org.eclipse.cdt.cmake.ui/icons/cmake_logo-main.png b/cmake/org.eclipse.cdt.cmake.ui/icons/cmake_logo-main.png similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/icons/cmake_logo-main.png rename to cmake/org.eclipse.cdt.cmake.ui/icons/cmake_logo-main.png diff --git a/build/org.eclipse.cdt.cmake.ui/plugin.properties b/cmake/org.eclipse.cdt.cmake.ui/plugin.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/plugin.properties rename to cmake/org.eclipse.cdt.cmake.ui/plugin.properties diff --git a/build/org.eclipse.cdt.cmake.ui/plugin.xml b/cmake/org.eclipse.cdt.cmake.ui/plugin.xml similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/plugin.xml rename to cmake/org.eclipse.cdt.cmake.ui/plugin.xml diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/internal/ui/properties/CMakePropertyPage.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/internal/ui/properties/CMakePropertyPage.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/internal/ui/properties/CMakePropertyPage.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/internal/ui/properties/CMakePropertyPage.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Activator.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Activator.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Activator.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Activator.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePreferencePage.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePreferencePage.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePreferencePage.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePreferencePage.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePropertyCombo.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePropertyCombo.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePropertyCombo.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePropertyCombo.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePropertyText.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePropertyText.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePropertyText.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakePropertyText.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/EmptyCMakeProjectWizard.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/EmptyCMakeProjectWizard.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/EmptyCMakeProjectWizard.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/EmptyCMakeProjectWizard.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/ICMakePropertyPageControl.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/ICMakePropertyPageControl.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/ICMakePropertyPageControl.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/ICMakePropertyPageControl.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFileWizard.java b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFileWizard.java similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFileWizard.java rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFileWizard.java diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/messages.properties b/cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/messages.properties similarity index 100% rename from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/messages.properties rename to cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/messages.properties diff --git a/cmake/pom.xml b/cmake/pom.xml index cce4606eac8..ed6b8a9cddc 100644 --- a/cmake/pom.xml +++ b/cmake/pom.xml @@ -16,7 +16,10 @@ pom + org.eclipse.cdt.cmake.core org.eclipse.cdt.cmake.core.tests + org.eclipse.cdt.cmake.ui + org.eclipse.cdt.cmake-feature org.eclipse.cdt.cmake.is.core.doc org.eclipse.cdt.cmake.is.core org.eclipse.cdt.cmake.is.core.tests diff --git a/pom.xml b/pom.xml index f8bc13d3666..313595cc432 100644 --- a/pom.xml +++ b/pom.xml @@ -112,10 +112,6 @@ build/org.eclipse.cdt.autotools.ui build/org.eclipse.cdt.autotools-feature - build/org.eclipse.cdt.cmake.core - build/org.eclipse.cdt.cmake.ui - build/org.eclipse.cdt.cmake-feature - build/org.eclipse.cdt.meson.core build/org.eclipse.cdt.meson.docs build/org.eclipse.cdt.meson.ui @@ -278,7 +274,6 @@ build/org.eclipse.cdt.make.ui.tests build/org.eclipse.cdt.autotools.tests build/org.eclipse.cdt.autotools.ui.tests - build/org.eclipse.cdt.cmake.ui.tests build/org.eclipse.cdt.meson.ui.tests codan/org.eclipse.cdt.codan.core.tests codan/org.eclipse.cdt.codan.checkers.ui.tests diff --git a/releng/scripts/check_features.sh b/releng/scripts/check_features.sh index 31808de43ac..fc96aaf9a8e 100755 --- a/releng/scripts/check_features.sh +++ b/releng/scripts/check_features.sh @@ -49,6 +49,12 @@ git ls-files -- \*/feature.xml | while read feature_xml; do # early copyright year. feature_start_year=2014 ;; + cmake/org.eclipse.cdt.cmake-feature/feature.xml) + # The git history does not show the proper start year for cmake because of Bug 567488 + # Note, we can't simply use --follow because that causes other features to have a too + # early copyright year. + feature_start_year=2015 + ;; *) feature_start_year=$(git log --reverse --format='%ad' --date="format:%Y" -- $feature_xml $plugin_dir | head -1) ;;