1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Bug 558439: Integrate releng for launchbar and tools.templates

Change-Id: I63530b50729e79e65e5001b71678348c3a7256ba
This commit is contained in:
Jonah Graham 2020-01-13 14:09:34 -05:00
parent 6042ffbf79
commit 83067d7da8
20 changed files with 91 additions and 39 deletions

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Launch Bar Core Tests
Bundle-SymbolicName: org.eclipse.launchbar.core.tests;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 1.0.100.qualifier
Fragment-Host: org.eclipse.launchbar.core;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.junit;bundle-version="4.12.0",

View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.launchbar</groupId>
<artifactId>parent</artifactId>
<version>2.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.launchbar.core.tests</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>

View file

@ -0,0 +1,25 @@
/*******************************************************************************
* Copyright (c) 2019 Kichwa Coders Canada and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.launchbar.core.tests;
import org.eclipse.launchbar.core.PerTargetLaunchConfigProviderTest;
import org.eclipse.launchbar.core.internal.LaunchBarManager2Test;
import org.eclipse.launchbar.core.internal.LaunchBarManagerTest;
import org.eclipse.launchbar.core.internal.target.LaunchTargetTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({ TargetAttributesTest.class, LaunchTargetTest.class, LaunchBarManager2Test.class,
LaunchBarManagerTest.class, PerTargetLaunchConfigProviderTest.class })
public class AutomatedIntegrationSuite {
}

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: LaunchBar Core
Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
Bundle-Version: 2.3.0.qualifier
Bundle-Version: 2.3.100.qualifier
Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
Bundle-Vendor: Eclipse CDT
Require-Bundle: org.eclipse.core.runtime,

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: LaunchBar Remote Core
Bundle-SymbolicName: org.eclipse.launchbar.remote.core;singleton:=true
Bundle-Version: 1.0.2.qualifier
Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.launchbar.remote.core.internal.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Remote Launch Target UI
Bundle-SymbolicName: org.eclipse.launchbar.remote.ui;singleton:=true
Bundle-Version: 1.0.1.qualifier
Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.launchbar.remote.ui.internal.Activator
Bundle-Vendor: Eclipse CDT
Require-Bundle: org.eclipse.ui,

View file

@ -4,6 +4,7 @@
label="%featureName"
version="2.4.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.launchbar.remote.ui"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Launch Bar UI Controls
Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true
Bundle-Version: 1.0.100.qualifier
Bundle-Version: 1.0.200.qualifier
Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator
Bundle-Vendor: Eclipse CDT
Require-Bundle: org.eclipse.osgi.services;bundle-version="3.5.0",

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Launch Bar UI Tests
Bundle-SymbolicName: org.eclipse.launchbar.ui.tests
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 1.0.100.qualifier
Bundle-Vendor: Eclipse CDT
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,

View file

@ -5,14 +5,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.launchbar</groupId>
<version>2.4.1-SNAPSHOT</version>
<groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-parent</artifactId>
<version>9.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>parent</artifactId>
</parent>
<artifactId>org.eclipse.launchbar.ui.tests</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
@ -20,7 +20,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- Default configuration, UI tests may have to override these -->
<useUIHarness>true</useUIHarness>
@ -36,7 +35,8 @@
</dependency>
</dependencies>
<product>org.eclipse.sdk.ide</product>
<argLine></argLine>
<argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
</configuration>
</plugin>
</plugins>

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: LaunchBar UI
Bundle-SymbolicName: org.eclipse.launchbar.ui;singleton:=true
Bundle-Version: 2.3.0.qualifier
Bundle-Version: 2.3.100.qualifier
Bundle-Activator: org.eclipse.launchbar.ui.internal.Activator
Bundle-Vendor: Eclipse CDT
Require-Bundle: org.eclipse.core.runtime,

View file

@ -4,6 +4,7 @@
label="%featureName"
version="2.4.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.launchbar.ui"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

15
launchbar/pom.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-parent</artifactId>
<version>9.11.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.cdt.launchbar-parent</artifactId>
<packaging>pom</packaging>
</project>

15
pom.xml
View file

@ -255,6 +255,21 @@
<module>xlc/org.eclipse.cdt.xlc.sdk.branding</module>
<module>xlc/org.eclipse.cdt.xlc.sdk-feature</module>
<module>launchbar/org.eclipse.launchbar</module>
<module>launchbar/org.eclipse.launchbar.core</module>
<module>launchbar/org.eclipse.launchbar.core.tests</module>
<module>launchbar/org.eclipse.launchbar.remote</module>
<module>launchbar/org.eclipse.launchbar.remote.core</module>
<module>launchbar/org.eclipse.launchbar.remote.ui</module>
<module>launchbar/org.eclipse.launchbar.ui</module>
<module>launchbar/org.eclipse.launchbar.ui.controls</module>
<module>launchbar/org.eclipse.launchbar.ui.tests</module>
<module>tools.templates/org.eclipse.tools.templates.core</module>
<module>tools.templates/org.eclipse.tools.templates.freemarker</module>
<module>tools.templates/org.eclipse.tools.templates.freemarker.java11</module>
<module>tools.templates/org.eclipse.tools.templates.ui</module>
<module>releng/org.eclipse.cdt.native-feature</module>
<module>releng/org.eclipse.cdt</module>
<module>releng/org.eclipse.cdt.platform.branding</module>

View file

@ -2,6 +2,7 @@
<site>
<category-def name="main" label="CDT Main Features"/>
<category-def name="extra" label="CDT Optional Features"/>
<category-def name="launchbar" label="LaunchBar"/>
<feature url="features/org.eclipse.cdt_0.0.0.qualifier.jar" id="org.eclipse.cdt" version="0.0.0">
<category name="main"/>
</feature>
@ -173,6 +174,18 @@
<feature url="features/org.eclipse.cdt.launch.serial.feature.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.launch.serial.feature.source" version="0.0.0">
<category name="extra"/>
</feature>
<feature id="org.eclipse.launchbar">
<category name="launchbar"/>
</feature>
<feature id="org.eclipse.launchbar.source">
<category name="launchbar"/>
</feature>
<feature id="org.eclipse.launchbar.remote">
<category name="launchbar"/>
</feature>
<feature id="org.eclipse.launchbar.remote.source">
<category name="launchbar"/>
</feature>
<iu id="org.eclipse.cdt.util" version="0.0.0"/>
<iu id="org.eclipse.cdt.util.source" version="0.0.0"/>
<iu id="org.eclipse.cdt.remote.core" version="0.0.0"/>

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tools.templates.core
Bundle-Version: 1.1.2.qualifier
Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.tools.templates.core.internal.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.tools.templates.freemarker.java11;singleton:=true
Bundle-Version: 1.1.2.qualifier
Bundle-Version: 1.1.100.qualifier
Bundle-Vendor: %Bundle-Vendor
Fragment-Host: org.eclipse.tools.templates.freemarker;bundle-version="1.0.0"
Automatic-Module-Name: org.eclipse.tools.templates.freemarker.java11

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tools.templates.freemarker
Bundle-Version: 1.1.2.qualifier
Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.tools.templates.freemarker.internal.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tools.templates.ui;singleton:=true
Bundle-Version: 1.1.2.qualifier
Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.tools.templates.ui.internal.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,

View file

@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.tools.templates</groupId>
<artifactId>parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-parent</artifactId>
<version>9.11.0-SNAPSHOT</version>
</parent>
<artifactId>bundle-parent</artifactId>
<artifactId>org.eclipse.cdt.tools.template-parent</artifactId>
<packaging>pom</packaging>
</project>