-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
reorganized generation of composite site and target platform
Signed-off-by: Andre Bossert <anb0s@anbos.de>
- Loading branch information
Showing
82 changed files
with
476 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> | ||
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> | ||
<stringAttribute key="M2_GOALS" value="clean verify"/> | ||
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> | ||
<booleanAttribute key="M2_OFFLINE" value="false"/> | ||
<stringAttribute key="M2_PROFILES" value="release-composite"/> | ||
<listAttribute key="M2_PROPERTIES"/> | ||
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> | ||
<booleanAttribute key="M2_SKIP_TESTS" value="false"/> | ||
<intAttribute key="M2_THREADS" value="1"/> | ||
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> | ||
<stringAttribute key="M2_USER_SETTINGS" value=""/> | ||
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> | ||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre8"/> | ||
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/EasyShell}"/> | ||
</launchConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> | ||
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> | ||
<stringAttribute key="M2_GOALS" value="clean verify"/> | ||
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> | ||
<booleanAttribute key="M2_OFFLINE" value="false"/> | ||
<stringAttribute key="M2_PROFILES" value=""/> | ||
<listAttribute key="M2_PROPERTIES"/> | ||
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> | ||
<booleanAttribute key="M2_SKIP_TESTS" value="false"/> | ||
<intAttribute key="M2_THREADS" value="1"/> | ||
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> | ||
<stringAttribute key="M2_USER_SETTINGS" value=""/> | ||
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> | ||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre8"/> | ||
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/EasyShell}"/> | ||
</launchConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
/bin | ||
/target | ||
/workspace |
2 changes: 1 addition & 1 deletion
2
de.anbos.eclipse.easyshell.update/.project → de.anbos.eclipse.easyshell.site/.project
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
101 changes: 101 additions & 0 deletions
101
de.anbos.eclipse.easyshell.site/packaging-p2composite.ant
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
<?xml version="1.0"?> | ||
<project name="project"> | ||
|
||
<target name="getMajorMinorVersion"> | ||
<script language="javascript"> | ||
<![CDATA[ | ||
// getting the value | ||
buildnumber = project.getProperty("unqualifiedVersion"); | ||
index = buildnumber.lastIndexOf("."); | ||
counter = buildnumber.substring(0, index); | ||
project.setProperty("majorMinorVersion",counter); | ||
]]> | ||
</script> | ||
</target> | ||
|
||
<target name="test_getMajorMinor" depends="getMajorMinorVersion"> | ||
<echo message="majorMinorVersion: ${majorMinorVersion}"/> | ||
</target> | ||
|
||
<!-- | ||
site.label The name/title/label of the created composite site | ||
unqualifiedVersion The version without any qualifier replacement | ||
buildQualifier The build qualifier | ||
--> | ||
<target name="compute.child.repository.data" depends="getMajorMinorVersion"> | ||
<property name="full.version" value="${unqualifiedVersion}.${buildQualifier}" /> | ||
|
||
<property name="software.download.area" location="updates" /> | ||
<property name="updates.dir" value="testing" /> | ||
|
||
<property name="site.composite.name" value="${site.label} ${majorMinorVersion}" /> | ||
<property name="main.site.composite.name" value="${site.label} All Versions" /> | ||
|
||
<property name="main.composite.repository.directory" location="${software.download.area}/${updates.dir}" /> | ||
|
||
<property name="composite.repository.directory" value="${main.composite.repository.directory}/${majorMinorVersion}" /> | ||
<property name="child.repository" value="${full.version}" /> | ||
<property name="child.repository.directory" value="${composite.repository.directory}/${child.repository}/" /> | ||
</target> | ||
|
||
<target name="p2.composite.add" depends="compute.child.repository.data"> | ||
<property name="source.repository" location="${project.build.directory}/repository"/> | ||
|
||
<echo message=" " /> | ||
|
||
<echo message="Source repository path: ${source.repository}" /> | ||
|
||
<echo message="Copying to ${child.repository.directory}..." /> | ||
|
||
<mkdir dir="${child.repository.directory}"/> | ||
<copy todir="${child.repository.directory}" overwrite="true"> | ||
<fileset dir="${source.repository}" /> | ||
</copy> | ||
|
||
<add.composite.repository.internal | ||
composite.repository.location="${composite.repository.directory}" | ||
composite.repository.name="${site.composite.name}" | ||
composite.repository.child="${child.repository}" | ||
/> | ||
|
||
<add.composite.repository.internal | ||
composite.repository.location="${main.composite.repository.directory}" | ||
composite.repository.name="${main.site.composite.name}" | ||
composite.repository.child="${majorMinorVersion}" | ||
/> | ||
|
||
</target> | ||
|
||
<!-- = = = = = = = = = = = = = = = = = | ||
macrodef: add.composite.repository.internal | ||
= = = = = = = = = = = = = = = = = --> | ||
<macrodef name="add.composite.repository.internal"> | ||
<attribute name="composite.repository.location" /> | ||
<attribute name="composite.repository.name" /> | ||
<attribute name="composite.repository.child" /> | ||
<sequential> | ||
|
||
<echo message=" " /> | ||
<echo message="Composite repository : @{composite.repository.location}" /> | ||
<echo message="Composite name : @{composite.repository.name}" /> | ||
<echo message="Adding child repository : @{composite.repository.child}" /> | ||
|
||
<p2.composite.repository> | ||
<repository compressed="false" location="@{composite.repository.location}" name="@{composite.repository.name}" /> | ||
<add> | ||
<repository location="@{composite.repository.child}" /> | ||
</add> | ||
</p2.composite.repository> | ||
|
||
<echo file="@{composite.repository.location}/p2.index">version=1 | ||
metadata.repository.factory.order=compositeContent.xml,\! | ||
artifact.repository.factory.order=compositeArtifacts.xml,\! | ||
</echo> | ||
|
||
</sequential> | ||
</macrodef> | ||
|
||
|
||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
<?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> | ||
|
||
<artifactId>de.anbos.eclipse.easyshell.site</artifactId> | ||
<packaging>eclipse-repository</packaging> | ||
<name>EasyShell Update Site</name> | ||
|
||
<parent> | ||
<groupId>de.anbos.eclipse.easyshell.group</groupId> | ||
<artifactId>de.anbos.eclipse.easyshell</artifactId> | ||
<version>2.0.0-SNAPSHOT</version> | ||
</parent> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.eclipse.tycho.extras</groupId> | ||
<artifactId>tycho-eclipserun-plugin</artifactId> | ||
<version>${tycho.version}</version> | ||
<configuration> | ||
<!-- IMPORTANT: DO NOT split the arg line --> | ||
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label="EasyShell" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine> | ||
<repositories> | ||
<repository> | ||
<id>Mars</id> | ||
<layout>p2</layout> | ||
<url>http://download.eclipse.org/releases/mars</url> | ||
</repository> | ||
</repositories> | ||
<dependencies> | ||
<dependency> | ||
<artifactId>org.eclipse.ant.core</artifactId> | ||
<type>eclipse-plugin</type> | ||
</dependency> | ||
<dependency> | ||
<artifactId>org.apache.ant</artifactId> | ||
<type>eclipse-plugin</type> | ||
</dependency> | ||
<dependency> | ||
<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId> | ||
<type>eclipse-plugin</type> | ||
</dependency> | ||
<dependency> | ||
<artifactId>org.eclipse.equinox.p2.core.feature</artifactId> | ||
<type>eclipse-feature</type> | ||
</dependency> | ||
<dependency> | ||
<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId> | ||
<type>eclipse-feature</type> | ||
</dependency> | ||
<dependency> | ||
<artifactId>org.eclipse.equinox.ds</artifactId> | ||
<type>eclipse-plugin</type> | ||
</dependency> | ||
</dependencies> | ||
</configuration> | ||
<executions> | ||
<execution> | ||
<id>add-p2-composite-repository</id> | ||
<phase>package</phase> | ||
<goals> | ||
<goal>eclipse-run</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
</project> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions
11
de.anbos.eclipse.easyshell.site/updates/release/compositeArtifacts.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?compositeArtifactRepository version='1.0.0'?> | ||
<repository name='EasyShell All Versions' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> | ||
<properties size='2'> | ||
<property name='p2.atomic.composite.loading' value='true'/> | ||
<property name='p2.timestamp' value='1464101261353'/> | ||
</properties> | ||
<children size='1'> | ||
<child location='1.4'/> | ||
</children> | ||
</repository> |
11 changes: 11 additions & 0 deletions
11
de.anbos.eclipse.easyshell.site/updates/release/compositeContent.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?compositeMetadataRepository version='1.0.0'?> | ||
<repository name='EasyShell All Versions' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> | ||
<properties size='2'> | ||
<property name='p2.atomic.composite.loading' value='true'/> | ||
<property name='p2.timestamp' value='1464101261356'/> | ||
</properties> | ||
<children size='1'> | ||
<child location='1.4'/> | ||
</children> | ||
</repository> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
version=1 | ||
metadata.repository.factory.order=compositeContent.xml,\! | ||
artifact.repository.factory.order=compositeArtifacts.xml,\! |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions
11
de.anbos.eclipse.easyshell.site/updates/testing/1.5/compositeArtifacts.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?compositeArtifactRepository version='1.0.0'?> | ||
<repository name='EasyShell 1.5' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> | ||
<properties size='2'> | ||
<property name='p2.timestamp' value='1464099937558'/> | ||
<property name='p2.atomic.composite.loading' value='true'/> | ||
</properties> | ||
<children size='1'> | ||
<child location='1.5.0.v20160517-1938'/> | ||
</children> | ||
</repository> |
11 changes: 11 additions & 0 deletions
11
de.anbos.eclipse.easyshell.site/updates/testing/1.5/compositeContent.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?compositeMetadataRepository version='1.0.0'?> | ||
<repository name='EasyShell 1.5' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> | ||
<properties size='2'> | ||
<property name='p2.timestamp' value='1464099937566'/> | ||
<property name='p2.atomic.composite.loading' value='true'/> | ||
</properties> | ||
<children size='1'> | ||
<child location='1.5.0.v20160517-1938'/> | ||
</children> | ||
</repository> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
version=1 | ||
metadata.repository.factory.order=compositeContent.xml,\! | ||
artifact.repository.factory.order=compositeArtifacts.xml,\! |
Binary file added
BIN
+737 Bytes
de.anbos.eclipse.easyshell.site/updates/testing/2.0/2.0.0.v20160524-1841/artifacts.jar
Binary file not shown.
Binary file added
BIN
+5.59 KB
de.anbos.eclipse.easyshell.site/updates/testing/2.0/2.0.0.v20160524-1841/content.jar
Binary file not shown.
Binary file added
BIN
+5 KB
...2.0.0.v20160524-1841/features/de.anbos.eclipse.easyshell.feature_2.0.0.v20160524-1841.jar
Binary file not shown.
Binary file added
BIN
+13.6 KB
...0/2.0.0.v20160524-1841/plugins/de.anbos.eclipse.easyshell.plugin_2.0.0.v20160524-1841.jar
Binary file not shown.
11 changes: 11 additions & 0 deletions
11
de.anbos.eclipse.easyshell.site/updates/testing/2.0/compositeArtifacts.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?compositeArtifactRepository version='1.0.0'?> | ||
<repository name='EasyShell 2.0' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> | ||
<properties size='2'> | ||
<property name='p2.timestamp' value='1464115316900'/> | ||
<property name='p2.atomic.composite.loading' value='true'/> | ||
</properties> | ||
<children size='1'> | ||
<child location='2.0.0.v20160524-1841'/> | ||
</children> | ||
</repository> |
11 changes: 11 additions & 0 deletions
11
de.anbos.eclipse.easyshell.site/updates/testing/2.0/compositeContent.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?compositeMetadataRepository version='1.0.0'?> | ||
<repository name='EasyShell 2.0' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> | ||
<properties size='2'> | ||
<property name='p2.timestamp' value='1464115316906'/> | ||
<property name='p2.atomic.composite.loading' value='true'/> | ||
</properties> | ||
<children size='1'> | ||
<child location='2.0.0.v20160524-1841'/> | ||
</children> | ||
</repository> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
version=1 | ||
metadata.repository.factory.order=compositeContent.xml,\! | ||
artifact.repository.factory.order=compositeArtifacts.xml,\! |
12 changes: 12 additions & 0 deletions
12
de.anbos.eclipse.easyshell.site/updates/testing/compositeArtifacts.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?compositeArtifactRepository version='1.0.0'?> | ||
<repository name='EasyShell All Versions' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> | ||
<properties size='2'> | ||
<property name='p2.timestamp' value='1464110080668'/> | ||
<property name='p2.atomic.composite.loading' value='true'/> | ||
</properties> | ||
<children size='2'> | ||
<child location='1.5'/> | ||
<child location='2.0'/> | ||
</children> | ||
</repository> |
12 changes: 12 additions & 0 deletions
12
de.anbos.eclipse.easyshell.site/updates/testing/compositeContent.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<?compositeMetadataRepository version='1.0.0'?> | ||
<repository name='EasyShell All Versions' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> | ||
<properties size='2'> | ||
<property name='p2.timestamp' value='1464110080671'/> | ||
<property name='p2.atomic.composite.loading' value='true'/> | ||
</properties> | ||
<children size='2'> | ||
<child location='1.5'/> | ||
<child location='2.0'/> | ||
</children> | ||
</repository> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
version=1 | ||
metadata.repository.factory.order=compositeContent.xml,\! | ||
artifact.repository.factory.order=compositeArtifacts.xml,\! |
Oops, something went wrong.