Skip to content

Commit

Permalink
reorganized generation of composite site and target platform
Browse files Browse the repository at this point in the history
Signed-off-by: Andre Bossert <anb0s@anbos.de>
  • Loading branch information
anb0s committed May 24, 2016
1 parent 241bb57 commit f31e5cc
Show file tree
Hide file tree
Showing 82 changed files with 476 additions and 61 deletions.
17 changes: 17 additions & 0 deletions EasyShell-Release-Build.launch
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>
17 changes: 17 additions & 0 deletions EasyShell-Testing-Build.launch
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>
2 changes: 1 addition & 1 deletion de.anbos.eclipse.easyshell.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="de.anbos.eclipse.easyshell.feature"
label="EasyShell Feature"
label="EasyShell"
version="2.0.0.qualifier"
provider-name="Andre Bossert">

Expand Down
6 changes: 5 additions & 1 deletion de.anbos.eclipse.easyshell.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
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.feature</artifactId>
<packaging>eclipse-feature</packaging>
<name>EasyShell Feature</name>

<parent>
<groupId>de.anbos.eclipse.easyshell.group</groupId>
<artifactId>EasyShell</artifactId>
<artifactId>de.anbos.eclipse.easyshell</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

</project>
2 changes: 1 addition & 1 deletion de.anbos.eclipse.easyshell.plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EasyShell Plugin
Bundle-Name: EasyShell
Bundle-SymbolicName: de.anbos.eclipse.easyshell.plugin;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Activator: de.anbos.eclipse.easyshell.plugin.Activator
Expand Down
6 changes: 5 additions & 1 deletion de.anbos.eclipse.easyshell.plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
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.plugin</artifactId>
<packaging>eclipse-plugin</packaging>
<name>EasyShell Plugin</name>

<parent>
<groupId>de.anbos.eclipse.easyshell.group</groupId>
<artifactId>EasyShell</artifactId>
<artifactId>de.anbos.eclipse.easyshell</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

</project>
3 changes: 3 additions & 0 deletions de.anbos.eclipse.easyshell.site/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/bin
/target
/workspace
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>de.anbos.eclipse.easyshell.update</name>
<name>de.anbos.eclipse.easyshell.site</name>
<comment></comment>
<projects>
</projects>
Expand Down
101 changes: 101 additions & 0 deletions de.anbos.eclipse.easyshell.site/packaging-p2composite.ant
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>
73 changes: 73 additions & 0 deletions de.anbos.eclipse.easyshell.site/pom.xml
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.
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>
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>
3 changes: 3 additions & 0 deletions de.anbos.eclipse.easyshell.site/updates/release/p2.index
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,\!
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>
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>
3 changes: 3 additions & 0 deletions de.anbos.eclipse.easyshell.site/updates/testing/1.5/p2.index
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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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>
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>
3 changes: 3 additions & 0 deletions de.anbos.eclipse.easyshell.site/updates/testing/2.0/p2.index
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,\!
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>
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>
3 changes: 3 additions & 0 deletions de.anbos.eclipse.easyshell.site/updates/testing/p2.index
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,\!
Loading

0 comments on commit f31e5cc

Please sign in to comment.