diff options
author | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
---|---|---|
committer | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
commit | 12cda553738ca88662624b6f47066b5564549648 (patch) | |
tree | bfa65b6c38aa566a5f1cc98395da6546a6c6e282 /releng | |
parent | 3447749b1a453735ac54fc09ea7680acdbb19b69 (diff) | |
parent | d65e1d1bdd43feadb43261b85aac2d8aef5e089c (diff) | |
download | org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.gz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.xz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Change-Id: I98e2df3ab57d6e7e8f27e5b0aee7eaa189bfbc33
Diffstat (limited to 'releng')
22 files changed, 825 insertions, 825 deletions
diff --git a/releng/org.eclipse.etrice.releng/.project b/releng/org.eclipse.etrice.releng/.project index 43677a367..90adbba57 100644 --- a/releng/org.eclipse.etrice.releng/.project +++ b/releng/org.eclipse.etrice.releng/.project @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.etrice.releng</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.etrice.releng</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> diff --git a/releng/org.eclipse.etrice.releng/buckminster.ant b/releng/org.eclipse.etrice.releng/buckminster.ant index 1062eb6fe..ac534f415 100644 --- a/releng/org.eclipse.etrice.releng/buckminster.ant +++ b/releng/org.eclipse.etrice.releng/buckminster.ant @@ -1,185 +1,185 @@ -<?xml version="1.0"?>
-<project name="project">
-
- <target name="create.javadoc" depends="-setup.javadoc" if="run.javadoc">
-
- <property name="projectName" value="eTrice" />
-
- <!-- workspace defaults -->
- <property name="checkoutLocation" value="${root}/etrice_local_repo/" />
- <property name="output" value="${checkoutLocation}/plugins/org.eclipse.etrice.doc/html/javadoc" />
- <property name="targetPlatform" value="${eclipse.home}" />
-
- <property name="sourcesLocation" value="${checkoutLocation}/plugins/" />
-
-
- <echo message="Source code location ${sourcesLocation}" />
- <echo message="Javadoc output location ${output}" />
- <echo message="Target platform path ${targetPlatform}" />
-
- <!-- Define classpath -->
- <path id="javadoc-classpath">
- <fileset dir="${targetPlatform}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <!-- Prepare dirs -->
- <delete dir="${output}" />
- <mkdir dir="${output}" />
-
- <javadoc
- destdir="${output}"
- Encoding="ISO-8859-1"
- classpathref="javadoc-classpath"
- maxmemory="1024m"
- source="1.6"
- useexternalfile="true"
- author="true"
- version="true"
- use="true"
- Verbose="no"
- windowtitle="${projectName} Documentation">
-
- <fileset dir="${sourcesLocation}" defaultexcludes="true">
- <include name="**/*.java" />
- <exclude name="**/testdata/**" />
- <exclude name="**/packrat/**" />
- </fileset>
-
- <tag name="generated" description="EMF generated code" />
- <tag name="model" description="EMF model element" />
- <tag name="ordered" description="EMF ordered" />
- <tag name="noimplement" description="This interface is not intended to be implemented by clients." />
- <tag name="noextend" description="This class is not intended to be subclassed by clients." />
- <tag name="noinstantiate" description="This class is not intended to be instantiated by clients." />
- <tag name="noreference" description="This method is not intended to be referenced by clients." />
- <tag name="nooverride" description="This method is not intended to be extended (re-implement with a call to the overridden parent) or re-implemented (with no call to the overridden parent) by clients." />
- </javadoc>
- <!-- Compress the output javadoc in a zip file -->
- <zip destfile="${output}/javadoc.zip" basedir="${output}">
- <exclude name="*.zip" />
- </zip>
- </target>
-
- <target name="-setup.javadoc">
- <condition property="run.javadoc">
- <equals arg1="${mustCreateJavadoc}" arg2="true"/>
- </condition>
- </target>
-
- <!--
- <target name="create.javadoc" description="Generate the JavaDoc for the sources">
- <echo message="Generate the JavaDoc for the sources"></echo>
- <echo message="javadoc source ${root}/buildroot/buckminster.workspace" />
-
- <- set targetPlatformPath as classpath ->
- <path id="files-classpath">
- <fileset dir="${root}/buildroot/target.platform">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <- clean and create output location ->
- <delete dir="${root}/buildroot/buckminster.workspace/../../etrice_local_repo/plugins/org.eclipse.etrie.doc/html/javadoc"/>
- <mkdir dir="${root}/buildroot/buckminster.workspace/../../etrice_local_repo/plugins/org.eclipse.etrice.doc/html/javadoc"/>
-
- <- generate the javadoc ->
- <javadoc destdir="${root}/buildroot/buckminster.workspace/../../etrice_local_repo/plugins/org.eclipse.etrice.doc/html/javadoc"
- classpathref="files-classpath"
- author="true"
- version="true"
- nodeprecated="false"
- nodeprecatedlist="false"
- access="private"
- maxmemory="1024m"
- useexternalfile="true"
- sourcepath="src"
- verbose="true"
- use="true"
- noindex="false"
- nonavbar="false"
- notree="false"
- splitindex="true"
- windowtitle="eTrice Documentation">
-
- <arg value="-J-Dhttp.proxyHost=proxy.eclipse.org"/>
- <arg value="-J-Dhttp.proxyPort=9898"/>
-
- <- link external APIs ->
- <link href="http://download.oracle.com/javase/6/docs/api/"/>
- <link href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/"/>
- <link href="http://download.eclipse.org/modeling/emf/transaction/javadoc/workspace/1.4.0/"/>
-
- <- eTrice sources ->
- <fileset dir="${root}/etrice_local_repo/plugins/" defaultexcludes="true">
- <include name="**/*.java"/>
- <exclude name="**/internal/**"/>
- <exclude name="**/tests/**"/>
- <exclude name="**/examples/**"/>
- </fileset>
- <bottom><![CDATA[ <a href="http://www.eclipse.org/legal/epl-v10.html" shape="rect">Copyright (c) Protos Software GmbH 2010, 2011.</a>]]></bottom>
- </javadoc>
- </target>
- -->
-
- <target name="create.site.index">
- <echo message="Creating human readable index.html" />
- <unzip src="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.jar"
- dest="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2" />
- <xslt style="xsl/content2html.xsl"
- in="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.xml"
- out="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/index.html" />
- <xslt style="xsl/content2xml.xsl"
- in="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.xml"
- out="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/index.xml" />
- <delete file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.xml" />
- </target>
-
- <target name="copy.sites" >
-
- <echo message="Deleting old packed update site from last_success area" />
- <delete dir="${root}/last_success/site.packed/" failonerror="true" />
-
- <echo message="Deleting old ZIP archive from last_success area" />
- <delete dir="${root}/last_success/site.p2.zip/" failonerror="true" />
-
- <echo message="Copying site.packed to last_success area" />
- <copydir dest="${root}/last_success/site.packed/" src="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.packed" />
-
- <echo message="Add update site stuff and user-readable description to site.packed folder (copy from site.p2 folder)" />
- <copy todir="${root}/last_success/site.packed/" file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/artifacts.jar" />
- <copy todir="${root}/last_success/site.packed/" file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.jar" />
- <copy todir="${root}/last_success/site.packed/" file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/index.html" />
- <copy todir="${root}/last_success/site.packed/" file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/index.xml" />
-
- <echo message="Copying site.p2.zip to last_success area" />
- <copydir dest="${root}/last_success/site.p2.zip/" src="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2.zip" />
- <rename dest="${root}/last_success/site.p2.zip/org.eclipse.etrice.site_0.3.0.${build_id}.zip"
- src="${root}/last_success/site.p2.zip/org.eclipse.etrice.site_0.3.0.qualifier.zip"/>
-
- </target>
-
- <!-- Sub targets for copy.sites -->
- <target name="sub.delete.last_success.site.signed" if="site.signed.exists">
- <echo message="Deleting old signed update site from last_success area" />
- <delete dir="${root}/last_success/site.signed/" failonerror="true" />
- </target>
- <!-- End sub targets -->
-
- <!-- This target promotes the last_success folder to the download area for the nightly build. It is triggered via a cron job running each evening -->
- <target name="promote.sites" >
- <echo message="Deleting old update site from downloads area" />
- <delete dir="/home/data/httpd/download.eclipse.org/etrice/updates/nightly/" failonerror="true" />
-
- <echo message="Promoting site.packed" />
- <copydir dest="/home/data/httpd/download.eclipse.org/etrice/updates/nightly/" src="/opt/public/jobs/mdt-etrice-nightly/workspace/last_success/site.packed" />
-
- <echo message="Deleting old ZIP archive from downloads area" />
- <delete dir="/home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/" failonerror="true" />
-
- <echo message="Promoting site.p2.zip" />
- <copydir dest="/home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/" src="/opt/public/jobs/mdt-etrice-nightly/workspace/last_success/site.p2.zip" />
- </target>
-
-</project>
+<?xml version="1.0"?> +<project name="project"> + + <target name="create.javadoc" depends="-setup.javadoc" if="run.javadoc"> + + <property name="projectName" value="eTrice" /> + + <!-- workspace defaults --> + <property name="checkoutLocation" value="${root}/etrice_local_repo/" /> + <property name="output" value="${checkoutLocation}/plugins/org.eclipse.etrice.doc/html/javadoc" /> + <property name="targetPlatform" value="${eclipse.home}" /> + + <property name="sourcesLocation" value="${checkoutLocation}/plugins/" /> + + + <echo message="Source code location ${sourcesLocation}" /> + <echo message="Javadoc output location ${output}" /> + <echo message="Target platform path ${targetPlatform}" /> + + <!-- Define classpath --> + <path id="javadoc-classpath"> + <fileset dir="${targetPlatform}"> + <include name="**/*.jar" /> + </fileset> + </path> + + <!-- Prepare dirs --> + <delete dir="${output}" /> + <mkdir dir="${output}" /> + + <javadoc + destdir="${output}" + Encoding="ISO-8859-1" + classpathref="javadoc-classpath" + maxmemory="1024m" + source="1.6" + useexternalfile="true" + author="true" + version="true" + use="true" + Verbose="no" + windowtitle="${projectName} Documentation"> + + <fileset dir="${sourcesLocation}" defaultexcludes="true"> + <include name="**/*.java" /> + <exclude name="**/testdata/**" /> + <exclude name="**/packrat/**" /> + </fileset> + + <tag name="generated" description="EMF generated code" /> + <tag name="model" description="EMF model element" /> + <tag name="ordered" description="EMF ordered" /> + <tag name="noimplement" description="This interface is not intended to be implemented by clients." /> + <tag name="noextend" description="This class is not intended to be subclassed by clients." /> + <tag name="noinstantiate" description="This class is not intended to be instantiated by clients." /> + <tag name="noreference" description="This method is not intended to be referenced by clients." /> + <tag name="nooverride" description="This method is not intended to be extended (re-implement with a call to the overridden parent) or re-implemented (with no call to the overridden parent) by clients." /> + </javadoc> + <!-- Compress the output javadoc in a zip file --> + <zip destfile="${output}/javadoc.zip" basedir="${output}"> + <exclude name="*.zip" /> + </zip> + </target> + + <target name="-setup.javadoc"> + <condition property="run.javadoc"> + <equals arg1="${mustCreateJavadoc}" arg2="true"/> + </condition> + </target> + + <!-- + <target name="create.javadoc" description="Generate the JavaDoc for the sources"> + <echo message="Generate the JavaDoc for the sources"></echo> + <echo message="javadoc source ${root}/buildroot/buckminster.workspace" /> + + <- set targetPlatformPath as classpath -> + <path id="files-classpath"> + <fileset dir="${root}/buildroot/target.platform"> + <include name="*.jar"/> + </fileset> + </path> + + <- clean and create output location -> + <delete dir="${root}/buildroot/buckminster.workspace/../../etrice_local_repo/plugins/org.eclipse.etrie.doc/html/javadoc"/> + <mkdir dir="${root}/buildroot/buckminster.workspace/../../etrice_local_repo/plugins/org.eclipse.etrice.doc/html/javadoc"/> + + <- generate the javadoc -> + <javadoc destdir="${root}/buildroot/buckminster.workspace/../../etrice_local_repo/plugins/org.eclipse.etrice.doc/html/javadoc" + classpathref="files-classpath" + author="true" + version="true" + nodeprecated="false" + nodeprecatedlist="false" + access="private" + maxmemory="1024m" + useexternalfile="true" + sourcepath="src" + verbose="true" + use="true" + noindex="false" + nonavbar="false" + notree="false" + splitindex="true" + windowtitle="eTrice Documentation"> + + <arg value="-J-Dhttp.proxyHost=proxy.eclipse.org"/> + <arg value="-J-Dhttp.proxyPort=9898"/> + + <- link external APIs -> + <link href="http://download.oracle.com/javase/6/docs/api/"/> + <link href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/"/> + <link href="http://download.eclipse.org/modeling/emf/transaction/javadoc/workspace/1.4.0/"/> + + <- eTrice sources -> + <fileset dir="${root}/etrice_local_repo/plugins/" defaultexcludes="true"> + <include name="**/*.java"/> + <exclude name="**/internal/**"/> + <exclude name="**/tests/**"/> + <exclude name="**/examples/**"/> + </fileset> + <bottom><![CDATA[ <a href="http://www.eclipse.org/legal/epl-v10.html" shape="rect">Copyright (c) Protos Software GmbH 2010, 2011.</a>]]></bottom> + </javadoc> + </target> + --> + + <target name="create.site.index"> + <echo message="Creating human readable index.html" /> + <unzip src="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.jar" + dest="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2" /> + <xslt style="xsl/content2html.xsl" + in="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.xml" + out="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/index.html" /> + <xslt style="xsl/content2xml.xsl" + in="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.xml" + out="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/index.xml" /> + <delete file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.xml" /> + </target> + + <target name="copy.sites" > + + <echo message="Deleting old packed update site from last_success area" /> + <delete dir="${root}/last_success/site.packed/" failonerror="true" /> + + <echo message="Deleting old ZIP archive from last_success area" /> + <delete dir="${root}/last_success/site.p2.zip/" failonerror="true" /> + + <echo message="Copying site.packed to last_success area" /> + <copydir dest="${root}/last_success/site.packed/" src="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.packed" /> + + <echo message="Add update site stuff and user-readable description to site.packed folder (copy from site.p2 folder)" /> + <copy todir="${root}/last_success/site.packed/" file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/artifacts.jar" /> + <copy todir="${root}/last_success/site.packed/" file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/content.jar" /> + <copy todir="${root}/last_success/site.packed/" file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/index.html" /> + <copy todir="${root}/last_success/site.packed/" file="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2/index.xml" /> + + <echo message="Copying site.p2.zip to last_success area" /> + <copydir dest="${root}/last_success/site.p2.zip/" src="${root}/buildroot/buckminster.build/org.eclipse.etrice.site_1.0.0-eclipse.feature/site.p2.zip" /> + <rename dest="${root}/last_success/site.p2.zip/org.eclipse.etrice.site_0.3.0.${build_id}.zip" + src="${root}/last_success/site.p2.zip/org.eclipse.etrice.site_0.3.0.qualifier.zip"/> + + </target> + + <!-- Sub targets for copy.sites --> + <target name="sub.delete.last_success.site.signed" if="site.signed.exists"> + <echo message="Deleting old signed update site from last_success area" /> + <delete dir="${root}/last_success/site.signed/" failonerror="true" /> + </target> + <!-- End sub targets --> + + <!-- This target promotes the last_success folder to the download area for the nightly build. It is triggered via a cron job running each evening --> + <target name="promote.sites" > + <echo message="Deleting old update site from downloads area" /> + <delete dir="/home/data/httpd/download.eclipse.org/etrice/updates/nightly/" failonerror="true" /> + + <echo message="Promoting site.packed" /> + <copydir dest="/home/data/httpd/download.eclipse.org/etrice/updates/nightly/" src="/opt/public/jobs/mdt-etrice-nightly/workspace/last_success/site.packed" /> + + <echo message="Deleting old ZIP archive from downloads area" /> + <delete dir="/home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/" failonerror="true" /> + + <echo message="Promoting site.p2.zip" /> + <copydir dest="/home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/" src="/opt/public/jobs/mdt-etrice-nightly/workspace/last_success/site.p2.zip" /> + </target> + +</project> diff --git a/releng/org.eclipse.etrice.releng/buckminster.cspec b/releng/org.eclipse.etrice.releng/buckminster.cspec index 553a1b699..e42b37b22 100644 --- a/releng/org.eclipse.etrice.releng/buckminster.cspec +++ b/releng/org.eclipse.etrice.releng/buckminster.cspec @@ -1,75 +1,75 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.releng" componentType="buckminster" version="0.3.0.qualifier">
- <cs:dependencies>
- <cs:dependency name="org.eclipse.etrice.feature" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.etrice.generator.c.tests" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.generator.common.tests" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.generator.cpp.tests" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.generator.java.tests" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.kieler.feature" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.etrice.layout.feature" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.etrice.modellib.c" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.modellib.java" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.runtime.c" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.runtime.java" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.runtime.java.tests" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.site" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.etrice.tests.feature" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.etrice.tutorials.java" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.runtime.c.tests" componentType="buckminster"/>
- </cs:dependencies>
- <cs:actions>
- <cs:public name="copy.sites" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="buckminster.ant"/>
- <cs:property key="targets" value="copy.sites"/>
- </cs:actorProperties>
- <cs:properties>
- <cs:property key="build_id" value="${build.id}"/>
- <cs:property key="root" value="${WORKSPACE}"/>
- </cs:properties>
- <cs:products alias="action.output" base="${WORKSPACE}/last_success/"/>
- </cs:public>
- <cs:public name="create.doc" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="../../plugins/org.eclipse.etrice.doc/build-etrice-doc.xml"/>
- <cs:property key="targets" value="build-doc"/>
- </cs:actorProperties>
- </cs:public>
- <cs:public name="create.javadoc" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="buckminster.ant"/>
- <cs:property key="targets" value="create.javadoc"/>
- </cs:actorProperties>
- <cs:properties>
- <cs:property key="root" value="${WORKSPACE}"/>
- <cs:property key="mustCreateJavadoc" value="${manage.javadoc}"/>
- </cs:properties>
- <cs:products>
- <cs:public name="javadoc.output" base="plugins/org.eclipse.graphiti.doc/javadoc/"/>
- </cs:products>
- </cs:public>
- <cs:public name="create.site.index" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="buckminster.ant"/>
- <cs:property key="targets" value="create.site.index"/>
- </cs:actorProperties>
- <cs:properties>
- <cs:property key="root" value="${WORKSPACE}"/>
- </cs:properties>
- <cs:products>
- <cs:public name="readable.index" base="site/"/>
- </cs:products>
- </cs:public>
- <cs:public name="promote.sites" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="buckminster.ant"/>
- <cs:property key="targets" value="promote.sites"/>
- </cs:actorProperties>
- <cs:properties>
- <cs:property key="download.area" value="${etrice.download.area}"/>
- <cs:property key="root" value="${WORKSPACE}"/>
- </cs:properties>
- <cs:products alias="action.output" base="${etrice.download.area}/updates/nightly/"/>
- </cs:public>
- </cs:actions>
-</cs:cspec>
+<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.releng" componentType="buckminster" version="0.3.0.qualifier"> + <cs:dependencies> + <cs:dependency name="org.eclipse.etrice.feature" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.etrice.generator.c.tests" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.generator.common.tests" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.generator.cpp.tests" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.generator.java.tests" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.kieler.feature" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.etrice.layout.feature" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.etrice.modellib.c" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.modellib.java" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.runtime.c" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.runtime.java" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.runtime.java.tests" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.site" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.etrice.tests.feature" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.etrice.tutorials.java" componentType="buckminster"/> + <cs:dependency name="org.eclipse.etrice.runtime.c.tests" componentType="buckminster"/> + </cs:dependencies> + <cs:actions> + <cs:public name="copy.sites" actor="ant"> + <cs:actorProperties> + <cs:property key="buildFile" value="buckminster.ant"/> + <cs:property key="targets" value="copy.sites"/> + </cs:actorProperties> + <cs:properties> + <cs:property key="build_id" value="${build.id}"/> + <cs:property key="root" value="${WORKSPACE}"/> + </cs:properties> + <cs:products alias="action.output" base="${WORKSPACE}/last_success/"/> + </cs:public> + <cs:public name="create.doc" actor="ant"> + <cs:actorProperties> + <cs:property key="buildFile" value="../../plugins/org.eclipse.etrice.doc/build-etrice-doc.xml"/> + <cs:property key="targets" value="build-doc"/> + </cs:actorProperties> + </cs:public> + <cs:public name="create.javadoc" actor="ant"> + <cs:actorProperties> + <cs:property key="buildFile" value="buckminster.ant"/> + <cs:property key="targets" value="create.javadoc"/> + </cs:actorProperties> + <cs:properties> + <cs:property key="root" value="${WORKSPACE}"/> + <cs:property key="mustCreateJavadoc" value="${manage.javadoc}"/> + </cs:properties> + <cs:products> + <cs:public name="javadoc.output" base="plugins/org.eclipse.graphiti.doc/javadoc/"/> + </cs:products> + </cs:public> + <cs:public name="create.site.index" actor="ant"> + <cs:actorProperties> + <cs:property key="buildFile" value="buckminster.ant"/> + <cs:property key="targets" value="create.site.index"/> + </cs:actorProperties> + <cs:properties> + <cs:property key="root" value="${WORKSPACE}"/> + </cs:properties> + <cs:products> + <cs:public name="readable.index" base="site/"/> + </cs:products> + </cs:public> + <cs:public name="promote.sites" actor="ant"> + <cs:actorProperties> + <cs:property key="buildFile" value="buckminster.ant"/> + <cs:property key="targets" value="promote.sites"/> + </cs:actorProperties> + <cs:properties> + <cs:property key="download.area" value="${etrice.download.area}"/> + <cs:property key="root" value="${WORKSPACE}"/> + </cs:properties> + <cs:products alias="action.output" base="${etrice.download.area}/updates/nightly/"/> + </cs:public> + </cs:actions> +</cs:cspec> diff --git a/releng/org.eclipse.etrice.releng/buckminster.script b/releng/org.eclipse.etrice.releng/buckminster.script index 1f7b00fd0..ee3f2c24d 100644 --- a/releng/org.eclipse.etrice.releng/buckminster.script +++ b/releng/org.eclipse.etrice.releng/buckminster.script @@ -1,31 +1,31 @@ -setpref complianceLevel=1.6
-
-setpref targetPlatformPath="${WORKSPACE}/buildroot/target.platform"
-
-import -P "${WORKSPACE}/buildroot/build.properties" "${checkout.location}/org.eclipse.etrice.releng/build.mspec"
-
-# clean build
-build -c
-
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#create.javadoc
-#perform org.eclipse.etrice.releng#create.doc
-
-perform -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.site#site.p2.zip
-
-perform -D WORKSPACE=${WORKSPACE} org.eclipse.etrice.releng#create.site.index
-
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.runtime.c.tests#run_tests
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.java.tests#run_tests
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.c.tests#run_tests
-#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.cpp.tests#run_tests
-
-junit -l org.eclipse.etrice.core.room.tests/org.eclipse.etrice.core.room.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.room.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.room.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.room.tests.launch-out.log
-junit -l org.eclipse.etrice.core.genmodel.tests/org.eclipse.etrice.core.genmodel.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.tests.launch-out.log
-junit -l org.eclipse.etrice.generator.tests/org.eclipse.etrice.generator.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.generator.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.generator.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.generator.tests.launch-out.log
-junit -l org.eclipse.etrice.runtime.java.tests/org.eclipse.etrice.runtime.java.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.runtime.java.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.runtime.java.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.runtime.java.tests.launch-out.log
-junit -l org.eclipse.etrice.etunit.converter.tests/org.eclipse.etrice.etunit.converter.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.etunit.converter.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.etunit.converter.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.etunit.converter.tests.launch-out.log
-junit -l org.eclipse.etrice.ui.behavior.tests/org.eclipse.etrice.ui.behavior.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.launch-out.log
-junit -l org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.launch-out.log
-junit -l org.eclipse.etrice.abstractexec.behavior.tests/org.eclipse.etrice.abstractexec.behavior.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.launch-out.log
-
-perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#copy.sites
+setpref complianceLevel=1.6 + +setpref targetPlatformPath="${WORKSPACE}/buildroot/target.platform" + +import -P "${WORKSPACE}/buildroot/build.properties" "${checkout.location}/org.eclipse.etrice.releng/build.mspec" + +# clean build +build -c + +perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#create.javadoc +#perform org.eclipse.etrice.releng#create.doc + +perform -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.site#site.p2.zip + +perform -D WORKSPACE=${WORKSPACE} org.eclipse.etrice.releng#create.site.index + +perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.runtime.c.tests#run_tests +perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.java.tests#run_tests +perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.c.tests#run_tests +#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.generator.cpp.tests#run_tests + +junit -l org.eclipse.etrice.core.room.tests/org.eclipse.etrice.core.room.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.room.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.room.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.room.tests.launch-out.log +junit -l org.eclipse.etrice.core.genmodel.tests/org.eclipse.etrice.core.genmodel.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.core.genmodel.tests.launch-out.log +junit -l org.eclipse.etrice.generator.tests/org.eclipse.etrice.generator.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.generator.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.generator.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.generator.tests.launch-out.log +junit -l org.eclipse.etrice.runtime.java.tests/org.eclipse.etrice.runtime.java.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.runtime.java.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.runtime.java.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.runtime.java.tests.launch-out.log +junit -l org.eclipse.etrice.etunit.converter.tests/org.eclipse.etrice.etunit.converter.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.etunit.converter.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.etunit.converter.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.etunit.converter.tests.launch-out.log +junit -l org.eclipse.etrice.ui.behavior.tests/org.eclipse.etrice.ui.behavior.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.behavior.tests.launch-out.log +junit -l org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.ui.structure.tests.launch-out.log +junit -l org.eclipse.etrice.abstractexec.behavior.tests/org.eclipse.etrice.abstractexec.behavior.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.abstractexec.behavior.tests.launch-out.log + +perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#copy.sites diff --git a/releng/org.eclipse.etrice.releng/build.cquery b/releng/org.eclipse.etrice.releng/build.cquery index 226931ba5..59cc1ac34 100644 --- a/releng/org.eclipse.etrice.releng/build.cquery +++ b/releng/org.eclipse.etrice.releng/build.cquery @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="build.rmap">
- <cq:rootRequest name="org.eclipse.etrice.releng" componentType="buckminster"/>
- <cq:advisorNode namePattern="^org\.eclipse\.etrice(\..+)?\.source*" skipComponent="true"/>
- <cq:advisorNode namePattern="^org\.eclipse\.swt\.motif\.solaris\.sparc\.source*" skipComponent="true"/>
- <cq:advisorNode namePattern="^org\.eclipse\.swt\.photon\.qnx\.x86\.source*" skipComponent="true"/>
- <cq:advisorNode namePattern=".*" useMaterialization="false" useTargetPlatform="false"/>
-</cq:componentQuery>
+<?xml version="1.0" encoding="UTF-8"?> +<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="build.rmap"> + <cq:rootRequest name="org.eclipse.etrice.releng" componentType="buckminster"/> + <cq:advisorNode namePattern="^org\.eclipse\.etrice(\..+)?\.source*" skipComponent="true"/> + <cq:advisorNode namePattern="^org\.eclipse\.swt\.motif\.solaris\.sparc\.source*" skipComponent="true"/> + <cq:advisorNode namePattern="^org\.eclipse\.swt\.photon\.qnx\.x86\.source*" skipComponent="true"/> + <cq:advisorNode namePattern=".*" useMaterialization="false" useTargetPlatform="false"/> +</cq:componentQuery> diff --git a/releng/org.eclipse.etrice.releng/build.mspec b/releng/org.eclipse.etrice.releng/build.mspec index 07b316272..1d761937d 100644 --- a/releng/org.eclipse.etrice.releng/build.mspec +++ b/releng/org.eclipse.etrice.releng/build.mspec @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<mspec:mspec xmlns:mspec="http://www.eclipse.org/buckminster/MetaData-1.0" installLocation="" materializer="p2" name="build.mspec" url="build.cquery">
- <mspec:property key="target.os" value="*"/>
- <mspec:property key="target.ws" value="*"/>
- <mspec:property key="target.arch" value="*"/>
- <mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/>
-</mspec:mspec>
+<?xml version="1.0" encoding="UTF-8"?> +<mspec:mspec xmlns:mspec="http://www.eclipse.org/buckminster/MetaData-1.0" installLocation="" materializer="p2" name="build.mspec" url="build.cquery"> + <mspec:property key="target.os" value="*"/> + <mspec:property key="target.ws" value="*"/> + <mspec:property key="target.arch" value="*"/> + <mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/> +</mspec:mspec> diff --git a/releng/org.eclipse.etrice.releng/build.properties b/releng/org.eclipse.etrice.releng/build.properties index 248349be9..09476c58e 100644 --- a/releng/org.eclipse.etrice.releng/build.properties +++ b/releng/org.eclipse.etrice.releng/build.properties @@ -1,21 +1,21 @@ -git.repository=http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git
-git.repository.eclipse=http://git.eclipse.org/gitroot/platform/eclipse.platform.releng.git
-
-#qualifier.replacement.*=generator:lastModified
-#generator.lastModified.format='v'yyyyMMdd-HHmm
-qualifier.replacement.*=generator:buildTimestamp
-generator.buildTimestamp.format='I'yyyyMMddHHmm
-
-target.os=*
-target.ws=*
-target.arch=*
-
-site.pack200=true
-#site.retain.unpacked=true
-signing.type=eclipse.local
-cbi.include.source=true
-
-eclipse.downloads=file:/home/data/httpd/download.eclipse.org
-
-etrice.download.area=/home/data/httpd/download.eclipse.org/etrice
-eclipse.staging.area=/shared/download-staging.priv/modeling/mdt/etrice
+git.repository=http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git +git.repository.eclipse=http://git.eclipse.org/gitroot/platform/eclipse.platform.releng.git + +#qualifier.replacement.*=generator:lastModified +#generator.lastModified.format='v'yyyyMMdd-HHmm +qualifier.replacement.*=generator:buildTimestamp +generator.buildTimestamp.format='I'yyyyMMddHHmm + +target.os=* +target.ws=* +target.arch=* + +site.pack200=true +#site.retain.unpacked=true +signing.type=eclipse.local +cbi.include.source=true + +eclipse.downloads=file:/home/data/httpd/download.eclipse.org + +etrice.download.area=/home/data/httpd/download.eclipse.org/etrice +eclipse.staging.area=/shared/download-staging.priv/modeling/mdt/etrice diff --git a/releng/org.eclipse.etrice.releng/build.rmap b/releng/org.eclipse.etrice.releng/build.rmap index 9ef7bc0ea..3cd5a2028 100644 --- a/releng/org.eclipse.etrice.releng/build.rmap +++ b/releng/org.eclipse.etrice.releng/build.rmap @@ -1,93 +1,93 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
- <rm:property key="build.type" value="N"/>
- <rm:locator pattern="^org\.eclipse\.etrice\.releng.*" searchPathRef="releng"/>
- <rm:locator pattern="^org\.eclipse\.etrice\.site" searchPathRef="releng"/>
- <rm:locator pattern="^org\.eclipse\.etrice\.*" searchPathRef="sources"/>
- <rm:locator pattern="^de\.cau\.cs\.kieler\.*" searchPathRef="kieler"/>
- <rm:locator pattern="^org\.eclipse\.license.*" searchPathRef="eclipse.license"/>
- <rm:locator searchPathRef="platform.binaries" failOnError="false"/>
- <rm:locator searchPathRef="orbit"/>
- <rm:searchPath name="releng">
- <rm:provider componentTypes="buckminster,osgi.bundle,eclipse.feature" readerType="local">
- <rm:uri format="{0}/releng/{1}">
- <bc:propertyRef key="etrice.repo"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- <rm:provider componentTypes="eclipse.feature" readerType="local">
- <rm:uri format="{0}/features/{1}">
- <bc:propertyRef key="etrice.repo"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="sources">
- <rm:provider componentTypes="osgi.bundle" readerType="local">
- <rm:uri format="{0}/plugins/{1}">
- <bc:propertyRef key="etrice.repo"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- <rm:provider componentTypes="buckminster,osgi.bundle" readerType="local">
- <rm:uri format="{0}/examples/{1}">
- <bc:propertyRef key="etrice.repo"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- <rm:provider componentTypes="eclipse.feature" readerType="local">
- <rm:uri format="{0}/features/{1}">
- <bc:propertyRef key="etrice.repo"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- <rm:provider componentTypes="osgi.bundle,buckminster" readerType="local">
- <rm:uri format="{0}/tests/{1}">
- <bc:propertyRef key="etrice.repo"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- <rm:provider componentTypes="osgi.bundle,buckminster" readerType="local">
- <rm:uri format="{0}/runtime/{1}">
- <bc:propertyRef key="etrice.repo"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="orbit">
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:property key="buckminster.source" value="false"/>
- <rm:property key="buckminster.mutable" value="false"/>
- <rm:uri format="{0}/releases/kepler">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="kieler">
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:property key="buckminster.source" value="false"/>
- <rm:property key="buckminster.mutable" value="false"/>
- <rm:uri format="{0}/etrice/KIELER/kieler-0.7.1">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="platform.binaries">
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:property key="buckminster.source" value="false"/>
- <rm:property key="buckminster.mutable" value="false"/>
- <rm:uri format="{0}/releases/kepler">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="eclipse.license">
- <rm:provider componentTypes="eclipse.feature" readerType="git">
- <rm:property key="git.remote.uri" value="http://git.eclipse.org/gitroot/platform/eclipse.platform.releng.git"/>
- <rm:uri format="{0}/license,features/{1}">
- <bc:propertyRef key="workspace.root"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
-</rm:rmap>
+<?xml version="1.0" encoding="UTF-8"?> +<rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0"> + <rm:property key="build.type" value="N"/> + <rm:locator pattern="^org\.eclipse\.etrice\.releng.*" searchPathRef="releng"/> + <rm:locator pattern="^org\.eclipse\.etrice\.site" searchPathRef="releng"/> + <rm:locator pattern="^org\.eclipse\.etrice\.*" searchPathRef="sources"/> + <rm:locator pattern="^de\.cau\.cs\.kieler\.*" searchPathRef="kieler"/> + <rm:locator pattern="^org\.eclipse\.license.*" searchPathRef="eclipse.license"/> + <rm:locator searchPathRef="platform.binaries" failOnError="false"/> + <rm:locator searchPathRef="orbit"/> + <rm:searchPath name="releng"> + <rm:provider componentTypes="buckminster,osgi.bundle,eclipse.feature" readerType="local"> + <rm:uri format="{0}/releng/{1}"> + <bc:propertyRef key="etrice.repo"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> + </rm:provider> + <rm:provider componentTypes="eclipse.feature" readerType="local"> + <rm:uri format="{0}/features/{1}"> + <bc:propertyRef key="etrice.repo"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> + </rm:provider> + </rm:searchPath> + <rm:searchPath name="sources"> + <rm:provider componentTypes="osgi.bundle" readerType="local"> + <rm:uri format="{0}/plugins/{1}"> + <bc:propertyRef key="etrice.repo"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> + </rm:provider> + <rm:provider componentTypes="buckminster,osgi.bundle" readerType="local"> + <rm:uri format="{0}/examples/{1}"> + <bc:propertyRef key="etrice.repo"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> + </rm:provider> + <rm:provider componentTypes="eclipse.feature" readerType="local"> + <rm:uri format="{0}/features/{1}"> + <bc:propertyRef key="etrice.repo"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> + </rm:provider> + <rm:provider componentTypes="osgi.bundle,buckminster" readerType="local"> + <rm:uri format="{0}/tests/{1}"> + <bc:propertyRef key="etrice.repo"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> + </rm:provider> + <rm:provider componentTypes="osgi.bundle,buckminster" readerType="local"> + <rm:uri format="{0}/runtime/{1}"> + <bc:propertyRef key="etrice.repo"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> + </rm:provider> + </rm:searchPath> + <rm:searchPath name="orbit"> + <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:property key="buckminster.source" value="false"/> + <rm:property key="buckminster.mutable" value="false"/> + <rm:uri format="{0}/releases/kepler"> + <bc:propertyRef key="eclipse.downloads"/> + </rm:uri> + </rm:provider> + </rm:searchPath> + <rm:searchPath name="kieler"> + <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:property key="buckminster.source" value="false"/> + <rm:property key="buckminster.mutable" value="false"/> + <rm:uri format="{0}/etrice/KIELER/kieler-0.7.1"> + <bc:propertyRef key="eclipse.downloads"/> + </rm:uri> + </rm:provider> + </rm:searchPath> + <rm:searchPath name="platform.binaries"> + <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:property key="buckminster.source" value="false"/> + <rm:property key="buckminster.mutable" value="false"/> + <rm:uri format="{0}/releases/kepler"> + <bc:propertyRef key="eclipse.downloads"/> + </rm:uri> + </rm:provider> + </rm:searchPath> + <rm:searchPath name="eclipse.license"> + <rm:provider componentTypes="eclipse.feature" readerType="git"> + <rm:property key="git.remote.uri" value="http://git.eclipse.org/gitroot/platform/eclipse.platform.releng.git"/> + <rm:uri format="{0}/license,features/{1}"> + <bc:propertyRef key="workspace.root"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> + </rm:provider> + </rm:searchPath> +</rm:rmap> diff --git a/releng/org.eclipse.etrice.releng/local.properties b/releng/org.eclipse.etrice.releng/local.properties index b65ad05c1..38c20c204 100644 --- a/releng/org.eclipse.etrice.releng/local.properties +++ b/releng/org.eclipse.etrice.releng/local.properties @@ -1,19 +1,19 @@ -git.repository=http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git
-git.repository.eclipse=http://git.eclipse.org/gitroot/platform/eclipse.platform.releng.git
-
-qualifier.replacement.*=generator:lastModified
-generator.lastModified.format='v'yyyyMMdd-HHmm
-
-target.os=*
-target.ws=*
-target.arch=*
-
-site.pack200=false
-signing.type=eclipse.remote
-cbi.include.source=true
-
-eclipse.downloads=http://download.eclipse.org
-
-etrice.download.area=http://download.eclipse.org/etrice
-
+git.repository=http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git +git.repository.eclipse=http://git.eclipse.org/gitroot/platform/eclipse.platform.releng.git + +qualifier.replacement.*=generator:lastModified +generator.lastModified.format='v'yyyyMMdd-HHmm + +target.os=* +target.ws=* +target.arch=* + +site.pack200=false +signing.type=eclipse.remote +cbi.include.source=true + +eclipse.downloads=http://download.eclipse.org + +etrice.download.area=http://download.eclipse.org/etrice + etrice.repo=file:/C:/Users/hrentz/git/org.eclipse.etrice
\ No newline at end of file diff --git a/releng/org.eclipse.etrice.releng/post-build.sh b/releng/org.eclipse.etrice.releng/post-build.sh index a0f2e90fa..a6542dad4 100644 --- a/releng/org.eclipse.etrice.releng/post-build.sh +++ b/releng/org.eclipse.etrice.releng/post-build.sh @@ -1,9 +1,9 @@ -echo 'promoting to download area...'
-echo 'deleting directories'
-rm -Rf /home/data/httpd/download.eclipse.org/etrice/updates/nightly/*
-rm -Rf /home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/*
-echo 'copy update site'
-cp -R ${WORKSPACE}/last_success/site.packed/* /home/data/httpd/download.eclipse.org/etrice/updates/nightly/
-echo 'copy zips'
-cp -R ${WORKSPACE}/last_success/site.p2.zip/* /home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/
-echo 'done'
+echo 'promoting to download area...' +echo 'deleting directories' +rm -Rf /home/data/httpd/download.eclipse.org/etrice/updates/nightly/* +rm -Rf /home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/* +echo 'copy update site' +cp -R ${WORKSPACE}/last_success/site.packed/* /home/data/httpd/download.eclipse.org/etrice/updates/nightly/ +echo 'copy zips' +cp -R ${WORKSPACE}/last_success/site.p2.zip/* /home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/ +echo 'done' diff --git a/releng/org.eclipse.etrice.releng/pre-build.sh b/releng/org.eclipse.etrice.releng/pre-build.sh index c4b5f3092..5bd3dbc80 100644 --- a/releng/org.eclipse.etrice.releng/pre-build.sh +++ b/releng/org.eclipse.etrice.releng/pre-build.sh @@ -1,71 +1,71 @@ -#*******************************************************************************
-# Copyright (c) 2013 Protos Software GmbH.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Henrik Rentz-Reichert - initial API and implementation
-#*******************************************************************************
-#!/bin/bash
-
-rm -rf buildroot
-mkdir buildroot
-mkdir buildroot/test.results
-
-COMPACT_BUILD_ID="${BUILD_ID//[-_]}"
-COMPACT_BUILD_ID="${COMPACT_BUILD_ID:0:12}"
-
-{
- cat "${WORKSPACE}/etrice_local_repo/releng/org.eclipse.etrice.releng/build.properties"
-
- echo
- echo "# Define the path to the repository location"
- echo "etrice.repo=${WORKSPACE}/etrice_local_repo"
-
- echo
- echo "# Define the Build ID (added by Hudson job definition)"
- echo "build.id=${BUILD_TYPE}${COMPACT_BUILD_ID}"
-
- echo
- echo "# Define the Build Alias (added by Hudson job definition)"
- echo "build.alias=${BUILD_ALIAS}"
-
- echo
- echo "# Define Hudson Build ID (added by Hudson job definition)"
- echo "hudson.build.id=${BUILD_ID}"
-
- echo
- echo "# Define if Hudson Build should create javadoc (added by Hudson job definition)"
- echo "manage.javadoc=${MANAGE_JAVADOC}"
-
- echo
- echo "# override qualifier replacement set in build.properties"
- echo "qualifier.replacement.*=generator:buildTimestamp"
- echo "generator.buildTimestamp.format='${BUILD_TYPE}'yyyyMMddHHmm"
-
- echo
- echo "# Override default locations (added by Hudson job definition)"
- echo "buckminster.output.root=${WORKSPACE}/buildroot/buckminster.build"
- echo "buckminster.temp.root=${WORKSPACE}/buildroot/buckminster.temp"
- echo "eclipse.staging.area=/shared/download-staging.priv/modeling/mdt/etrice"
- echo "target.platform=${WORKSPACE}/buildroot/target.platform"
- echo "integration.model.path=${WORKSPACE}/etrice_local_repo/tests/org.eclipse.etrice.integration.tests/model"
- echo "java.tests.model.path=${WORKSPACE}/etrice_local_repo/tests/org.eclipse.etrice.generator.java.tests/models"
- echo "test.results=${WORKSPACE}/buildroot/test.results"
- echo "runtime.platform=MT_POSIX_GENERIC_GCC"
- echo "gcc.path=/usr/bin"
- echo "c-runtime.path=${WORKSPACE}/etrice_local_repo/runtime/org.eclipse.etrice.runtime.c"
- echo "cpp-runtime.path=${WORKSPACE}/etrice_local_repo/runtime/org.eclipse.etrice.runtime.cpp"
- echo
- echo "site.signing=${SITE_SIGNING}"
-
-} > buildroot/build.properties
-
-{
- echo "# Define the Build ID to use for tagging (added by Hudson job definition)"
- echo "build.id=${COMPACT_BUILD_ID}"
-
-} > buildroot/tagging.properties
-
+#******************************************************************************* +# Copyright (c) 2013 Protos Software GmbH. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Henrik Rentz-Reichert - initial API and implementation +#******************************************************************************* +#!/bin/bash + +rm -rf buildroot +mkdir buildroot +mkdir buildroot/test.results + +COMPACT_BUILD_ID="${BUILD_ID//[-_]}" +COMPACT_BUILD_ID="${COMPACT_BUILD_ID:0:12}" + +{ + cat "${WORKSPACE}/etrice_local_repo/releng/org.eclipse.etrice.releng/build.properties" + + echo + echo "# Define the path to the repository location" + echo "etrice.repo=${WORKSPACE}/etrice_local_repo" + + echo + echo "# Define the Build ID (added by Hudson job definition)" + echo "build.id=${BUILD_TYPE}${COMPACT_BUILD_ID}" + + echo + echo "# Define the Build Alias (added by Hudson job definition)" + echo "build.alias=${BUILD_ALIAS}" + + echo + echo "# Define Hudson Build ID (added by Hudson job definition)" + echo "hudson.build.id=${BUILD_ID}" + + echo + echo "# Define if Hudson Build should create javadoc (added by Hudson job definition)" + echo "manage.javadoc=${MANAGE_JAVADOC}" + + echo + echo "# override qualifier replacement set in build.properties" + echo "qualifier.replacement.*=generator:buildTimestamp" + echo "generator.buildTimestamp.format='${BUILD_TYPE}'yyyyMMddHHmm" + + echo + echo "# Override default locations (added by Hudson job definition)" + echo "buckminster.output.root=${WORKSPACE}/buildroot/buckminster.build" + echo "buckminster.temp.root=${WORKSPACE}/buildroot/buckminster.temp" + echo "eclipse.staging.area=/shared/download-staging.priv/modeling/mdt/etrice" + echo "target.platform=${WORKSPACE}/buildroot/target.platform" + echo "integration.model.path=${WORKSPACE}/etrice_local_repo/tests/org.eclipse.etrice.integration.tests/model" + echo "java.tests.model.path=${WORKSPACE}/etrice_local_repo/tests/org.eclipse.etrice.generator.java.tests/models" + echo "test.results=${WORKSPACE}/buildroot/test.results" + echo "runtime.platform=MT_POSIX_GENERIC_GCC" + echo "gcc.path=/usr/bin" + echo "c-runtime.path=${WORKSPACE}/etrice_local_repo/runtime/org.eclipse.etrice.runtime.c" + echo "cpp-runtime.path=${WORKSPACE}/etrice_local_repo/runtime/org.eclipse.etrice.runtime.cpp" + echo + echo "site.signing=${SITE_SIGNING}" + +} > buildroot/build.properties + +{ + echo "# Define the Build ID to use for tagging (added by Hudson job definition)" + echo "build.id=${COMPACT_BUILD_ID}" + +} > buildroot/tagging.properties + diff --git a/releng/org.eclipse.etrice.releng/promote.sh b/releng/org.eclipse.etrice.releng/promote.sh index a0f2e90fa..a6542dad4 100644 --- a/releng/org.eclipse.etrice.releng/promote.sh +++ b/releng/org.eclipse.etrice.releng/promote.sh @@ -1,9 +1,9 @@ -echo 'promoting to download area...'
-echo 'deleting directories'
-rm -Rf /home/data/httpd/download.eclipse.org/etrice/updates/nightly/*
-rm -Rf /home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/*
-echo 'copy update site'
-cp -R ${WORKSPACE}/last_success/site.packed/* /home/data/httpd/download.eclipse.org/etrice/updates/nightly/
-echo 'copy zips'
-cp -R ${WORKSPACE}/last_success/site.p2.zip/* /home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/
-echo 'done'
+echo 'promoting to download area...' +echo 'deleting directories' +rm -Rf /home/data/httpd/download.eclipse.org/etrice/updates/nightly/* +rm -Rf /home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/* +echo 'copy update site' +cp -R ${WORKSPACE}/last_success/site.packed/* /home/data/httpd/download.eclipse.org/etrice/updates/nightly/ +echo 'copy zips' +cp -R ${WORKSPACE}/last_success/site.p2.zip/* /home/data/httpd/download.eclipse.org/etrice/archives/nightly/zips/ +echo 'done' diff --git a/releng/org.eclipse.etrice.releng/xsl/content2html.xsl b/releng/org.eclipse.etrice.releng/xsl/content2html.xsl index 1f14ee1fb..44fa318d8 100644 --- a/releng/org.eclipse.etrice.releng/xsl/content2html.xsl +++ b/releng/org.eclipse.etrice.releng/xsl/content2html.xsl @@ -1,62 +1,62 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="html" omit-xml-declaration="yes" indent="yes"/>
- <xsl:strip-space elements="*"/>
-
- <xsl:template match="/">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <xsl:apply-templates select="repository"/>
- </html>
- </xsl:template>
-
- <xsl:template match="repository">
- <head>
- <title>
- <xsl:value-of select="@name"/>
- </title>
- </head>
- <body>
- <h1>
- <xsl:value-of select="@name"/>
- </h1>
- <p>
- <em>For information about installing or updating software, see the
- <a href="http://help.eclipse.org/galileo/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm">
- Eclipse Platform Help</a>.</em>
-
- </p>
- <table border="0">
- <tr>
- <td colspan="2">
- <hr/>
- <h2>Features</h2>
- </td>
- </tr>
- <xsl:apply-templates select="//provided[@namespace='org.eclipse.update.feature']">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- <tr>
- <td colspan="2">
- <hr/>
- <h2>Plugins</h2>
- </td>
- </tr>
- <xsl:apply-templates select="//provided[@namespace='osgi.bundle']">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </body>
- </xsl:template>
-
- <xsl:template match="provided">
- <tr>
- <td>
- <xsl:value-of select="@name"/>
- </td>
- <td>
- <xsl:value-of select="@version"/>
- </td>
- </tr>
- </xsl:template>
-
+<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:output method="html" omit-xml-declaration="yes" indent="yes"/> + <xsl:strip-space elements="*"/> + + <xsl:template match="/"> + <html xmlns="http://www.w3.org/1999/xhtml"> + <xsl:apply-templates select="repository"/> + </html> + </xsl:template> + + <xsl:template match="repository"> + <head> + <title> + <xsl:value-of select="@name"/> + </title> + </head> + <body> + <h1> + <xsl:value-of select="@name"/> + </h1> + <p> + <em>For information about installing or updating software, see the + <a href="http://help.eclipse.org/galileo/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm"> + Eclipse Platform Help</a>.</em> + + </p> + <table border="0"> + <tr> + <td colspan="2"> + <hr/> + <h2>Features</h2> + </td> + </tr> + <xsl:apply-templates select="//provided[@namespace='org.eclipse.update.feature']"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + <tr> + <td colspan="2"> + <hr/> + <h2>Plugins</h2> + </td> + </tr> + <xsl:apply-templates select="//provided[@namespace='osgi.bundle']"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </xsl:template> + + <xsl:template match="provided"> + <tr> + <td> + <xsl:value-of select="@name"/> + </td> + <td> + <xsl:value-of select="@version"/> + </td> + </tr> + </xsl:template> + </xsl:stylesheet>
\ No newline at end of file diff --git a/releng/org.eclipse.etrice.releng/xsl/content2xml.xsl b/releng/org.eclipse.etrice.releng/xsl/content2xml.xsl index 8c03ef7c6..40ba607df 100644 --- a/releng/org.eclipse.etrice.releng/xsl/content2xml.xsl +++ b/releng/org.eclipse.etrice.releng/xsl/content2xml.xsl @@ -1,37 +1,37 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:template match="/">
- <xsl:apply-templates select="repository"/>
- </xsl:template>
-
- <xsl:template match="repository">
- <release tag="" integration="true">
- <xsl:attribute name="repository">
- <xsl:value-of select="@name"/>
- </xsl:attribute>
- <xsl:apply-templates select="//provided[@namespace='org.eclipse.update.feature']">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="//provided[@namespace='osgi.bundle']">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </release>
- </xsl:template>
-
- <xsl:template match="provided">
- <element>
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
- </xsl:attribute>
- <xsl:attribute name="version">
- <xsl:value-of select="@version"/>
- </xsl:attribute>
- <xsl:attribute name="type">
- <xsl:value-of select="@namespace"/>
- </xsl:attribute>
- </element>
- </xsl:template>
-
+<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:output method="xml" indent="yes"/> + + <xsl:template match="/"> + <xsl:apply-templates select="repository"/> + </xsl:template> + + <xsl:template match="repository"> + <release tag="" integration="true"> + <xsl:attribute name="repository"> + <xsl:value-of select="@name"/> + </xsl:attribute> + <xsl:apply-templates select="//provided[@namespace='org.eclipse.update.feature']"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + <xsl:apply-templates select="//provided[@namespace='osgi.bundle']"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </release> + </xsl:template> + + <xsl:template match="provided"> + <element> + <xsl:attribute name="name"> + <xsl:value-of select="@name"/> + </xsl:attribute> + <xsl:attribute name="version"> + <xsl:value-of select="@version"/> + </xsl:attribute> + <xsl:attribute name="type"> + <xsl:value-of select="@namespace"/> + </xsl:attribute> + </element> + </xsl:template> + </xsl:stylesheet>
\ No newline at end of file diff --git a/releng/org.eclipse.etrice.site/.project b/releng/org.eclipse.etrice.site/.project index c3c73a0ce..90d116fc8 100644 --- a/releng/org.eclipse.etrice.site/.project +++ b/releng/org.eclipse.etrice.site/.project @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.etrice.site</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.etrice.site</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff --git a/releng/org.eclipse.etrice.site/about.html b/releng/org.eclipse.etrice.site/about.html index 82d49bf5f..d35d5aed6 100644 --- a/releng/org.eclipse.etrice.site/about.html +++ b/releng/org.eclipse.etrice.site/about.html @@ -1,28 +1,28 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html> diff --git a/releng/org.eclipse.etrice.site/buckminster.cspex b/releng/org.eclipse.etrice.site/buckminster.cspex index c14937c5c..ad4348b87 100644 --- a/releng/org.eclipse.etrice.site/buckminster.cspex +++ b/releng/org.eclipse.etrice.site/buckminster.cspex @@ -1,13 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<cspecExtension
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
- xmlns="http://www.eclipse.org/buckminster/CSpec-1.0" componentType="eclipse.feature" version="1.0.0">
- <dependencies>
- <dependency name="org.eclipse.equinox.executable" componentType="eclipse.feature"/>
- <dependency name="org.eclipse.platform" componentType="eclipse.feature"/>
- <dependency name="org.eclipse.emf.ecore" componentType="eclipse.feature"/>
- <dependency name="org.eclipse.emf.edit" componentType="eclipse.feature"/>
- <dependency name="org.eclipse.emf.transaction" componentType="eclipse.feature"/>
- </dependencies>
-</cspecExtension>
+<?xml version="1.0" encoding="UTF-8"?> +<cspecExtension + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" + xmlns="http://www.eclipse.org/buckminster/CSpec-1.0" componentType="eclipse.feature" version="1.0.0"> + <dependencies> + <dependency name="org.eclipse.equinox.executable" componentType="eclipse.feature"/> + <dependency name="org.eclipse.platform" componentType="eclipse.feature"/> + <dependency name="org.eclipse.emf.ecore" componentType="eclipse.feature"/> + <dependency name="org.eclipse.emf.edit" componentType="eclipse.feature"/> + <dependency name="org.eclipse.emf.transaction" componentType="eclipse.feature"/> + </dependencies> +</cspecExtension> diff --git a/releng/org.eclipse.etrice.site/build.properties b/releng/org.eclipse.etrice.site/build.properties index b4b19abb2..f25ac57c4 100644 --- a/releng/org.eclipse.etrice.site/build.properties +++ b/releng/org.eclipse.etrice.site/build.properties @@ -1,29 +1,29 @@ -# Copyright (c) 2010 - 2011 Protos Software GmbH.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = feature.xml,\
- copyright.txt,\
- feature.properties,\
- about.html,\
- eclipse.gif,\
- eclipse_update_120.jpg,\
- category.xml,\
- buckminster.cspex
-src.includes = about.html,\
- copyright.txt,\
- category.xml,\
- build.properties,\
- eclipse.gif,\
- eclipse_update_120.jpg,\
- feature.properties,\
- feature.xml,\
- .project,\
- buckminster.cspex
+# Copyright (c) 2010 - 2011 Protos Software GmbH. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation + +# NLS_MESSAGEFORMAT_VAR + +bin.includes = feature.xml,\ + copyright.txt,\ + feature.properties,\ + about.html,\ + eclipse.gif,\ + eclipse_update_120.jpg,\ + category.xml,\ + buckminster.cspex +src.includes = about.html,\ + copyright.txt,\ + category.xml,\ + build.properties,\ + eclipse.gif,\ + eclipse_update_120.jpg,\ + feature.properties,\ + feature.xml,\ + .project,\ + buckminster.cspex diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml index d1f9abddd..54ec264e2 100644 --- a/releng/org.eclipse.etrice.site/category.xml +++ b/releng/org.eclipse.etrice.site/category.xml @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature id="org.eclipse.etrice.core" version="0.0.0">
- <category name="org.eclipse.etrice"/>
- </feature>
- <feature id="org.eclipse.etrice.examples" version="0.0.0">
- <category name="org.eclipse.etrice"/>
- </feature>
- <feature id="org.eclipse.etrice.tests" version="0.0.0">
- <category name="org.eclipse.etrice"/>
- </feature>
- <category-def name="org.eclipse.etrice" label="eTrice">
- <description>
- The eTrice update site provides access to the eTrice modeling tools and all additional features.
- </description>
- </category-def>
-</site>
+<?xml version="1.0" encoding="UTF-8"?> +<site> + <feature id="org.eclipse.etrice.core" version="0.0.0"> + <category name="org.eclipse.etrice"/> + </feature> + <feature id="org.eclipse.etrice.examples" version="0.0.0"> + <category name="org.eclipse.etrice"/> + </feature> + <feature id="org.eclipse.etrice.tests" version="0.0.0"> + <category name="org.eclipse.etrice"/> + </feature> + <category-def name="org.eclipse.etrice" label="eTrice"> + <description> + The eTrice update site provides access to the eTrice modeling tools and all additional features. + </description> + </category-def> +</site> diff --git a/releng/org.eclipse.etrice.site/copyright.txt b/releng/org.eclipse.etrice.site/copyright.txt index d21468f4c..6ef950bc2 100644 --- a/releng/org.eclipse.etrice.site/copyright.txt +++ b/releng/org.eclipse.etrice.site/copyright.txt @@ -1,8 +1,8 @@ -Copyright (c) 2010 - 2011 Protos Software GmbH.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
+Copyright (c) 2010 - 2011 Protos Software GmbH. +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License v1.0 +which accompanies this distribution, and is available at +http://www.eclipse.org/legal/epl-v10.html + +Contributors: Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation
\ No newline at end of file diff --git a/releng/org.eclipse.etrice.site/feature.properties b/releng/org.eclipse.etrice.site/feature.properties index 4cf3cd6db..86adabfa0 100644 --- a/releng/org.eclipse.etrice.site/feature.properties +++ b/releng/org.eclipse.etrice.site/feature.properties @@ -1,30 +1,30 @@ -# Copyright (c) 2010 - 2011 Protos Software GmbH.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-providerName = Eclipse eTrice (Incubation)
-featureName = eTrice Site
-description = eTrice modeling tools for event driven real-time systems based on the modeling language ROOM
-
-# Label for the update site (on download1.eclipse.org)
-updateSiteName=Eclipse Modeling Project Updates
-
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
+# Copyright (c) 2010 - 2011 Protos Software GmbH. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation + +# NLS_MESSAGEFORMAT_VAR + +# ============================================================================== +# Do not change the properties between this line and the last line containing: +# %%% END OF TRANSLATED PROPERTIES %%% +# Instead, either redefine an existing property, or create a new property, +# append it to the end of the file, and change the code to use the new name. +# ============================================================================== + +providerName = Eclipse eTrice (Incubation) +featureName = eTrice Site +description = eTrice modeling tools for event driven real-time systems based on the modeling language ROOM + +# Label for the update site (on download1.eclipse.org) +updateSiteName=Eclipse Modeling Project Updates + + +# ============================================================================== +# %%% END OF TRANSLATED PROPERTIES %%% +# The above properties have been shipped for translation. +# ============================================================================== diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml index bd7bc4f68..18ef767a0 100644 --- a/releng/org.eclipse.etrice.site/feature.xml +++ b/releng/org.eclipse.etrice.site/feature.xml @@ -1,49 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2010 - 2011 Protos Software GmbH.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation
--->
-<feature
- id="org.eclipse.etrice.site"
- label="eTrice (Incubation) 0.3.0 Update Site"
- version="0.3.0.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- (c) 2010 - 2011 Protos Software GmbH.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <url>
- <update url="http://www.eclipse.org/downloads/download.php?file=/etrice/updates/0.1.0/&protocol=http&format=xml"/>
- <discovery label="KIELER provided by eTrice" url="http://download.eclipse.org/etrice/KIELER/kieler-0.7.1"/>
- </url>
-
- <includes
- id="org.eclipse.etrice.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.etrice.layout.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.etrice.kieler.feature"
- version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010 - 2011 Protos Software GmbH. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation +--> +<feature + id="org.eclipse.etrice.site" + label="eTrice (Incubation) 0.3.0 Update Site" + version="0.3.0.qualifier" + provider-name="%providerName" + image="eclipse_update_120.jpg"> + + <description> + %description + </description> + + <copyright url="http://www.eclipse.org/legal/epl-v10.html"> + (c) 2010 - 2011 Protos Software GmbH. +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License +v1.0 +which accompanies this distribution, and is available at +http://www.eclipse.org/legal/epl-v10.html + </copyright> + + <url> + <update url="http://www.eclipse.org/downloads/download.php?file=/etrice/updates/0.1.0/&protocol=http&format=xml"/> + <discovery label="KIELER provided by eTrice" url="http://download.eclipse.org/etrice/KIELER/kieler-0.7.1"/> + </url> + + <includes + id="org.eclipse.etrice.feature" + version="0.0.0"/> + + <includes + id="org.eclipse.etrice.layout.feature" + version="0.0.0"/> + + <includes + id="org.eclipse.etrice.kieler.feature" + version="0.0.0"/> + +</feature> |