mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-06 09:16:02 +02:00
Bug 558827: Add build id timestamp to features properly
This was lost when the build system was moved to Maven/Tycho for CDT 8 and restores the information. Note that with the p2 baseline compare and replace this will show the build id of when the branding plugin (the one with the about.mappings) was built, which compared to the feature version may be older. The about.mappings, as it is generated on each build, is ignored from p2 compare and replace. Change-Id: I38d1fcc5f618d4037baa2c8b908952421c712fc6
This commit is contained in:
Jonah Graham
parent
d9a16a23e2
commit
ba208cbd06
27 changed files with 88 additions and 54 deletions
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %Bundle-Name
|
||||
Bundle-SymbolicName: org.eclipse.cdt.build.crossgcc;singleton:=true
|
||||
Bundle-Version: 1.1.100.qualifier
|
||||
Bundle-Version: 1.1.200.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.internal.build.crossgcc.Activator
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.cdt.core;bundle-version="5.1.0",
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.launch.remote;singleton:=true
|
||||
Bundle-Version: 2.5.1.qualifier
|
||||
Bundle-Version: 2.5.100.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.internal.launch.remote.Activator
|
||||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.eclipse.cdt.launch,
|
||||
|
|
|
|||
|
|
@ -3,4 +3,7 @@
|
|||
# java.io.Properties file (ISO 8859-1 with "\" escapes)
|
||||
# This file does not need to be translated.
|
||||
|
||||
0=@build@
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.gdb;singleton:=true
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Version: 7.0.100.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.gdb.internal.Activator
|
||||
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %Bundle-Name.1
|
||||
Bundle-SymbolicName: org.eclipse.cdt.core.lrparser;singleton:=true
|
||||
Bundle-Version: 5.2.200.qualifier
|
||||
Bundle-Version: 5.2.300.qualifier
|
||||
Bundle-ClassPath: .
|
||||
Require-Bundle: org.eclipse.cdt.core,
|
||||
net.sourceforge.lpg.lpgjavaruntime;bundle-version="1.1.0";visibility:=reexport,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
31
pom.xml
31
pom.xml
|
|
@ -66,6 +66,9 @@
|
|||
<skipTests>${cdt-other.skip.tests}</skipTests>
|
||||
<dsf.gdb.tests.gdbPath>/shared/common/gdb/gdb-all/bin</dsf.gdb.tests.gdbPath>
|
||||
<cdt.tests.dsf.gdb.versions>gdb.8.3</cdt.tests.dsf.gdb.versions>
|
||||
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
|
||||
<buildTimestamp>${maven.build.timestamp}</buildTimestamp>
|
||||
<buildId>${buildTimestamp}</buildId>
|
||||
</properties>
|
||||
|
||||
<licenses>
|
||||
|
|
@ -472,6 +475,25 @@
|
|||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>about-mappings</id>
|
||||
<activation>
|
||||
<file>
|
||||
<exists>about.mappings</exists>
|
||||
</file>
|
||||
</activation>
|
||||
<build>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>.</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>about.mappings</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>skip-all-tests</id>
|
||||
<properties>
|
||||
|
|
@ -807,6 +829,14 @@
|
|||
<sourceReferences>
|
||||
<generate>true</generate>
|
||||
</sourceReferences>
|
||||
<additionalFileSets>
|
||||
<fileSet>
|
||||
<directory>${project.build.outputDirectory}</directory>
|
||||
<includes>
|
||||
<include>about.mappings</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
</additionalFileSets>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
@ -870,6 +900,7 @@
|
|||
<ignoredPatterns>
|
||||
<pattern>META-INF/ECLIPSE_.RSA</pattern>
|
||||
<pattern>META-INF/ECLIPSE_.SF</pattern>
|
||||
<pattern>about.mappings</pattern>
|
||||
<pattern>index/*</pattern>
|
||||
</ignoredPatterns>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.testing;singleton:=true
|
||||
Bundle-Version: 8.1.0.qualifier
|
||||
Bundle-Version: 8.1.100.qualifier
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<version>8.1.0-SNAPSHOT</version>
|
||||
<version>8.1.100-SNAPSHOT</version>
|
||||
<artifactId>org.eclipse.cdt.testing</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %Bundle-Name.1
|
||||
Bundle-SymbolicName: org.eclipse.cdt.core.parser.upc;singleton:=true
|
||||
Bundle-Version: 5.1.200.qualifier
|
||||
Bundle-Version: 5.1.300.qualifier
|
||||
Bundle-ClassPath: .
|
||||
Require-Bundle: org.eclipse.cdt.core,
|
||||
net.sourceforge.lpg.lpgjavaruntime;bundle-version="1.1.0";visibility:=reexport,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %Bundle-Name
|
||||
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.bupc.ui;singleton:=true
|
||||
Bundle-Version: 1.0.100.qualifier
|
||||
Bundle-Version: 1.0.200.qualifier
|
||||
Bundle-ClassPath: org.eclipse.cdt.managedbuilder.bupc.ui
|
||||
Bundle-Activator: org.eclipse.cdt.managedbuilder.bupc.ui.UPCWizardsPlugin
|
||||
Require-Bundle: org.eclipse.cdt.ui,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.util;singleton:=true
|
||||
Bundle-Version: 5.0.101.qualifier
|
||||
Bundle-Version: 5.0.200.qualifier
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.cdt.core,
|
||||
org.junit,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.xlc.core;singleton:=true
|
||||
Bundle-Version: 5.0.2.qualifier
|
||||
Bundle-Version: 5.0.100.qualifier
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.eclipse.cdt.managedbuilder.core,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.xlc.ui; singleton := true
|
||||
Bundle-Version: 6.4.1.qualifier
|
||||
Bundle-Version: 6.4.100.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.managedbuilder.xlc.ui.XLCUIPlugin
|
||||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.eclipse.ui,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
# This file does not need to be translated.
|
||||
|
||||
# The following should contain the build version.
|
||||
# e.g. "0=20020612"
|
||||
# This value will be added automaticaly via the build scripts
|
||||
0=@build@
|
||||
# e.g. "0=20200106-1728"
|
||||
# This value will be added automatically via the build scripts
|
||||
0=${buildId}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue