1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00

Bug 567488: Move cmake code to cmake dir

Change-Id: If3df1f176ed82475d01a047c3a6d8c0882bb1d76
Signed-off-by: Martin Weber <fifteenknots505@gmail.com>
This commit is contained in:
Martin Weber 2020-10-13 22:10:58 +02:00 committed by Jonah Graham
parent 13310b6cd7
commit af1b6fa238
93 changed files with 13 additions and 9 deletions

View file

@ -12,12 +12,12 @@
<artifactId>cmake-aggregator</artifactId> <artifactId>cmake-aggregator</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<!-- aggregates just the cmake bundles --> <!-- aggregates just the cmake bundles
Convenient if you focus on working on the cmake bundles only.
-->
<modules> <modules>
<module>../../releng/org.eclipse.cdt.target</module> <module>../../releng/org.eclipse.cdt.target</module>
<module>..</module> <module>..</module>
<!-- remove once org.eclipse.cdt.cmake bundles moved from /build below /cmake -->
<module>../../build/org.eclipse.cdt.cmake.core</module>
</modules> </modules>
</project> </project>

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.cmake.ui;singleton:=true 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-Activator: org.eclipse.cdt.cmake.ui.internal.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View file

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 5 KiB

View file

@ -16,7 +16,10 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>org.eclipse.cdt.cmake.core</module>
<module>org.eclipse.cdt.cmake.core.tests</module> <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.doc</module>
<module>org.eclipse.cdt.cmake.is.core</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.tests</module>

View file

@ -112,10 +112,6 @@
<module>build/org.eclipse.cdt.autotools.ui</module> <module>build/org.eclipse.cdt.autotools.ui</module>
<module>build/org.eclipse.cdt.autotools-feature</module> <module>build/org.eclipse.cdt.autotools-feature</module>
<module>build/org.eclipse.cdt.cmake.core</module>
<module>build/org.eclipse.cdt.cmake.ui</module>
<module>build/org.eclipse.cdt.cmake-feature</module>
<module>build/org.eclipse.cdt.meson.core</module> <module>build/org.eclipse.cdt.meson.core</module>
<module>build/org.eclipse.cdt.meson.docs</module> <module>build/org.eclipse.cdt.meson.docs</module>
<module>build/org.eclipse.cdt.meson.ui</module> <module>build/org.eclipse.cdt.meson.ui</module>
@ -278,7 +274,6 @@
<module>build/org.eclipse.cdt.make.ui.tests</module> <module>build/org.eclipse.cdt.make.ui.tests</module>
<module>build/org.eclipse.cdt.autotools.tests</module> <module>build/org.eclipse.cdt.autotools.tests</module>
<module>build/org.eclipse.cdt.autotools.ui.tests</module> <module>build/org.eclipse.cdt.autotools.ui.tests</module>
<module>build/org.eclipse.cdt.cmake.ui.tests</module>
<module>build/org.eclipse.cdt.meson.ui.tests</module> <module>build/org.eclipse.cdt.meson.ui.tests</module>
<module>codan/org.eclipse.cdt.codan.core.tests</module> <module>codan/org.eclipse.cdt.codan.core.tests</module>
<module>codan/org.eclipse.cdt.codan.checkers.ui.tests</module> <module>codan/org.eclipse.cdt.codan.checkers.ui.tests</module>

View file

@ -49,6 +49,12 @@ git ls-files -- \*/feature.xml | while read feature_xml; do
# early copyright year. # early copyright year.
feature_start_year=2014 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) feature_start_year=$(git log --reverse --format='%ad' --date="format:%Y" -- $feature_xml $plugin_dir | head -1)
;; ;;