From: <st...@us...> - 2008-08-01 16:04:04
|
Revision: 6865 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6865&view=rev Author: steve_l Date: 2008-08-01 16:04:00 +0000 (Fri, 01 Aug 2008) Log Message: ----------- SFOS-780: keeping hadoop out the build Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2008-08-01 16:00:26 UTC (rev 6864) +++ trunk/core/build.xml 2008-08-01 16:04:00 UTC (rev 6865) @@ -489,7 +489,7 @@ <!--not ready for ivy builds yet--> <exclude name="sfgui/build.xml" unless="sfgui.enabled"/> <exclude name="avalanche/**/build.xml" unless="avalanche.enabled"/> - <exclude name="VAST/build.xml" unless="vast.enabled"/> + <exclude name="VAST/build.xml" unless="vast.enabled"/> </fileset> <fileset dir="components" includes="**/build.xml" > <!--no cddlm here--> @@ -506,7 +506,7 @@ <exclude name="ec2/build.xml" unless="java1.6+"/> <!--Not yet functional --> - <exclude name="hadoop/build.xml" unless="java1.6+"/> + <exclude name="hadoop/build.xml" /> <!-- no docs unless forrest is installed--> <!--<exclude name="documentation/build.xml" unless="env.FORREST_HOME"/>--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-08-08 12:58:39
|
Revision: 6927 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6927&view=rev Author: julgui Date: 2008-08-08 12:58:37 +0000 (Fri, 08 Aug 2008) Log Message: ----------- More output for project info Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2008-08-08 06:53:36 UTC (rev 6926) +++ trunk/core/build.xml 2008-08-08 12:58:37 UTC (rev 6927) @@ -62,6 +62,8 @@ <echo message=" Java: ${java.version} ${java.vendor} "/> <echo message=" ${java.home} "/> <echo message=" OS: ${os.name} ${os.version} (${os.arch})"/> + <echo message=" Build dir: ${basedir}"/> + <echo message=" Ant: ${ant.version}"/> <echo message=" Proxy: http: ${http.proxyHost}:${http.proxyPort} ,https: ${https.proxyHost}:${https.proxyPort} "/> <echo message=" ======================================================="/> <echo message=" "/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-05 12:07:21
|
Revision: 7152 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7152&view=rev Author: steve_l Date: 2008-11-05 11:59:25 +0000 (Wed, 05 Nov 2008) Log Message: ----------- SFOS-1019 Add smartfrog-hadoop RPM that contains all the artifacts needed to bring up Hadoop under SmartFrog Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2008-11-05 11:30:39 UTC (rev 7151) +++ trunk/core/build.xml 2008-11-05 11:59:25 UTC (rev 7152) @@ -507,9 +507,6 @@ <exclude name="vmware/build.xml" unless="java1.6+"/> <exclude name="ec2/build.xml" unless="java1.6+"/> - <!--Not yet functional --> - <exclude name="hadoop/build.xml" /> - <!-- no docs unless forrest is installed--> <!--<exclude name="documentation/build.xml" unless="env.FORREST_HOME"/>--> <exclude name="documentation/build.xml" unless="forrest.enabled"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-28 09:59:47
|
Revision: 7197 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7197&view=rev Author: steve_l Date: 2008-11-28 09:59:00 +0000 (Fri, 28 Nov 2008) Log Message: ----------- print check for java6 Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2008-11-27 18:04:34 UTC (rev 7196) +++ trunk/core/build.xml 2008-11-28 09:59:00 UTC (rev 7197) @@ -561,7 +561,7 @@ <target name="published" depends="ivy-publish"/> <target name="ivy-list-order" depends="ivy-init"> - <echo>java1.5+=${java1.5+}</echo> + <echo>java1.6+=${java1.6+}</echo> <pathconvert pathsep=" " refid="child.projects" property="child.projects.list" /> <echo> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-12-11 15:04:18
|
Revision: 7231 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7231&view=rev Author: steve_l Date: 2008-12-11 15:03:32 +0000 (Thu, 11 Dec 2008) Log Message: ----------- replace tabs with spaces Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2008-12-11 15:03:03 UTC (rev 7230) +++ trunk/core/build.xml 2008-12-11 15:03:32 UTC (rev 7231) @@ -62,8 +62,8 @@ <echo message=" Java: ${java.version} ${java.vendor} "/> <echo message=" ${java.home} "/> <echo message=" OS: ${os.name} ${os.version} (${os.arch})"/> - <echo message=" Build dir: ${basedir}"/> - <echo message=" Ant: ${ant.version}"/> + <echo message=" Build dir: ${basedir}"/> + <echo message=" Ant: ${ant.version}"/> <echo message=" Proxy: http: ${http.proxyHost}:${http.proxyPort} ,https: ${https.proxyHost}:${https.proxyPort} "/> <echo message=" ======================================================="/> <echo message=" "/> @@ -505,6 +505,9 @@ <!--lacks the artifacts to compile--> <exclude name="constraints/build.xml" unless="constraints.enabled"/> + <!-- temporarily excluded --> + <exclude name="persistence/build.xml"/> + <!--Java 1.6+ code--> <exclude name="vmware/build.xml" unless="java1.6+"/> <exclude name="ec2/build.xml" unless="java1.6+"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-03-11 17:25:59
|
Revision: 7467 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7467&view=rev Author: steve_l Date: 2009-03-11 17:25:49 +0000 (Wed, 11 Mar 2009) Log Message: ----------- make deploy timeout extensible for deploying to sluggish vms Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-03-11 17:21:09 UTC (rev 7466) +++ trunk/core/build.xml 2009-03-11 17:25:49 UTC (rev 7467) @@ -41,6 +41,7 @@ <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> <property name="toplevel.dir" location=".." /> + <property name="build.dir" location="build" /> <property name="main.project" location="smartfrog" /> <property name="test.project" location="testharness" /> <property name="components.project" location="components" /> @@ -369,32 +370,8 @@ > </target> - <!-- =================================================================== --> - <!-- Luntbuild target for distribution --> - <!-- =================================================================== --> - <target name="luntbuild-clean" depends="clean,luntbuild-incremental"/> - <!-- =================================================================== --> - <!-- incremental build --> - <!-- =================================================================== --> - <target name="luntbuild-incremental" - depends="dist,tasks,components"/> - - <!-- =================================================================== --> - <!-- luntbuild test suite --> - <!-- =================================================================== --> - <target name="luntbuild-test" - depends="tested"/> - - <!-- =================================================================== --> - <!-- luntbuild release process--> - <!-- =================================================================== --> - <target name="luntbuild-release" - depends="clean,release" /> - - - <!-- =================================================================== --> <!-- Gump target for distribution --> <!-- =================================================================== --> <target name="gump-dist" depends="ivy-purge,dist" /> @@ -405,15 +382,6 @@ <target name="gump-test" depends="test" /> - <!-- =================================================================== --> - <!-- cddlm compile is handed down--> - <!-- =================================================================== --> - <target name="cddlm" depends="ivy-cddlm" /> - - <target name="bamboo-build-all" depends="published" - description="entry point for Bamboo CI system" /> - - <target name="ivy-properties"> <property name="ivy.user.dir" location="${user.home}/.ivy" /> <property name="ivy.local.dir" location="${ivy.user.dir}/local" /> @@ -621,13 +589,11 @@ <ivy-delegate target="pdf-doc-folder" /> </target> - <target name="ivy-cddlm" depends="ivy-init"> - <ivy-projects reference="cddlm.projects" root="sf-deployapi"> - <fileset file="components/deployapi/build.xml" /> - <fileset file="extras/cdl/build.xml"/> + <target name="ivy-hadoop" depends="ivy-init"> + <ivy-projects reference="hadoop.projects" root="sf-hadoop-cluster"> </ivy-projects> - <subant target="published" verbose="true"> - <buildpath refid="cddlm.projects"/> + <subant target="hadoop" verbose="true"> + <buildpath refid="hadoop.projects"/> <!--<property file="master.properties"/>--> </subant> </target> @@ -681,17 +647,19 @@ <!-- CLOVER --> <target name="init.clover" depends="init"> <property name="clover.dir" location="clover" /> - <property name="build.clover.dir" location="build/clover" /> + <property name="clover.jar" location="${clover.dir}/clover.jar" /> + <property name="build.clover.dir" location="${build.dir}/clover" /> <property name="build.clover.history.dir" location="${build.clover.dir}/history" /> <property name="build.clover.html.dir" location="${build.clover.dir}/html" /> <property name="build.clover.pdf" location="${build.clover.dir}/coverage.pdf" /> + <mkdir dir="${build.clover.history.dir}" /> <mkdir dir="${build.clover.html.dir}" /> - <available property="clover.jar.present" file="${clover.dir}/clover.jar" /> + <available property="clover.jar.present" file="${clover.jar}" /> </target> <target name="declare-clover" depends="init.clover" if="clover.jar.present"> - <taskdef resource="cloverlib.xml" classpath="./clover/clover.jar" uri="http://cenqua.com/clover"/> + <taskdef resource="cloverlib.xml" classpath="${clover.jar}" uri="http://cenqua.com/clover"/> <available property="clover.installed" classname="com.cenqua.clover.CloverInstr"/> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2009-03-23 17:37:24
|
Revision: 7523 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7523&view=rev Author: julgui Date: 2009-03-23 17:37:22 +0000 (Mon, 23 Mar 2009) Log Message: ----------- SFOS-1152 Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-03-23 17:34:58 UTC (rev 7522) +++ trunk/core/build.xml 2009-03-23 17:37:22 UTC (rev 7523) @@ -568,7 +568,7 @@ </exec> </target> - <target name="ivy-clean" depends="ivy-init" + <target name="ivy-clean" depends="ivy-init,ivy-dirs" description="pass clean down to all the ivy-managed projects"> <ivy-delegate target="clean" /> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-06-12 13:08:05
|
Revision: 7653 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7653&view=rev Author: steve_l Date: 2009-06-12 13:01:41 +0000 (Fri, 12 Jun 2009) Log Message: ----------- tweak the spaces Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-06-12 12:01:59 UTC (rev 7652) +++ trunk/core/build.xml 2009-06-12 13:01:41 UTC (rev 7653) @@ -73,8 +73,8 @@ <echo message=" ${java.home} "/> <echo message=" OS: ${os.name} ${os.version} (${os.arch})"/> <echo message=" Build dir: ${basedir}"/> - <echo message=" Core dir: ${core.dir}"/> - <echo message=" ArtifactsCache dir: ${artifactsCache.dir}"/> + <echo message=" Core dir: ${core.dir}"/> + <echo message=" ArtifactsCache dir: ${artifactsCache.dir}"/> <echo message=" Ant: ${ant.version}"/> <echo message=" Proxy: http: ${http.proxyHost}:${http.proxyPort} ,https: ${https.proxyHost}:${https.proxyPort} "/> <echo message=" ======================================================="/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-06-19 18:07:54
|
Revision: 7694 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7694&view=rev Author: steve_l Date: 2009-06-19 18:07:53 +0000 (Fri, 19 Jun 2009) Log Message: ----------- SFOS-1166 Move the codebase to Java6 - fail early print the date of a build Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-06-19 18:02:21 UTC (rev 7693) +++ trunk/core/build.xml 2009-06-19 18:07:53 UTC (rev 7694) @@ -21,8 +21,16 @@ */ --> + <fail> + <condition> + <available classname="javax.lang.model"/> + </condition> + This build requires Java1.6 or later, but the current JVM is not recognised as + such. + Please upgrade to Java1.6+, or correct any paths/symbolic links that are pointing + to an older version of Java. + </fail> - <target name="help" description="help information"> <echo> This is a primary build file for SmartFrog, which delegates down to @@ -37,15 +45,18 @@ <target name="init"> <property file="build.properties" /> <property environment="env" /> - <property name="core.dir" location="."/> - <!-- look for a feature that only came in in ant 1.7alpha --> + <property name="core.dir" location="."/> + <tstamp> + <format property="build.timestamp" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" /> + </tstamp> + - <!-- where the ivy/maven artifacts are stored --> + <!-- where the ivy/maven artifacts are stored --> <!--<property name="artifactsCache.dir" location="${core.dir}/.artifacts_cache"/>--> <property name="artifactsCache.dir" location="${user.home}"/> - <property name="ivy.default.ivy.user.dir" location="${artifactsCache.dir}"/> + <property name="ivy.default.ivy.user.dir" location="${artifactsCache.dir}"/> <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> @@ -79,6 +90,7 @@ <echo message=" ArtifactsCache dir: ${artifactsCache.dir}"/> <echo message=" Ant: ${ant.version}"/> <echo message=" Proxy: http: ${http.proxyHost}:${http.proxyPort} ,https: ${https.proxyHost}:${https.proxyPort} "/> + <echo message=" Build started: ${build.timestamp}" /> <echo message=" ======================================================="/> <echo message=" "/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-06-25 11:16:40
|
Revision: 7725 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7725&view=rev Author: steve_l Date: 2009-06-25 11:16:37 +0000 (Thu, 25 Jun 2009) Log Message: ----------- SFOS-1152 Add property to change location of artifacts cache in IVY SFOS-1166 Move the codebase to Java6 Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-06-25 10:41:07 UTC (rev 7724) +++ trunk/core/build.xml 2009-06-25 11:16:37 UTC (rev 7725) @@ -23,7 +23,9 @@ --> <fail> <condition> - <available classname="javax.lang.model"/> + <not> + <available classname="java.util.ServiceLoader"/> + </not> </condition> This build requires Java1.6 or later, but the current JVM is not recognised as such. @@ -46,6 +48,7 @@ <property file="build.properties" /> <property environment="env" /> <property name="core.dir" location="."/> + <property name="root.dir" location="."/> <tstamp> <format property="build.timestamp" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" /> </tstamp> @@ -53,7 +56,6 @@ <!-- where the ivy/maven artifacts are stored --> - <!--<property name="artifactsCache.dir" location="${core.dir}/.artifacts_cache"/>--> <property name="artifactsCache.dir" location="${user.home}"/> <property name="ivy.default.ivy.user.dir" location="${artifactsCache.dir}"/> @@ -84,23 +86,15 @@ <echo message=" ${java.home} "/> <echo message=" OS: ${os.name} ${os.version} (${os.arch})"/> <echo message=" Build dir: ${basedir}"/> - <echo message=" Core dir: ${core.dir}"/> - <echo message=" Root dir: ${root.dir}"/> - <echo message=" IvySettings.xml: ${ivysettings.xml}"/> - <echo message=" ArtifactsCache dir: ${artifactsCache.dir}"/> + <echo message=" Core dir: ${core.dir}"/> + <echo message=" Root dir: ${root.dir}"/> + <echo message=" ArtifactsCache dir: ${artifactsCache.dir}"/> <echo message=" Ant: ${ant.version}"/> <echo message=" Proxy: http: ${http.proxyHost}:${http.proxyPort} ,https: ${https.proxyHost}:${https.proxyPort} "/> <echo message=" Build started: ${build.timestamp}" /> <echo message=" ======================================================="/> <echo message=" "/> - <!-- work out our java version by introspection --> - <condition property="java1.5+"> - <available classname="java.lang.Readable"/> - </condition> - <condition property="java1.6+"> - <available classname="javax.lang.model"/> - </condition> <macrodef name="forward2"> <attribute name="dir"/> <attribute name="target"/> @@ -407,7 +401,7 @@ <target name="gump-test" depends="test" /> - <target name="ivy-properties"> + <target name="ivy-properties" depends="init"> <property name="ivy.user.dir" location="${artifactsCache.dir}/.ivy" /> <property name="ivy.local.dir" location="${ivy.user.dir}/local" /> <property name="ivy.cache.dir" location="${ivy.user.dir}/cache" /> @@ -419,6 +413,10 @@ <property name="ivy2.user.dir" location="${artifactsCache.dir}/.ivy2" /> <property name="ivy2.local.dir" location="${ivy2.user.dir}/local" /> <property name="ivy2.cache.dir" location="${ivy2.user.dir}/cache" /> + <echo level="verbose"> + ivy.user.dir = ${ivy.user.dir} + ivy2.user.dir = ${ivy2.user.dir} + </echo> </target> <target name="ivy-dirs" depends="ivy-properties"> @@ -431,7 +429,7 @@ </target> - <target name="ivy-probe-antlib" depends="init,ivy-dirs"> + <target name="ivy-probe-antlib" depends="ivy-dirs"> <condition property="ivy.found"> <typefound uri="antlib:org.apache.ivy.ant" name="retrieve"/> </condition> @@ -460,7 +458,6 @@ <!--create the external dir if it is missing--> <mkdir dir="external" /> <property name="ivysettings.xml" location="antbuild/ivy/ivysettings.xml" /> - <property name="root.dir" location="." /> <ivy:configure file="${ivysettings.xml}" override="true"/> </target> @@ -501,10 +498,6 @@ <!-- temporarily excluded --> <exclude name="persistence/build.xml"/> - <!--Java 1.6+ code--> - <exclude name="vmware/build.xml" unless="java1.6+"/> - <exclude name="ec2/build.xml" unless="java1.6+"/> - <exclude name="groovy/build.xml" unless="java1.6+"/> <!-- no docs unless forrest is installed--> <!--<exclude name="documentation/build.xml" unless="env.FORREST_HOME"/>--> @@ -593,12 +586,22 @@ <target name="ivy-purge-published" depends="ivy-dirs" description="purge all locally published artifacts from the local repository"> + <echo level="verbose"> + Deleting files under + ${ivy.local.dir}/${ivy.package.name} + ${ivy2.local.dir}/${ivy.package.name} + </echo> <delete dir="${ivy.local.dir}/${ivy.package.name}" defaultexcludes="false" includeEmptyDirs="true"/> <delete dir="${ivy2.local.dir}/${ivy.package.name}" defaultexcludes="false" includeEmptyDirs="true"/> </target> <target name="ivy-purge-cache" depends="ivy-dirs" description="purge all smartfrog artifacts from the cache"> + <echo level="verbose"> + Deleting files under + ${ivy.cache.dir}/${ivy.package.name} + ${ivy2.cache.dir}/${ivy.package.name} + </echo> <delete dir="${ivy.cache.dir}/${ivy.package.name}" defaultexcludes="false" includeEmptyDirs="true"/> <delete includeEmptyDirs="true"> <fileset dir="${ivy.cache.dir}" includes="resolved-${ivy.package.name}-*" defaultexcludes="false" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-06-26 21:30:57
|
Revision: 7740 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7740&view=rev Author: steve_l Date: 2009-06-26 21:30:55 +0000 (Fri, 26 Jun 2009) Log Message: ----------- correct a comment Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-06-26 21:22:30 UTC (rev 7739) +++ trunk/core/build.xml 2009-06-26 21:30:55 UTC (rev 7740) @@ -490,7 +490,7 @@ <exclude name="deployapi/build.xml" unless="deployapi.enabled"/> <!--not really that useful--> <exclude name="releasetest/build.xml"/> - <!--cargo support is on hold until 3.12--> + <!--cargo support is on hold --> <exclude name="cargo/build.xml" unless="cargo.enabled"/> <!--lacks the artifacts to compile--> <exclude name="constraints/build.xml" unless="constraints.enabled"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-10-05 13:31:58
|
Revision: 7912 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7912&view=rev Author: steve_l Date: 2009-10-05 13:31:46 +0000 (Mon, 05 Oct 2009) Log Message: ----------- SFOS-1040 new target for testing hadoop code, independent of everything else Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-10-05 12:32:36 UTC (rev 7911) +++ trunk/core/build.xml 2009-10-05 13:31:46 UTC (rev 7912) @@ -315,9 +315,16 @@ <!-- =================================================================== --> <target name="ccClover" depends="with.clover,cc,clover.report,clover.summary" - description="cruise control full build with clover, with NO checkout"/> + description="cruise control full build with clover, with NO checkout"/> <!-- =================================================================== --> + <!-- cruise control/hudson test of hadoop --> + <!-- =================================================================== --> + <target name="cc-hadoop-test" + depends="ivy-hadoop-tested" + description="CI test run of Hadoop"/> + + <!-- =================================================================== --> <!-- Start cruise control from inside ant --> <!-- Currently we fork and use whichever version of ant is in CC, not --> <!-- the version of Ant that is currently running. This is ugly, but --> @@ -515,7 +522,6 @@ <presetdef name="ivy-delegate" description="Delegate the build"> <subant verbose="true"> <buildpath refid="child.projects"/> - <!--<property file="master.properties"/>--> </subant> </presetdef> @@ -617,12 +623,11 @@ <ivy-delegate target="pdf-doc-folder" /> </target> - <target name="ivy-hadoop" depends="ivy-init"> - <ivy-projects reference="hadoop.projects" root="sf-hadoop-cluster"> + <target name="ivy-hadoop-tested" depends="ivy-init"> + <ivy-projects reference="hadoop.projects" root="sf-citerank"> </ivy-projects> - <subant target="hadoop" verbose="true"> + <subant target="tested" verbose="true"> <buildpath refid="hadoop.projects"/> - <!--<property file="master.properties"/>--> </subant> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-10-05 13:36:20
|
Revision: 7913 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7913&view=rev Author: steve_l Date: 2009-10-05 13:35:16 +0000 (Mon, 05 Oct 2009) Log Message: ----------- new cc-dist target for hudson Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-10-05 13:31:46 UTC (rev 7912) +++ trunk/core/build.xml 2009-10-05 13:35:16 UTC (rev 7913) @@ -290,9 +290,17 @@ <!-- full clean Cruise Control build without Checkout --> <!-- this is not cutting a release as "release" is not in the list--> <!-- =================================================================== --> + <target name="cc-dist" + depends="clean,ivy-list-order,dist" + description="CI clean distribution build"/> + + <!-- =================================================================== --> + <!-- full clean Cruise Control build without Checkout --> + <!-- this is not cutting a release as "release" is not in the list--> + <!-- =================================================================== --> <target name="cc-core" - depends="clean,ivy-list-order,dist,cc-test" - description="cruise control full build, with NO checkout"/> + depends="cc-dist,cc-test" + description="CI full build, with NO checkout"/> <!-- =================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-10-05 13:57:25
|
Revision: 7914 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7914&view=rev Author: steve_l Date: 2009-10-05 13:57:16 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Make the test targets clean first. Without this, old test reports were being retained. Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-10-05 13:35:16 UTC (rev 7913) +++ trunk/core/build.xml 2009-10-05 13:57:16 UTC (rev 7914) @@ -284,7 +284,7 @@ <!-- Cruise control test suite --> <!-- =================================================================== --> <target name="cc-test" - depends="tested"/> + depends="clean,tested"/> <!-- =================================================================== --> <!-- full clean Cruise Control build without Checkout --> @@ -329,7 +329,7 @@ <!-- cruise control/hudson test of hadoop --> <!-- =================================================================== --> <target name="cc-hadoop-test" - depends="ivy-hadoop-tested" + depends="clean, ivy-hadoop-tested" description="CI test run of Hadoop"/> <!-- =================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2009-10-05 16:47:21
|
Revision: 7916 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7916&view=rev Author: julgui Date: 2009-10-05 16:47:07 +0000 (Mon, 05 Oct 2009) Log Message: ----------- added info java.vm.name in build message Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-10-05 14:07:09 UTC (rev 7915) +++ trunk/core/build.xml 2009-10-05 16:47:07 UTC (rev 7916) @@ -84,6 +84,7 @@ <echo message=" ${Name.Company}"/> <echo message=" Java: ${java.version} ${java.vendor} "/> <echo message=" ${java.home} "/> + <echo message=" ${java.vm.name} "/> <echo message=" OS: ${os.name} ${os.version} (${os.arch})"/> <echo message=" Build dir: ${basedir}"/> <echo message=" Core dir: ${core.dir}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-10-06 12:01:50
|
Revision: 7931 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7931&view=rev Author: steve_l Date: 2009-10-06 12:01:43 +0000 (Tue, 06 Oct 2009) Log Message: ----------- SFOS-1300 need the target "test", not tested Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2009-10-06 11:57:44 UTC (rev 7930) +++ trunk/core/build.xml 2009-10-06 12:01:43 UTC (rev 7931) @@ -635,8 +635,9 @@ <target name="ivy-hadoop-tested" depends="ivy-init"> <ivy-projects reference="hadoop.projects" root="sf-citerank"> </ivy-projects> - <subant target="tested" verbose="true"> + <subant target="test" verbose="true"> <buildpath refid="hadoop.projects"/> + <property name="system.tests" value="true" /> </subant> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-02-12 14:29:52
|
Revision: 8193 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8193&view=rev Author: steve_l Date: 2010-02-12 14:29:44 +0000 (Fri, 12 Feb 2010) Log Message: ----------- support newer ivy versions in the main repository Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2010-02-11 17:19:23 UTC (rev 8192) +++ trunk/core/build.xml 2010-02-12 14:29:44 UTC (rev 8193) @@ -424,7 +424,7 @@ <property name="ivy.package.name" value="org.smartfrog" /> <property name="ivy.smartfrog.version" value="latest.integration" /> - <property name="ivy.jar" location="antbuild/ivy/lib/ivy-${ivy.version}.jar"/> + <property name="ivy.jar" location="antbuild/repository/org.apache.ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/> <!--Ivy 2 uses some separate directories, that also need cleanup--> <property name="ivy2.user.dir" location="${artifactsCache.dir}/.ivy2" /> <property name="ivy2.local.dir" location="${ivy2.user.dir}/local" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-06-02 13:40:24
|
Revision: 8316 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8316&view=rev Author: steve_l Date: 2010-06-02 13:40:18 +0000 (Wed, 02 Jun 2010) Log Message: ----------- SFOS-1489 testing under hudson Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2010-06-02 13:30:28 UTC (rev 8315) +++ trunk/core/build.xml 2010-06-02 13:40:18 UTC (rev 8316) @@ -218,7 +218,19 @@ description="test in test harness; only run system tests"> <ivy-delegate target="test" /> </target> + + + <!-- =================================================================== --> + <!-- test in the harness --> + <!-- =================================================================== --> + <target name="test-jersey" depends="testharness" + description="test in test harness; only run system tests"> + <forward2 dir="components/jersey" target="test" > + <property name="system.tests" value="true" /> + </forward2> + </target> + <!-- =================================================================== --> <!-- test all --> <!-- =================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-09-28 10:13:30
|
Revision: 8414 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8414&view=rev Author: steve_l Date: 2010-09-28 10:13:23 +0000 (Tue, 28 Sep 2010) Log Message: ----------- SFOS-1535 exclude bulkiotests module from normal SF test runs, which will time out Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2010-09-27 16:01:30 UTC (rev 8413) +++ trunk/core/build.xml 2010-09-28 10:13:23 UTC (rev 8414) @@ -512,6 +512,8 @@ <exclude name="sfgui/build.xml" unless="sfgui.enabled"/> <exclude name="avalanche/**/build.xml" unless="avalanche.enabled"/> <exclude name="VAST/build.xml" unless="vast.enabled"/> + <!--these are slow and normally run in their own test runs--> + <exclude name="bulkiotests/build.xml" unless="bulkiotests.enabled"/> </fileset> <fileset dir="components" includes="**/build.xml" > <!--no cddlm here--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-10-28 15:45:23
|
Revision: 8422 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8422&view=rev Author: steve_l Date: 2010-10-28 15:45:16 +0000 (Thu, 28 Oct 2010) Log Message: ----------- SFOS-1540 smartfrog-jersey-test failing in hudson w/ build.xml error Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2010-10-27 11:01:50 UTC (rev 8421) +++ trunk/core/build.xml 2010-10-28 15:45:16 UTC (rev 8422) @@ -101,15 +101,18 @@ <attribute name="target"/> <attribute name="inheritAll" default="false"/> <attribute name="antfile" default="build.xml"/> + <element name="options" optional="true"/> <sequential> <subant antfile="@{antfile}" target="@{target}" inheritAll="@{inheritAll}" inheritrefs="false"> <buildpathelement location="@{dir}"/> + <options /> </subant> </sequential> </macrodef> + <macrodef name="forward"> <attribute name="dir"/> <attribute name="target"/> @@ -226,7 +229,9 @@ <target name="test-jersey" depends="testharness" description="test in test harness; only run system tests"> <forward2 dir="components/jersey" target="test" > - <property name="system.tests" value="true" /> + <options > + <property name="system.tests" value="true" /> + </options> </forward2> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2011-06-22 10:11:12
|
Revision: 8643 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8643&view=rev Author: steve_l Date: 2011-06-22 10:11:06 +0000 (Wed, 22 Jun 2011) Log Message: ----------- stop building testng Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2011-06-22 08:58:08 UTC (rev 8642) +++ trunk/core/build.xml 2011-06-22 10:11:06 UTC (rev 8643) @@ -547,6 +547,8 @@ <!-- remove the hadoop stuff while things change--> <exclude name="hadoop/build.xml"/> + <!-- remove the hadoop stuff while things change--> + <exclude name="testng/build.xml"/> </fileset> <!--place for symlinks to external projects you want included--> <fileset dir="external" includes="**/build.xml"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2011-06-22 10:12:34
|
Revision: 8644 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8644&view=rev Author: steve_l Date: 2011-06-22 10:12:27 +0000 (Wed, 22 Jun 2011) Log Message: ----------- purge tabs Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2011-06-22 10:11:06 UTC (rev 8643) +++ trunk/core/build.xml 2011-06-22 10:12:27 UTC (rev 8644) @@ -47,19 +47,19 @@ <target name="init"> <property file="build.properties" /> <property environment="env" /> - <property name="core.dir" location="."/> + <property name="core.dir" location="."/> <property name="root.dir" location="."/> <tstamp> <format property="build.timestamp" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" /> </tstamp> - - <!-- where the ivy/maven artifacts are stored --> - + + <!-- where the ivy/maven artifacts are stored --> + <property name="artifactsCache.dir" location="${user.home}"/> - + <property name="ivy.default.ivy.user.dir" location="${artifactsCache.dir}"/> - + <available property="nice.task.present" classname="org.apache.tools.ant.taskdefs.Nice" /> <property name="toplevel.dir" location=".." /> @@ -84,7 +84,7 @@ <echo message=" ${Name.Company}"/> <echo message=" Java: ${java.version} ${java.vendor} "/> <echo message=" ${java.home} "/> - <echo message=" ${java.vm.name} "/> + <echo message=" ${java.vm.name} "/> <echo message=" OS: ${os.name} ${os.version} (${os.arch})"/> <echo message=" Build dir: ${basedir}"/> <echo message=" Core dir: ${core.dir}"/> @@ -122,22 +122,22 @@ </sequential> </macrodef> </target> - + - + <!-- =================================================================== --> <!-- build a distribution of smartfrog.jar, sfExamples.jar --> <!-- =================================================================== --> <target name="main-dist" depends="ivy-init" description="build a distribution"> <ivy-delegate target="published-distribution" /> </target> - + <!-- tracking down quirks in subant --> <target name="diag2" depends="init" > <forward2 dir="${components.project}" target="diag2" /> </target> - + <!-- =================================================================== --> <!-- clean all sub-projects --> <!-- =================================================================== --> @@ -165,7 +165,7 @@ <!-- =================================================================== --> - <!-- components distribution --> + <!-- components distribution --> <!-- =================================================================== --> <target name="components" depends="ivy-init" @@ -181,7 +181,7 @@ description="install components distribution(s)"> <ivy-delegate target="installed" /> </target> - + <!-- =================================================================== --> <!-- main distribution --> @@ -234,8 +234,8 @@ </options> </forward2> </target> - - + + <!-- =================================================================== --> <!-- test all --> <!-- =================================================================== --> @@ -311,7 +311,7 @@ <target name="cc-dist" depends="clean,ivy-list-order,dist" description="CI clean distribution build"/> - + <!-- =================================================================== --> <!-- full clean Cruise Control build without Checkout --> <!-- this is not cutting a release as "release" is not in the list--> @@ -320,7 +320,7 @@ depends="cc-dist,cc-test" description="CI full build, with NO checkout"/> - + <!-- =================================================================== --> <!-- full clean Cruise Control build --> <!-- was cc-init,release,cc-incremental,cc-test--> @@ -335,7 +335,7 @@ <target name="cc" depends="cc-core,mavenReportNoSVNUpdate" description="cruise control full build, with NO checkout"/> - + <!-- =================================================================== --> <!-- full clean Cruise Control build without Checkout --> <!-- =================================================================== --> @@ -523,7 +523,7 @@ <exclude name="bulkiotests/build.xml" unless="bulkiotests.enabled"/> <exclude name="hadoop-cluster/build.xml"/> </fileset> - + <fileset dir="components" includes="**/build.xml" > <!--no cddlm here--> <exclude name="deployapi/build.xml" unless="deployapi.enabled"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2011-10-27 15:05:55
|
Revision: 8793 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8793&view=rev Author: steve_l Date: 2011-10-27 15:05:49 +0000 (Thu, 27 Oct 2011) Log Message: ----------- SFOS-1630 pull in hadoop components to the build Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2011-10-27 15:05:19 UTC (rev 8792) +++ trunk/core/build.xml 2011-10-27 15:05:49 UTC (rev 8793) @@ -550,6 +550,8 @@ <!-- remove the hadoop stuff while things change--> <exclude name="testng/build.xml"/> </fileset> + <!--hadoop stuff--> + <fileset dir="hadoop-components" includes="*/build.xml"/> <!--place for symlinks to external projects you want included--> <fileset dir="external" includes="**/build.xml"/> </ivy:buildlist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2011-10-31 10:19:48
|
Revision: 8802 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8802&view=rev Author: steve_l Date: 2011-10-31 10:19:41 +0000 (Mon, 31 Oct 2011) Log Message: ----------- SFOS-1630 add a hadoop.enabled flag and disable tests when not live Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2011-10-31 10:15:54 UTC (rev 8801) +++ trunk/core/build.xml 2011-10-31 10:19:41 UTC (rev 8802) @@ -551,7 +551,7 @@ <exclude name="testng/build.xml"/> </fileset> <!--hadoop stuff--> - <fileset dir="hadoop-components" includes="*/build.xml"/> + <fileset dir="hadoop-components" includes="*/build.xml" if="hadoop.enabled"/> <!--place for symlinks to external projects you want included--> <fileset dir="external" includes="**/build.xml"/> </ivy:buildlist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2011-10-31 10:23:30
|
Revision: 8803 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8803&view=rev Author: steve_l Date: 2011-10-31 10:23:24 +0000 (Mon, 31 Oct 2011) Log Message: ----------- SFOS-1630 add a hadoop.enabled flag and disable tests when not live Modified Paths: -------------- trunk/core/build.xml Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2011-10-31 10:19:41 UTC (rev 8802) +++ trunk/core/build.xml 2011-10-31 10:23:24 UTC (rev 8803) @@ -551,7 +551,9 @@ <exclude name="testng/build.xml"/> </fileset> <!--hadoop stuff--> - <fileset dir="hadoop-components" includes="*/build.xml" if="hadoop.enabled"/> + <fileset dir="hadoop-components"> + <include name="*/build.xml" if="hadoop.enabled"/> + </fileset> <!--place for symlinks to external projects you want included--> <fileset dir="external" includes="**/build.xml"/> </ivy:buildlist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |