mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-03 22:35:43 +02:00
Code Issues Wiki Activity

Do not forceContextQualifier but genereateFeatureVersionSuffix

Browse source
This commit is contained in:
Martin Oberhuber 2008-01-25 12:23:19 +00:00
parent 396e3a2834
commit f7b1ab708f
10 changed files with 45 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releng/org.eclipse.tm.releng/buildAll.xml
View file

@ -84,7 +84,7 @@ propertyName=propertyValue
<property name="buildAlias" value="${buildLabel}" />
<property name="buildId" value="${buildAlias}" />
<property name="forceContextQualifier" value="v${timestamp}"/>
<!-- <property name="forceContextQualifier" value="v${timestamp}"/> -->
<!--store the build label information in a file-->
<echo file="${buildDirectory}/label.properties" append="true" >
@ -102,9 +102,11 @@ propertyName=propertyValue
<echo file="${buildDirectory}/label.properties" append="true">
buildAlias=${buildAlias}
</echo>
<!--
<echo file="${buildDirectory}/label.properties" append="true" >
forceContextQualifier=${forceContextQualifier}
</echo>
-->
</target>
<target name="run" depends="init">

2
releng/org.eclipse.tm.releng/builder/doc/build.properties
View file

@ -22,3 +22,5 @@ zipargs=
archivesFormat = *,*,*-antZip
collectingFolder=eclipse
archivePrefix=eclipse
generateFeatureVersionSuffix=true
generateVersionsList=true

1
releng/org.eclipse.tm.releng/builder/examples/build.properties
View file

@ -22,3 +22,4 @@ zipargs=
archivesFormat = *,*,*-antZip
collectingFolder=eclipse
archivePrefix=eclipse
generateFeatureVersionSuffix=true

1
releng/org.eclipse.tm.releng/builder/runtime/build.properties
View file

@ -22,3 +22,4 @@ zipargs=
archivesFormat = *,*,*-antZip
collectingFolder=eclipse
archivePrefix=eclipse
generateFeatureVersionSuffix=true

1
releng/org.eclipse.tm.releng/builder/sdk/build.properties
View file

@ -22,3 +22,4 @@ zipargs=
archivesFormat = *,*,*-antZip
collectingFolder=eclipse
archivePrefix=eclipse
generateFeatureVersionSuffix=true

1
releng/org.eclipse.tm.releng/builder/tests/build.properties
View file

@ -22,3 +22,4 @@ zipargs=
archivesFormat = *,*,*-antZip
collectingFolder=eclipse
archivePrefix=eclipse
generateFeatureVersionSuffix=true

3
releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
View file

@ -24,7 +24,8 @@
<!-- TODO: if your project requires more dependencies for testing, add them here -->
<echo message="Copy EMF SDK + Eclipse SDK to ${executionDir}..."/>
<copy todir="${executionDir}">
<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile}"/>
<!--<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${wtpFile},${orbitFile}"/>-->
<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${orbitFile}"/>
</copy>
<property name="shell" value="relengbuildgtk.sh"/>

2
releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh
View file

@ -64,7 +64,7 @@ execCmd ()
echo ""; echo "[relengbuild] [`date +%H\:%M\:%S`]";
echo " $1" | perl -pe "s/ -/\n -/g";
if [ "x$2" != "x" ]; then
$1 | tee $2;
$1 2>&1 | tee $2;
else
$1;
fi

26
releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
View file

@ -67,6 +67,28 @@
<!-- Steps to do after setup but before starting the build proper -->
<!-- ===================================================================== -->
<target name="postSetup">
<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
<property name="url" value="${eclipseURL}" />
<property name="file" value="${eclipseFile}" />
<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
</ant>
<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
<property name="url" value="${emfURL}" />
<property name="file" value="${emfFile}" />
<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ecore/plugin.xml" />
</ant>
<!-- Important: This must be the last dependency downloaded, because the
getDependency target strips versions from all plug-ins -->
<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
<property name="url" value="${orbitURL}" />
<property name="file" value="${orbitFile}" />
</ant>
<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
<patternset>
<include name="**/org.apache.oro*.jar" />
<include name="**/org.apache.commons.net*.jar" />
</patternset>
</unzip>
</target>
<!-- ===================================================================== -->
@ -167,7 +189,9 @@
<!--unzip the junit tests-->
<mkdir dir="${workingDirectory}/eclipse" />
<unzip dest="${workingDirectory}" overwrite="true">
<fileset dir="${buildDirectory}/${buildLabel}"><include name="**/RSE-junit-tests*.zip"/></fileset>
<fileset dir="${buildDirectory}/${buildLabel}">
<include name="**/RSE-junit-tests*.zip"/>
</fileset>
</unzip>
<!-- create top level testing directory-->

11
releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
View file

@ -35,6 +35,11 @@
<property name="file" value="${emfFile}" />
<property name="unpackDest" value="${install}"/>
</ant>
<ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}">
<property name="url" value="${orbitURL}" />
<property name="file" value="${orbitFile}" />
<property name="unpackDest" value="${install}"/>
</ant>
<property name="dir" location="."/>
<echo message="Unpack SDK + JUnit Tests (${dir}/RSE-*.zip) ..."/>
@ -46,11 +51,11 @@
<target name="runtests" depends="setup" description="Runs ant on the test.xml for a specified plugin. Requires a property value setting for testPlugin only if test.properties is not available. The property testPlugin represents a directory name made up of the plugin id and plugin version. This directory must contain a valid test.xml.">
<!-- TODO: if your test plugin is jarred, do nothing here
TODO: if your test plugin is NOT a jarred plugin, uncomment the next line and comment out the 4 lines thereafter -->
<echo message="${eclipse-home}/plugins/${testPlugin} is not a jarred plugin. No unpack required!"/>
<!-- <echo message="Unpack ${eclipse-home}/plugins/${testPlugin}.jar to ${eclipse-home}/plugins/${testPlugin} ... "/>
<!-- <echo message="${eclipse-home}/plugins/${testPlugin} is not a jarred plugin. No unpack required!"/> -->
<echo message="Unpack ${eclipse-home}/plugins/${testPlugin}.jar to ${eclipse-home}/plugins/${testPlugin} ... "/>
<move file="${eclipse-home}/plugins/${testPlugin}.jar" tofile="${eclipse-home}/plugins/${testPlugin}_.jar"/>
<unjar src="${eclipse-home}/plugins/${testPlugin}_.jar" dest="${eclipse-home}/plugins/${testPlugin}"/>
<delete file="${eclipse-home}/plugins/${testPlugin}_.jar"/> -->
<delete file="${eclipse-home}/plugins/${testPlugin}_.jar"/>
<echo message="Running test.xml from jarfile ${eclipse-home}/plugins/${testPlugin} ... "/>
<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}"/>