You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2013/08/07 00:10:56 UTC
svn commit: r1511133 - in /pivot: branches/jenkins/build.xml
jenkins/build.xml
Author: smartini
Date: Tue Aug 6 22:10:56 2013
New Revision: 1511133
URL: http://svn.apache.org/r1511133
Log:
PIVOT-895, PIVOT-912, for Jenkins build jobs (both for 2.0.x maintenance branch, and for trunk 2.1.0)
Modified:
pivot/branches/jenkins/build.xml
pivot/jenkins/build.xml
Modified: pivot/branches/jenkins/build.xml
URL: http://svn.apache.org/viewvc/pivot/branches/jenkins/build.xml?rev=1511133&r1=1511132&r2=1511133&view=diff
==============================================================================
--- pivot/branches/jenkins/build.xml (original)
+++ pivot/branches/jenkins/build.xml Tue Aug 6 22:10:56 2013
@@ -25,7 +25,7 @@ limitations under the License.
<pathelement location="${env.CLASSPATH}"/>
</path>
<path id="classpath.javalib">
- <fileset dir="${java.home}/lib" includes="**/*.jar"/>
+ <fileset dir="${java.home}/lib" includes="**/*.jar" excludes="**/jfxrt.jar"/>
</path>
<property name="classpath_env" refid="classpath.env"/>
<property name="classpath_javalib" refid="classpath.javalib"/>
@@ -38,7 +38,7 @@ limitations under the License.
<property file="build.properties"/>
<!-- Import Pivot build file -->
- <import file="./pivot_maintenance/build.xml"/>
+ <import file="./pivot_maintenance/build.xml"/>
<path id="classpath.general">
<fileset dir="../ci-builds-on-jenkins/lib" includes="**/*.jar"/>
@@ -48,41 +48,38 @@ limitations under the License.
<!-- Set version from jenkins or not -->
<condition property="version" value="${base.version}-${jenkins.build}">
- <isset property="jenkins.job"/>
+ <isset property="jenkins.job"/>
</condition>
<condition property="version" value="${base.version}">
- <not>
- <isset property="jenkins.job"/>
- </not>
+ <not>
+ <isset property="jenkins.job"/>
+ </not>
</condition>
<!-- Help -->
<target name="help" description="Put some help to console" depends="">
- <property name="classpath" refid="classpath.general"/>
- <echo message="Using Classpath: ${classpath}"/>
+ <property name="classpath" refid="classpath.general"/>
+ <echo message="Using Classpath: ${classpath}"/>
</target>
<!-- Check -->
<target name="check" description="Check environment" depends="help">
<sequential>
- <!-- Ant version check -->
- <fail>
- <condition>
- <not>
- <or>
- <contains string="${ant.version}" substring="1.7"/>
- <contains string="${ant.version}" substring="1.8"/>
- </or>
- </not>
- </condition>
- <![CDATA[
- Error:
-
- Building Pivot requires Apache Ant 1.7 or greater. Please see the BUILD
- file for more information.
- ]]>
- </fail>
+ <!-- Ant version check -->
+ <fail>
+ <condition>
+ <not>
+ <antversion atleast="1.7.0"/>
+ </not>
+ </condition>
+ <![CDATA[
+ Error:
+
+ Building Pivot requires Apache Ant 1.7 or greater. Please see the BUILD
+ file for more information.
+ ]]>
+ </fail>
</sequential>
<sequential>
@@ -108,9 +105,9 @@ limitations under the License.
<fail>
<condition>
<not>
- <available classname="org.junit.Test">
- <classpath refid="classpath.general" />
- </available>
+ <available classname="org.junit.Test">
+ <classpath refid="classpath.general" />
+ </available>
</not>
</condition>
<![CDATA[
Modified: pivot/jenkins/build.xml
URL: http://svn.apache.org/viewvc/pivot/jenkins/build.xml?rev=1511133&r1=1511132&r2=1511133&view=diff
==============================================================================
--- pivot/jenkins/build.xml (original)
+++ pivot/jenkins/build.xml Tue Aug 6 22:10:56 2013
@@ -70,13 +70,13 @@ limitations under the License.
<fail>
<condition>
<not>
- <antversion atleast="1.7.0"/>
+ <antversion atleast="1.8.0"/>
</not>
</condition>
<![CDATA[
Error:
- Building Pivot requires Apache Ant 1.7 or greater. Please see the BUILD
+ Building Pivot requires Apache Ant 1.8 or greater. Please see the BUILD
file for more information.
]]>
</fail>
@@ -88,7 +88,6 @@ limitations under the License.
<condition>
<not>
<or>
- <equals arg1="${ant.java.version}" arg2="1.6"/>
<equals arg1="${ant.java.version}" arg2="1.7"/>
</or>
</not>
@@ -96,7 +95,7 @@ limitations under the License.
<![CDATA[
Error:
- Building Pivot requires JDK 1.6 or greater. Please see the
+ Building Pivot requires JDK 1.7 or greater. Please see the
BUILD file for more information.
]]>
</fail>