diff options
7 files changed, 95 insertions, 8 deletions
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml index e94e947ee..a9a1b3b61 100644 --- a/features/org.eclipse.etrice.feature/feature.xml +++ b/features/org.eclipse.etrice.feature/feature.xml @@ -236,4 +236,25 @@ http://www.eclipse.org/legal/epl-v10.html version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.etrice.core.config"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.etrice.core.config.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.etrice.core.config.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml index 1f6d2763e..38a24cd6c 100644 --- a/features/org.eclipse.etrice.tests.feature/feature.xml +++ b/features/org.eclipse.etrice.tests.feature/feature.xml @@ -94,4 +94,11 @@ http://www.eclipse.org/legal/epl-v10.html version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.etrice.core.config.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/releng/org.eclipse.etrice.releng/buckminster.cspec b/releng/org.eclipse.etrice.releng/buckminster.cspec index fe108d786..aecc1d238 100644 --- a/releng/org.eclipse.etrice.releng/buckminster.cspec +++ b/releng/org.eclipse.etrice.releng/buckminster.cspec @@ -3,13 +3,16 @@ <cs:dependencies>
<cs:dependency name="org.eclipse.etrice.feature" componentType="eclipse.feature"/>
<cs:dependency name="org.eclipse.etrice.integration.tests" componentType="buckminster"/>
+ <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.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" componentType="buckminster"/>
- <cs:dependency name="org.eclipse.etrice.modellib.c" componentType="buckminster"/>
+ <cs:dependency name="org.eclipse.runtime.c" componentType="buckminster"/>
+ <cs:dependency name="org.eclipse.generator.common.tests" componentType="buckminster"/>
+ <cs:dependency name="org.eclipse.generator.java.tests" componentType="buckminster"/>
</cs:dependencies>
<cs:actions>
<cs:public name="copy.sites" actor="ant">
diff --git a/releng/org.eclipse.etrice.releng/buckminster.script b/releng/org.eclipse.etrice.releng/buckminster.script index be27314fe..fc906f24d 100644 --- a/releng/org.eclipse.etrice.releng/buckminster.script +++ b/releng/org.eclipse.etrice.releng/buckminster.script @@ -2,10 +2,6 @@ setpref complianceLevel=1.6 setpref targetPlatformPath="${WORKSPACE}/buildroot/target.platform"
-# Define an API baseline by adding a target definition
-#hrr-importtargetdefinition "file://${checkout.location}/org.eclipse.graphiti.releng/APIBaseLine.target"
-#hrr-addbaseline -A "Graphiti API Base Line"
-
import -P "${WORKSPACE}/buildroot/build.properties" "${checkout.location}/org.eclipse.etrice.releng/build.mspec"
# clean build
@@ -24,6 +20,7 @@ perform -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.site#sit perform -D WORKSPACE=${WORKSPACE} org.eclipse.etrice.releng#create.site.index
+perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.generator.java.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
@@ -31,6 +28,3 @@ junit -l org.eclipse.etrice.runtime.java.tests/org.eclipse.etrice.runtime.java.t junit -l org.eclipse.etrice.integration.tests/org.eclipse.etrice.integration.tests.launch -o ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.integration.tests.xml --terseXML --flatXML --stderr ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.integration.tests.launch-err.log --stdout ${WORKSPACE}/buildroot/test.results/org.eclipse.etrice.integration.tests.launch-out.log
perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.etrice.releng#copy.sites
-
-# Not called from here because this is started via a cron job each evening
-#perform -D WORKSPACE=${WORKSPACE} -P "${WORKSPACE}/buildroot/build.properties" org.eclipse.graphiti.releng#promote.sites
diff --git a/releng/org.eclipse.etrice.releng/createpropfile.sh b/releng/org.eclipse.etrice.releng/createpropfile.sh new file mode 100644 index 000000000..391fb198d --- /dev/null +++ b/releng/org.eclipse.etrice.releng/createpropfile.sh @@ -0,0 +1,51 @@ +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 "# 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 "model.path=${WORKSPACE}/etrice_local_repo/tests/org.eclipse.etrice.integration.tests/model"
+ echo "test.results=${WORKSPACE}/buildroot/test.results"
+
+ 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 new file mode 100644 index 000000000..a0f2e90fa --- /dev/null +++ b/releng/org.eclipse.etrice.releng/promote.sh @@ -0,0 +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'
diff --git a/runtime/org.eclipse.etrice.runtime.c/buckminster.cspec b/runtime/org.eclipse.etrice.runtime.c/buckminster.cspec new file mode 100644 index 000000000..3982c48d6 --- /dev/null +++ b/runtime/org.eclipse.etrice.runtime.c/buckminster.cspec @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.c" componentType="buckminster" version="0.0.2"/>
|