[297277] Need CI build for Vex
diff --git a/sourceediting/development/org.eclipse.wst.xml.vex.releng/build.properties b/sourceediting/development/org.eclipse.wst.xml.vex.releng/build.properties
index d21cead..db4b216 100644
--- a/sourceediting/development/org.eclipse.wst.xml.vex.releng/build.properties
+++ b/sourceediting/development/org.eclipse.wst.xml.vex.releng/build.properties
@@ -17,7 +17,6 @@
# MUST BE SET #
JAVA_HOME=/opt/public/common/ibm-java2-ppc-50
JAVA50_HOME=/opt/public/common/ibm-java2-ppc-50
-#dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-linux-gtk-ppc.tar.gz,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/orbit-R20090825191606.zip,http://download.eclipse.org/webtools/downloads/drops/R3.1/R-3.1.1-20090917225226/wtp-common-fproj-sdk-R-3.1.1-20090917225226.zip,http://www.starstandard.org/download/org.antlr.runtime_v31.zip
dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-linux-gtk-ppc.tar.gz,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/orbit-R20090825191606.zip,http://download.eclipse.org/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-test-framework-3.5.1.zip
repositoryURLs=http://download.eclipse.org/releases/galileo
featureIDsToInstall=org.eclipse.wst.xml_ui.feature
@@ -25,7 +24,7 @@
#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup
#build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup
-build.steps=buildUpdate,buildZips,buildTests,map2psf,generateDigests,test,publish,cleanup
+build.steps=buildUpdate,buildZips,map2psf,buildTests,generateDigests,test,publish
compilerArg=-enableJavadoc -encoding ISO-8859-1
flattenDependencies=true
diff --git a/sourceediting/development/org.eclipse.wst.xml.vex.releng/build.xml b/sourceediting/development/org.eclipse.wst.xml.vex.releng/build.xml
index 921702d..2c5d111 100644
--- a/sourceediting/development/org.eclipse.wst.xml.vex.releng/build.xml
+++ b/sourceediting/development/org.eclipse.wst.xml.vex.releng/build.xml
@@ -1,8 +1,8 @@
<project default="run" name="org.eclipse.wst.xml.xpath2.releng/build.xml - Run a PsychoPath build using the Athena CBI">
<target name="run">
<!-- load properties and set timestamp for the build -->
- <property name="WORKSPACE" location="../../../../"/>
<property environment="env"/>
+ <property name="WORKSPACE" location="${env.WORKSPACE}"/>
<property file="build.properties" />
<tstamp>
<format property="buildTimestamp" pattern="yyyyMMddHHmm" />
@@ -19,7 +19,7 @@
can build in /tmp, eg., in /tmp/build, or in workspace, eg.,
${WORKSPACE}/build
-->
- <property name="writableBuildRoot" value="${WORKSPACE}/build2" />
+ <property name="writableBuildRoot" value="${WORKSPACE}/build" />
<!--
can be simple path, eg.,
@@ -27,7 +27,7 @@
${writableBuildRoot}/${topprojectName}/${projectName}/downloads/drops/${version}/${buildType}${buildTimestamp} or
${writableBuildRoot}/${topprojectName}/${projectName}/${subprojectName}/downloads/drops/${version}/${buildType}${buildTimestamp}
-->
- <property name="buildDir" value="${writableBuildRoot}/${buildType}${buildTimestamp}" />
+ <property name="buildDir" value="${writableBuildRoot}/athena" />
<delete dir="${writableBuildRoot}"/>
<echo message="Workspace: ${WORKSPACE}"/>
@@ -41,5 +41,27 @@
<ant antfile="${relengCommonBuilderDir}/buildAll.xml" target="runEclipse" dir="${relengCommonBuilderDir}">
<property file="build.properties"/>
</ant>
+
+ <cleanUpBuild/>
</target>
+
+ <!-- = = = = = = = = = = = = = = = = =
+ macrodef: cleanUpBuild
+ = = = = = = = = = = = = = = = = = -->
+ <macrodef name="cleanUpBuild">
+ <sequential>
+ <delete dir="${buildDir}/eclipse" failonerror="false" />
+ <delete dir="${buildDir}/testing" failonerror="false" />
+ <delete dir="${buildDir}/compilelogs" failonerror="false"/>
+ <delete dir="${buildDir}/testResults/consolelogs" failonerror="false"/>
+ <delete dir="${buildDir}/testResults/html" failonerror="false"/>
+ <delete>
+ <fileset dir="${buildDir}">
+ <include name="*AllFeatures*.zip*"/>
+ <include name="*Master*.zip*"/>
+ </fileset>
+ </delete>
+
+ </sequential>
+ </macrodef>
</project>
diff --git a/sourceediting/development/org.eclipse.wst.xml.vex.releng/testing.properties b/sourceediting/development/org.eclipse.wst.xml.vex.releng/testing.properties
index 6c6e9dc..558a1ee 100644
--- a/sourceediting/development/org.eclipse.wst.xml.vex.releng/testing.properties
+++ b/sourceediting/development/org.eclipse.wst.xml.vex.releng/testing.properties
@@ -4,3 +4,4 @@
#map name of test plugin to testsuite class to run
org.eclipse.wst.xml.vex.tests.suite=org.eclipse.wst.xml.vex.tests.AllTestSuite
+extraVMargs=-Dorg.eclipse.swt.browser.XULRunnerPath=/shared/common/mozilla-xulrunner181-1.8.1.4-30.ppc
diff --git a/sourceediting/features/org.eclipse.wst.xml.vex_tests.feature/feature.xml b/sourceediting/features/org.eclipse.wst.xml.vex_tests.feature/feature.xml
index 3fdca83..c7fb1a0 100644
--- a/sourceediting/features/org.eclipse.wst.xml.vex_tests.feature/feature.xml
+++ b/sourceediting/features/org.eclipse.wst.xml.vex_tests.feature/feature.xml
@@ -41,17 +41,12 @@
install-size="0"
version="0.0.0"/>
- <plugin
- id="org.eclipse.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.ant.optional.junit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
+<plugin
+ id="org.eclipse.test"
+ download-size="0" install-size="0" version="0.0.0"/>
+
+<plugin
+ id="org.eclipse.ant.optional.junit"
+ download-size="0" install-size="0" version="0.0.0" fragment="true"/>
</feature>