Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use target platform for Tycho build - fix #58 #62

Merged
merged 2 commits into from
Jul 31, 2019
Merged

Use target platform for Tycho build - fix #58 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7be1066
Use target platform for Tycho build - fix #58
laeubi Jul 31, 2019
82e7d0c
Fix artifact id for target
laeubi Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 8 additions & 39 deletions org.eclipse.swtchart.cbi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
MODULES
-->
<modules>
<module>../org.eclipse.swtchart.targetplatform</module>
<module>../org.eclipse.swtchart</module>
<module>../org.eclipse.swtchart.test</module>
<module>../org.eclipse.swtchart.extensions</module>
Expand Down Expand Up @@ -92,32 +93,9 @@
<maven.groupid>org.apache.maven.plugins</maven.groupid>
<!-- REPOSITORY URLS -->
<tycho-repo.url>https://oss.sonatype.org/content/groups/public</tycho-repo.url>
<neon-repo.url>http://download.eclipse.org/releases/neon</neon-repo.url>
<neon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.6</neon-updates-repo.url>
<orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/S20190726194335/repository</orbit-repo.url>
<!-- ENCODING -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<!--
P2 REPOSITORIES
-->
<repositories>
<repository>
<id>neon</id>
<url>${neon-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>neon-updates</id>
<url>${neon-updates-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>orbit</id>
<url>${orbit-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>
<!--
PLUGIN REPOSITORIES
-->
Expand Down Expand Up @@ -158,22 +136,13 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<filters>
<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.core</id>
<restrictTo>
<version>3.12.3.v20170228-1205</version>
</restrictTo>
</filter>
<filter>
<type>eclipse-plugin</type>
<id>com.ibm.icu</id>
<restrictTo>
<version>56.1.0.v201601250100</version>
</restrictTo>
</filter>
</filters>
<target>
<artifact>
<groupId>org.eclipse.swtchart</groupId>
<artifactId>org.eclipse.swtchart.targetplatform</artifactId>
<version>0.8.0</version>
</artifact>
</target>
<environments>
<environment>
<os>linux</os>
Expand Down
6 changes: 1 addition & 5 deletions org.eclipse.swtchart.extensions/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ Bundle-Activator: org.eclipse.swtchart.extensions.Activator
Bundle-Vendor: Eclipse SWTChart
Require-Bundle: org.eclipse.jface,
org.eclipse.core.runtime,
org.eclipse.swtchart;bundle-version="0.8.0",
org.eclipse.e4.ui.model.workbench;bundle-version="1.1.100",
org.eclipse.e4.ui.di;bundle-version="1.1.0",
org.eclipse.draw2d;bundle-version="3.10.100"
org.eclipse.swtchart;bundle-version="0.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.swtchart.extensions.axisconverter,
Expand All @@ -27,4 +24,3 @@ Export-Package: org.eclipse.swtchart.extensions.axisconverter,
org.eclipse.swtchart.extensions.preferences,
org.eclipse.swtchart.extensions.properties,
org.eclipse.swtchart.extensions.scattercharts
Import-Package: javax.annotation
11 changes: 11 additions & 0 deletions org.eclipse.swtchart.targetplatform/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.swtchart.targetplatform</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
9 changes: 9 additions & 0 deletions org.eclipse.swtchart.targetplatform/org.eclipse.swtchart.targetplatform-oxygen.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="swtchart" sequenceNumber="1">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="4.7.3.M20180330-0640"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
</location>
</locations>
</target>
9 changes: 9 additions & 0 deletions org.eclipse.swtchart.targetplatform/org.eclipse.swtchart.targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="swtchart" sequenceNumber="3">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="4.6.3.M20170301-0400"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
</location>
</locations>
</target>
16 changes: 16 additions & 0 deletions org.eclipse.swtchart.targetplatform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.swtchart</groupId>
<artifactId>org.eclipse.swtchart.targetplatform</artifactId>
<version>0.8.0</version>
<name>Target Project</name>
<description>This contains the target definition used to build swtchart enterprise</description>
<packaging>eclipse-target-definition</packaging>
<parent>
<groupId>org.eclipse.swtchart</groupId>
<artifactId>org.eclipse.swtchart.build</artifactId>
<version>0.8.0</version>
<relativePath>../org.eclipse.swtchart.cbi/pom.xml</relativePath>
</parent>
</project>