From ba208cbd06468d906743bdf4a900009fc132295c Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 6 Jan 2020 12:03:23 -0500 Subject: [PATCH] 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 --- .../META-INF/MANIFEST.MF | 2 +- .../about.mappings | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- .../about.mappings | 5 ++- .../org.eclipse.cdt.gdb/META-INF/MANIFEST.MF | 2 +- debug/org.eclipse.cdt.gdb/about.mappings | 6 ++-- .../about.mappings | 6 ++-- .../about.mappings | 6 ++-- .../about.mappings | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- .../about.mappings | 6 ++-- pom.xml | 31 +++++++++++++++++++ releng/org.eclipse.cdt.sdk/about.mappings | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- releng/org.eclipse.cdt.testing/about.mappings | 6 ++-- releng/org.eclipse.cdt.testing/pom.xml | 2 +- releng/org.eclipse.cdt/about.mappings | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- .../about.mappings | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- .../about.mappings | 6 ++-- .../org.eclipse.cdt.util/META-INF/MANIFEST.MF | 2 +- util/org.eclipse.cdt.util/about.mappings | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- .../about.mappings | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- .../about.mappings | 6 ++-- 27 files changed, 88 insertions(+), 54 deletions(-) diff --git a/cross/org.eclipse.cdt.build.crossgcc/META-INF/MANIFEST.MF b/cross/org.eclipse.cdt.build.crossgcc/META-INF/MANIFEST.MF index 03234c30ed0..7ba4cf0f28d 100644 --- a/cross/org.eclipse.cdt.build.crossgcc/META-INF/MANIFEST.MF +++ b/cross/org.eclipse.cdt.build.crossgcc/META-INF/MANIFEST.MF @@ -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", diff --git a/cross/org.eclipse.cdt.build.crossgcc/about.mappings b/cross/org.eclipse.cdt.build.crossgcc/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/cross/org.eclipse.cdt.build.crossgcc/about.mappings +++ b/cross/org.eclipse.cdt.build.crossgcc/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF b/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF index 4acd8276dac..b05326c3ef6 100644 --- a/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF +++ b/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF @@ -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, diff --git a/cross/org.eclipse.cdt.launch.remote/about.mappings b/cross/org.eclipse.cdt.launch.remote/about.mappings index bddaab43109..936a8039c3e 100644 --- a/cross/org.eclipse.cdt.launch.remote/about.mappings +++ b/cross/org.eclipse.cdt.launch.remote/about.mappings @@ -3,4 +3,7 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@ \ No newline at end of file +# The following should contain the build version. +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/debug/org.eclipse.cdt.gdb/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.gdb/META-INF/MANIFEST.MF index f932d043308..c4788fde2b0 100644 --- a/debug/org.eclipse.cdt.gdb/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.gdb/META-INF/MANIFEST.MF @@ -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 diff --git a/debug/org.eclipse.cdt.gdb/about.mappings b/debug/org.eclipse.cdt.gdb/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/debug/org.eclipse.cdt.gdb/about.mappings +++ b/debug/org.eclipse.cdt.gdb/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/dsf/org.eclipse.cdt.examples.dsf/about.mappings b/dsf/org.eclipse.cdt.examples.dsf/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/dsf/org.eclipse.cdt.examples.dsf/about.mappings +++ b/dsf/org.eclipse.cdt.examples.dsf/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag/about.mappings b/jtag/org.eclipse.cdt.debug.gdbjtag/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag/about.mappings +++ b/jtag/org.eclipse.cdt.debug.gdbjtag/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/about.mappings b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/about.mappings +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF index efe68befc97..21aae609c4d 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF +++ b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF @@ -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, diff --git a/lrparser/org.eclipse.cdt.core.lrparser/about.mappings b/lrparser/org.eclipse.cdt.core.lrparser/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/about.mappings +++ b/lrparser/org.eclipse.cdt.core.lrparser/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/pom.xml b/pom.xml index 43f14f69a10..9c533098587 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,9 @@ ${cdt-other.skip.tests} /shared/common/gdb/gdb-all/bin gdb.8.3 + yyyyMMdd-HHmm + ${maven.build.timestamp} + ${buildTimestamp} @@ -472,6 +475,25 @@ + + about-mappings + + + about.mappings + + + + + + . + true + + about.mappings + + + + + skip-all-tests @@ -807,6 +829,14 @@ true + + + ${project.build.outputDirectory} + + about.mappings + + + @@ -870,6 +900,7 @@ META-INF/ECLIPSE_.RSA META-INF/ECLIPSE_.SF + about.mappings index/* diff --git a/releng/org.eclipse.cdt.sdk/about.mappings b/releng/org.eclipse.cdt.sdk/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/releng/org.eclipse.cdt.sdk/about.mappings +++ b/releng/org.eclipse.cdt.sdk/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF index ab5c26cfe3d..adff42b2e57 100644 --- a/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF +++ b/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF @@ -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 diff --git a/releng/org.eclipse.cdt.testing/about.mappings b/releng/org.eclipse.cdt.testing/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/releng/org.eclipse.cdt.testing/about.mappings +++ b/releng/org.eclipse.cdt.testing/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/releng/org.eclipse.cdt.testing/pom.xml b/releng/org.eclipse.cdt.testing/pom.xml index 190a6191307..b2ad2e8a4f6 100644 --- a/releng/org.eclipse.cdt.testing/pom.xml +++ b/releng/org.eclipse.cdt.testing/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 8.1.0-SNAPSHOT + 8.1.100-SNAPSHOT org.eclipse.cdt.testing eclipse-plugin diff --git a/releng/org.eclipse.cdt/about.mappings b/releng/org.eclipse.cdt/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/releng/org.eclipse.cdt/about.mappings +++ b/releng/org.eclipse.cdt/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/upc/org.eclipse.cdt.core.parser.upc/META-INF/MANIFEST.MF b/upc/org.eclipse.cdt.core.parser.upc/META-INF/MANIFEST.MF index 76047e79bba..8fe6e60cee8 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/META-INF/MANIFEST.MF +++ b/upc/org.eclipse.cdt.core.parser.upc/META-INF/MANIFEST.MF @@ -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, diff --git a/upc/org.eclipse.cdt.core.parser.upc/about.mappings b/upc/org.eclipse.cdt.core.parser.upc/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/about.mappings +++ b/upc/org.eclipse.cdt.core.parser.upc/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/META-INF/MANIFEST.MF b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/META-INF/MANIFEST.MF index df3112252bd..5f2521ae9bd 100644 --- a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/META-INF/MANIFEST.MF +++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/META-INF/MANIFEST.MF @@ -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, diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.mappings b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.mappings +++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF b/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF index 3c2559e4464..49afb13e7a9 100644 --- a/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF +++ b/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF @@ -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, diff --git a/util/org.eclipse.cdt.util/about.mappings b/util/org.eclipse.cdt.util/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/util/org.eclipse.cdt.util/about.mappings +++ b/util/org.eclipse.cdt.util/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF index 3d15443b84e..eb68e0c60ec 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF @@ -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, diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/about.mappings b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/about.mappings +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId} diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF index abf2732eb63..51c54d63010 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF @@ -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, diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/about.mappings b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/about.mappings index 0824105e69d..936a8039c3e 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/about.mappings +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/about.mappings @@ -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@ \ No newline at end of file +# e.g. "0=20200106-1728" +# This value will be added automatically via the build scripts +0=${buildId}