From d223183981e3227f1095c76f5f14acb39b87ce22 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Thu, 8 Jan 2015 01:05:45 -0500 Subject: [PATCH] Support for upgrading Linux Tools features to Trace Compass This patch modifies each feature's p2.inf files so that it can be upgraded from the matching feature in Linux Tools. The lines to add the Trace Compass repository are now only in the TMF feature to avoid a lot of duplication and it is only necessary to put this in a "base" feature that the user is likely to install. This is only a shorcut so that the user doesn't have to add the update site manually. Change-Id: I81a5e65c151995888df78f4b47282d6ad1cfcf06 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/39164 Reviewed-by: Hudson CI Reviewed-by: Bernd Hufmann Tested-by: Bernd Hufmann --- org.eclipse.tracecompass.ctf/build.properties | 4 +++- org.eclipse.tracecompass.ctf/p2.inf | 5 +++++ org.eclipse.tracecompass.ctf/sourceTemplateFeature/p2.inf | 1 + org.eclipse.tracecompass.gdbtrace/build.properties | 1 + org.eclipse.tracecompass.gdbtrace/p2.inf | 4 +--- .../sourceTemplateFeature/p2.inf | 1 + org.eclipse.tracecompass.lttng2.control/p2.inf | 6 +----- .../sourceTemplateFeature/p2.inf | 6 +----- org.eclipse.tracecompass.lttng2.kernel/build.properties | 1 + org.eclipse.tracecompass.lttng2.kernel/p2.inf | 4 +--- .../sourceTemplateFeature/p2.inf | 1 + org.eclipse.tracecompass.lttng2.ust/build.properties | 1 + org.eclipse.tracecompass.lttng2.ust/p2.inf | 4 +--- .../sourceTemplateFeature/p2.inf | 1 + .../build.properties | 1 + org.eclipse.tracecompass.rcp.branding.feature/p2.inf | 4 +--- .../sourceTemplateFeature/p2.inf | 1 + org.eclipse.tracecompass.rcp/build.properties | 1 + org.eclipse.tracecompass.rcp/p2.inf | 4 +--- org.eclipse.tracecompass.rcp/sourceTemplateFeature/p2.inf | 1 + org.eclipse.tracecompass.testing/build.properties | 1 + org.eclipse.tracecompass.testing/p2.inf | 4 +--- .../sourceTemplateFeature/p2.inf | 1 + org.eclipse.tracecompass.tmf.ctf/build.properties | 1 + org.eclipse.tracecompass.tmf.ctf/p2.inf | 4 +--- .../sourceTemplateFeature/p2.inf | 1 + org.eclipse.tracecompass.tmf.pcap/build.properties | 1 + org.eclipse.tracecompass.tmf.pcap/p2.inf | 4 +--- .../sourceTemplateFeature/p2.inf | 1 + org.eclipse.tracecompass.tmf/build.properties | 1 + org.eclipse.tracecompass.tmf/p2.inf | 6 ++++-- org.eclipse.tracecompass.tmf/sourceTemplateFeature/p2.inf | 1 + 32 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 org.eclipse.tracecompass.ctf/p2.inf create mode 100644 org.eclipse.tracecompass.ctf/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.gdbtrace/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.lttng2.kernel/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.lttng2.ust/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.rcp.branding.feature/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.rcp/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.testing/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.tmf.ctf/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.tmf.pcap/sourceTemplateFeature/p2.inf create mode 100644 org.eclipse.tracecompass.tmf/sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.ctf/build.properties b/org.eclipse.tracecompass.ctf/build.properties index 5e5b5e15a1..fc36845ab8 100644 --- a/org.eclipse.tracecompass.ctf/build.properties +++ b/org.eclipse.tracecompass.ctf/build.properties @@ -11,4 +11,6 @@ ############################################################################### bin.includes = feature.xml,\ - feature.properties + feature.properties,\ + p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.ctf/p2.inf b/org.eclipse.tracecompass.ctf/p2.inf new file mode 100644 index 0000000000..de7dd312e1 --- /dev/null +++ b/org.eclipse.tracecompass.ctf/p2.inf @@ -0,0 +1,5 @@ +instructions.configure=\ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tracecompass/master/nightly,type:0,name:Trace Compass,enabled:false); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tracecompass/master/nightly,type:1,name:Trace Compass,enabled:false); + +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.ctf.feature.group' || pc.name == 'org.eclipse.tracecompass.ctf.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.ctf/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.ctf/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..79639f9b30 --- /dev/null +++ b/org.eclipse.tracecompass.ctf/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.ctf.source.feature.group' || pc.name == 'org.eclipse.tracecompass.ctf.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.gdbtrace/build.properties b/org.eclipse.tracecompass.gdbtrace/build.properties index c0db4e0a72..fc36845ab8 100644 --- a/org.eclipse.tracecompass.gdbtrace/build.properties +++ b/org.eclipse.tracecompass.gdbtrace/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.gdbtrace/p2.inf b/org.eclipse.tracecompass.gdbtrace/p2.inf index 5246a0c824..1ce7ce1147 100644 --- a/org.eclipse.tracecompass.gdbtrace/p2.inf +++ b/org.eclipse.tracecompass.gdbtrace/p2.inf @@ -1,3 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.gdbtrace.feature.group' || pc.name == 'org.eclipse.tracecompass.gdbtrace.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.gdbtrace/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.gdbtrace/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..5b3595df2c --- /dev/null +++ b/org.eclipse.tracecompass.gdbtrace/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.gdbtrace.source.feature.group' || pc.name == 'org.eclipse.tracecompass.gdbtrace.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.lttng2.control/p2.inf b/org.eclipse.tracecompass.lttng2.control/p2.inf index 23d394a8da..5b8cc7b7d6 100644 --- a/org.eclipse.tracecompass.lttng2.control/p2.inf +++ b/org.eclipse.tracecompass.lttng2.control/p2.inf @@ -1,5 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); - -update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.feature.group' || pc.name == 'org.eclipse.linuxtools.lttng2.control.feature.group')) +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.feature.group' || pc.name == 'org.eclipse.linuxtools.lttng2.control.feature.group' || pc.name == 'org.eclipse.tracecompass.lttng2.control.feature.group')) diff --git a/org.eclipse.tracecompass.lttng2.control/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.lttng2.control/sourceTemplateFeature/p2.inf index 2ba3d5afca..e6ea35d33f 100644 --- a/org.eclipse.tracecompass.lttng2.control/sourceTemplateFeature/p2.inf +++ b/org.eclipse.tracecompass.lttng2.control/sourceTemplateFeature/p2.inf @@ -1,5 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); - -update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.source.feature.group' || pc.name == 'org.eclipse.linuxtools.lttng2.control.source.feature.group')) +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.source.feature.group' || pc.name == 'org.eclipse.linuxtools.lttng2.control.source.feature.group' || pc.name == 'org.eclipse.tracecompass.lttng2.control.source.feature.group')) diff --git a/org.eclipse.tracecompass.lttng2.kernel/build.properties b/org.eclipse.tracecompass.lttng2.kernel/build.properties index c0db4e0a72..fc36845ab8 100644 --- a/org.eclipse.tracecompass.lttng2.kernel/build.properties +++ b/org.eclipse.tracecompass.lttng2.kernel/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.lttng2.kernel/p2.inf b/org.eclipse.tracecompass.lttng2.kernel/p2.inf index 5246a0c824..575b43d9d5 100644 --- a/org.eclipse.tracecompass.lttng2.kernel/p2.inf +++ b/org.eclipse.tracecompass.lttng2.kernel/p2.inf @@ -1,3 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.kernel.feature.group' || pc.name == 'org.eclipse.tracecompass.lttng2.kernel.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.lttng2.kernel/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.lttng2.kernel/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..bc608b979f --- /dev/null +++ b/org.eclipse.tracecompass.lttng2.kernel/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.kernel.source.feature.group' || pc.name == 'org.eclipse.tracecompass.lttng2.kernel.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.lttng2.ust/build.properties b/org.eclipse.tracecompass.lttng2.ust/build.properties index c0db4e0a72..fc36845ab8 100644 --- a/org.eclipse.tracecompass.lttng2.ust/build.properties +++ b/org.eclipse.tracecompass.lttng2.ust/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.lttng2.ust/p2.inf b/org.eclipse.tracecompass.lttng2.ust/p2.inf index 5246a0c824..cdae743dfb 100644 --- a/org.eclipse.tracecompass.lttng2.ust/p2.inf +++ b/org.eclipse.tracecompass.lttng2.ust/p2.inf @@ -1,3 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.ust.feature.group' || pc.name == 'org.eclipse.tracecompass.lttng2.ust.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.lttng2.ust/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.lttng2.ust/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..6deed6f538 --- /dev/null +++ b/org.eclipse.tracecompass.lttng2.ust/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.ust.source.feature.group' || pc.name == 'org.eclipse.tracecompass.lttng2.ust.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.rcp.branding.feature/build.properties b/org.eclipse.tracecompass.rcp.branding.feature/build.properties index bc2d9af3a2..0a2ebfdf16 100644 --- a/org.eclipse.tracecompass.rcp.branding.feature/build.properties +++ b/org.eclipse.tracecompass.rcp.branding.feature/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.rcp.branding.feature/p2.inf b/org.eclipse.tracecompass.rcp.branding.feature/p2.inf index 5246a0c824..0d9588d603 100644 --- a/org.eclipse.tracecompass.rcp.branding.feature/p2.inf +++ b/org.eclipse.tracecompass.rcp.branding.feature/p2.inf @@ -1,3 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tracing.rcp.branding.feature.feature.group' || pc.name == 'org.eclipse.tracecompass.rcp.branding.feature.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.rcp.branding.feature/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.rcp.branding.feature/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..727b7a3b2e --- /dev/null +++ b/org.eclipse.tracecompass.rcp.branding.feature/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tracing.rcp.branding.feature.source.feature.group' || pc.name == 'org.eclipse.tracecompass.tracing.rcp.branding.feature.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.rcp/build.properties b/org.eclipse.tracecompass.rcp/build.properties index bc2d9af3a2..0a2ebfdf16 100644 --- a/org.eclipse.tracecompass.rcp/build.properties +++ b/org.eclipse.tracecompass.rcp/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.rcp/p2.inf b/org.eclipse.tracecompass.rcp/p2.inf index 5246a0c824..e4624088e0 100644 --- a/org.eclipse.tracecompass.rcp/p2.inf +++ b/org.eclipse.tracecompass.rcp/p2.inf @@ -1,3 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tracing.rcp.feature.group' || pc.name == 'org.eclipse.tracecompass.rcp.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.rcp/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.rcp/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..a3f1e8dc44 --- /dev/null +++ b/org.eclipse.tracecompass.rcp/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tracing.rcp.source.feature.group' || pc.name == 'org.eclipse.tracecompass.rcp.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.testing/build.properties b/org.eclipse.tracecompass.testing/build.properties index fef213dbc0..1cc41555cd 100644 --- a/org.eclipse.tracecompass.testing/build.properties +++ b/org.eclipse.tracecompass.testing/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.testing/p2.inf b/org.eclipse.tracecompass.testing/p2.inf index abe8c46aeb..41d4698e17 100644 --- a/org.eclipse.tracecompass.testing/p2.inf +++ b/org.eclipse.tracecompass.testing/p2.inf @@ -1,3 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false);\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng.testing.feature.group' || pc.name == 'org.eclipse.tracecompass.testing.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.testing/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.testing/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..8adac24f0e --- /dev/null +++ b/org.eclipse.tracecompass.testing/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng.testing.source.feature.group' || pc.name == 'org.eclipse.tracecompass.testing.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf/build.properties b/org.eclipse.tracecompass.tmf.ctf/build.properties index c0db4e0a72..fc36845ab8 100644 --- a/org.eclipse.tracecompass.tmf.ctf/build.properties +++ b/org.eclipse.tracecompass.tmf.ctf/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.tmf.ctf/p2.inf b/org.eclipse.tracecompass.tmf.ctf/p2.inf index 014c6202db..2f8cb1d9b3 100644 --- a/org.eclipse.tracecompass.tmf.ctf/p2.inf +++ b/org.eclipse.tracecompass.tmf.ctf/p2.inf @@ -1,3 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tmf.ctf.feature.group' || pc.name == 'org.eclipse.tracecompass.tmf.ctf.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.tmf.ctf/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..e4db397be0 --- /dev/null +++ b/org.eclipse.tracecompass.tmf.ctf/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tmf.ctf.source.feature.group' || pc.name == 'org.eclipse.tracecompass.tmf.ctf.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.pcap/build.properties b/org.eclipse.tracecompass.tmf.pcap/build.properties index fef213dbc0..1cc41555cd 100644 --- a/org.eclipse.tracecompass.tmf.pcap/build.properties +++ b/org.eclipse.tracecompass.tmf.pcap/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.tmf.pcap/p2.inf b/org.eclipse.tracecompass.tmf.pcap/p2.inf index abe8c46aeb..c94906fc3e 100644 --- a/org.eclipse.tracecompass.tmf.pcap/p2.inf +++ b/org.eclipse.tracecompass.tmf.pcap/p2.inf @@ -1,3 +1 @@ -instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false);\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tmf.pcap.feature.group' || pc.name == 'org.eclipse.tracecompass.tmf.pcap.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.pcap/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.tmf.pcap/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..e5f2fbd91b --- /dev/null +++ b/org.eclipse.tracecompass.tmf.pcap/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tmf.pcap.source.feature.group' || pc.name == 'org.eclipse.tracecompass.tmf.pcap.source.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf/build.properties b/org.eclipse.tracecompass.tmf/build.properties index c0db4e0a72..fc36845ab8 100644 --- a/org.eclipse.tracecompass.tmf/build.properties +++ b/org.eclipse.tracecompass.tmf/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.tracecompass.tmf/p2.inf b/org.eclipse.tracecompass.tmf/p2.inf index 5246a0c824..6328432437 100644 --- a/org.eclipse.tracecompass.tmf/p2.inf +++ b/org.eclipse.tracecompass.tmf/p2.inf @@ -1,3 +1,5 @@ instructions.configure=\ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ -org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tracecompass/master/nightly,type:0,name:Trace Compass,enabled:false); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tracecompass/master/nightly,type:1,name:Trace Compass,enabled:false); + +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tmf.feature.group' || pc.name == 'org.eclipse.tracecompass.tmf.feature.group')) \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf/sourceTemplateFeature/p2.inf b/org.eclipse.tracecompass.tmf/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..cdf5b8aa79 --- /dev/null +++ b/org.eclipse.tracecompass.tmf/sourceTemplateFeature/p2.inf @@ -0,0 +1 @@ +update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.tmf.source.feature.group' || pc.name == 'org.eclipse.tracecompass.tmf.source.feature.group')) \ No newline at end of file -- 2.34.1