From: <ju...@us...> - 2006-10-24 09:19:14
|
Revision: 3513 http://svn.sourceforge.net/smartfrog/?rev=3513&view=rev Author: julgui Date: 2006-10-24 02:18:21 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-10-23 16:43:48 UTC (rev 3512) +++ trunk/core/common.xml 2006-10-24 09:18:21 UTC (rev 3513) @@ -436,6 +436,7 @@ doctitle="${Name.System}" bottom="${Name.Company}" source="${javac.java.version}" + verbose="false" > </javadoc> </presetdef> @@ -453,7 +454,7 @@ <!-- Java Docs for all --> <echo message=""/> <echo message="------------------------------------------------------------------------"/> - <echo message=" Creating Java Docs for ${Name.System} ${version} [${dist.jdocs.dir}]"/> + <echo message=" Creating Java Docs for ${javadoc.header} [${dist.jdocs.dir}]"/> <echo message="------------------------------------------------------------------------"/> <mkdir dir="${dist.jdocs.dir}"/> <sf-javadoc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-10-27 09:22:49
|
Revision: 3536 http://svn.sourceforge.net/smartfrog/?rev=3536&view=rev Author: julgui Date: 2006-10-27 02:22:44 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Build messages simplified. Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-10-27 09:15:41 UTC (rev 3535) +++ trunk/core/common.xml 2006-10-27 09:22:44 UTC (rev 3536) @@ -453,7 +453,7 @@ > <!-- Java Docs for all --> <echo message=""/> - <echo message="----------------Creating Java Docs for ${javadoc.header} [${dist.jdocs.dir}]---------------"/> + <echo message="------ Creating Java Docs for ${javadoc.header} [${dist.jdocs.dir}]---------------"/> <mkdir dir="${dist.jdocs.dir}"/> <sf-javadoc sourcepath="${src.dir}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2006-11-06 14:36:43
|
Revision: 3569 http://svn.sourceforge.net/smartfrog/?rev=3569&view=rev Author: julgui Date: 2006-11-06 06:36:38 -0800 (Mon, 06 Nov 2006) Log Message: ----------- Added sfcd Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-11-06 14:04:06 UTC (rev 3568) +++ trunk/core/common.xml 2006-11-06 14:36:38 UTC (rev 3569) @@ -392,7 +392,7 @@ <attribute name="dest"/> <attribute name="failonerror" default="false"/> <attribute name="pattern" - default="**/*.ini,**/*.xml,**/*.dtd,**/*.xsd,**/*.sf,**/*.wsdl,**/*.properties,**/*.wsdd,**/*.cdl,**/*.css,**/*.xsl"/> + default="**/*.ini,**/*.xml,**/*.dtd,**/*.xsd,**/*.sf,**/*.sfcd,**/*.wsdl,**/*.properties,**/*.wsdd,**/*.cdl,**/*.css,**/*.xsl"/> <sequential> <echo level="verbose">copying @{pattern} from @{src} to @{dest}</echo> <copy todir="@{dest}" failonerror="@{failonerror}"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2006-12-21 16:14:54
|
Revision: 3751 http://svn.sourceforge.net/smartfrog/?rev=3751&view=rev Author: steve_l Date: 2006-12-21 08:14:52 -0800 (Thu, 21 Dec 2006) Log Message: ----------- gump must publish Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2006-12-21 16:14:44 UTC (rev 3750) +++ trunk/core/common.xml 2006-12-21 16:14:52 UTC (rev 3751) @@ -1198,7 +1198,7 @@ <!-- this is the gump entry point; it does packaging and tests --> <!-- ========================================================== --> <target name="gump" - depends="test,dist,installed" + depends="test,dist,published" description="target for gump builds" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-01-24 11:15:54
|
Revision: 3827 http://svn.sourceforge.net/smartfrog/?rev=3827&view=rev Author: steve_l Date: 2007-01-24 03:15:52 -0800 (Wed, 24 Jan 2007) Log Message: ----------- add some extra diags for our friend gump Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-01-23 17:00:52 UTC (rev 3826) +++ trunk/core/common.xml 2007-01-24 11:15:52 UTC (rev 3827) @@ -221,10 +221,19 @@ classpathref="smartfrog.classpath"/> </not> </condition> - Smartfrog distribution not found. Please create the smartfrog distribution first. - Alternatively, make sure that this project is configured to locate the distribution - correctly. +Smartfrog distribution not found. Please create the smartfrog distribution first. +Alternatively, make sure that this project is configured to locate the distribution +correctly. + +smartfrog.classpath= + ${toString:smartfrog.classpath} + +build.sysclasspath=${build.sysclasspath} + +${java.class.path}= + ${java.class.path} </fail> + <!-- load in our version --> <loadproperties resource="${smartfrog.version.property.resource}" classpathref="smartfrog.classpath"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-01-24 14:37:33
|
Revision: 3828 http://svn.sourceforge.net/smartfrog/?rev=3828&view=rev Author: steve_l Date: 2007-01-24 06:37:27 -0800 (Wed, 24 Jan 2007) Log Message: ----------- new code to publish javadoc and documentation zip files. The documentation only works if docs are in doc/**.*, and are pdf, star office or html files Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-01-24 11:15:52 UTC (rev 3827) +++ trunk/core/common.xml 2007-01-24 14:37:27 UTC (rev 3828) @@ -254,10 +254,22 @@ test code (inc deployment descriptors) for deployment onto secure boxes --> - <property name="test.jar.name" value="${artifact.name}-${Version}-test.jar"/> + <property name="test.jar.name" value="${artifact.name}-test-${Version}.jar"/> <property name="test.jar" location="${dist.lib.dir}/${test.jar.name}" /> + <!--name of javadocs zip file--> + <property name="javadocs.zip.name" value="${artifact.name}-javadocs-${Version}.zip"/> + <property name="javadocs.zip" + location="${dist.lib.dir}/${javadocs.zip.name}" /> + + <!--info about the documentation zip--> + <property name="documentation.zip.name" + value="${artifact.name}-documentation-${Version}.zip"/> + <property name="documentation.zip" + location="${dist.lib.dir}/${documentation.zip.name}" /> + + <!-- standard location for distributed stuff; used when locating other things --> <property name="dist.lib.dir.relative" value="/dist/lib" /> @@ -479,9 +491,14 @@ <!-- =================================================================== --> <!-- Javadocs. uses the compile classpath to set up the javadoc task --> <!-- =================================================================== --> + + <target name="ready-to-javadoc" + depends="init, generateversion,declare-classpaths,init-javadoc" + /> + <target name="javadoc" - depends="init, generateversion,declare-classpaths,init-javadoc" - unless="javadoc.disabled" + depends="ready-to-javadoc" + unless="javadoc.disabled" > <!-- Java Docs for all --> <echo message=""/> @@ -496,7 +513,44 @@ </sf-javadoc> </target> + <!--Package up the javadocs into their own zip file--> + <target name="ready-to-package-javadocs" depends="javadoc"> + </target> + + <target name="package-javadocs" depends="ready-to-package-javadocs" + description="package up all the javadocs"> + <zip destfile="${javadocs.zip}"> + <zipfileset dir="${dist.jdocs.dir}" includes="**/*.*" + prefix="javadoc"/> + </zip> + </target> + <!-- ========================================================== --> + <!-- set up the documentation--> + <!-- ========================================================== --> + + <target name="init-documents" depends="init"> + + </target> + + <target name="ready-to-package-documents" depends="init-documents"> + + </target> + + <target name="package-documents" depends="ready-to-package-documents"> + <zip destfile="${documentation.zip}" + whenempty="create" duplicate="preserve"> + <!--fileset is set up to work if there are no artifacts--> + <zipfileset dir="." > + <include name="doc/**/*.html" /> + <include name="doc/**/*.pdf" /> + <include name="doc/**/*.sx?" /> + </zipfileset> + </zip> + </target> + + + <!-- ========================================================== --> <!-- This target is used to set up the standard output for builds and tests and things --> @@ -1534,13 +1588,27 @@ <!--jars,--> <target name="ready-to-publish" depends="checksum-target-jar,ivy-report"/> + <!--publish all artifacts--> <target name="ivy-publish" depends="ready-to-publish" xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> <ivy:publish resolver="local" pubrevision="${Version}" overwrite="true" + conf="master" artifactspattern="${dist.lib.dir}/[artifact]-[revision].[ext]" /> </target> + <target name="ready-to-publish-all" + depends="ready-to-publish,package-javadocs,package-documents"/> + + <!--publish everything, rather than just artifacts in the master config--> + <target name="ivy-publish-all" depends="ready-to-publish-all" + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + <ivy:publish resolver="local" pubrevision="${Version}" + overwrite="true" + haltonmissing="false" + artifactspattern="${dist.lib.dir}/[artifact]-[revision].[ext]" /> + </target> + <target name="published" depends="ivy-publish,m2-install" description="Publish artifacts to the local repositories" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-01-30 15:39:52
|
Revision: 3848 http://svn.sourceforge.net/smartfrog/?rev=3848&view=rev Author: steve_l Date: 2007-01-30 07:39:48 -0800 (Tue, 30 Jan 2007) Log Message: ----------- set the tests.compile.classpath path under ivy Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-01-30 15:01:30 UTC (rev 3847) +++ trunk/core/common.xml 2007-01-30 15:39:48 UTC (rev 3848) @@ -230,7 +230,7 @@ build.sysclasspath=${build.sysclasspath} -${java.class.path}= +java.class.path= ${java.class.path} </fail> @@ -493,7 +493,7 @@ <!-- =================================================================== --> <target name="ready-to-javadoc" - depends="init, generateversion,declare-classpaths,init-javadoc" + depends="generateversion,declare-classpaths,init-javadoc" /> <target name="javadoc" @@ -503,6 +503,9 @@ <!-- Java Docs for all --> <echo message=""/> <echo message="------ Creating Java Docs for ${javadoc.header} [${dist.jdocs.dir}]---------------"/> + <fail unless="dist.jdocs.dir"> + We are not properly initialized, as dist.jdocs.dir is undefined. + </fail> <mkdir dir="${dist.jdocs.dir}"/> <sf-javadoc sourcepath="${src.dir}" @@ -575,7 +578,6 @@ <mkdir dir="${test.dir}" /> <mkdir dir="${test.classes.dir}" /> <mkdir dir="${test.data.dir}" /> - <mkdir dir="${test.datafiles.dir}" /> <mkdir dir="${test.reports.dir}" /> <mkdir dir="${dist.dir}"/> @@ -583,6 +585,9 @@ <mkdir dir="${dist.doc.dir}"/> <mkdir dir="${dist.bin.dir}"/> <mkdir dir="${dist.src.dir}"/> + <fail unless="dist.jdocs.dir"> + We are not properly initialized, as dist.jdocs.dir is undefined. + </fail> <mkdir dir="${dist.jdocs.dir}"/> </target> @@ -669,7 +674,7 @@ depends= "ivy-classpaths,declare-base.compile.classpath,declare-compile.classpath, declare-exec.classpath,declare-tests.compile.classpath, - declare-tests.run.classpath,declare-tests.run.classpath, + declare-tests.run.classpath, declare-run.classpath-no-tests,declare-run.classpath"/> @@ -692,10 +697,17 @@ <echo level="verbose">exec.classpath=${toString:exec.classpath}</echo> </target> - <target name="ivy.tests.run.classpath" depends="ivy.exec.classpath" if="ivy.enabled"> + <target name="ivy.tests.compile.classpath" depends="ivy.exec.classpath" if="ivy.enabled"> + <path id="tests.compile.classpath"> + <path refid="exec.classpath"/> + </path> + <echo level="verbose">tests.compile.classpath=${tests.compile.classpath}</echo> + </target> + + <target name="ivy.tests.run.classpath" depends="ivy.tests.compile.classpath" if="ivy.enabled"> <path id="tests.run.classpath"> <pathelement location="${test.jar}"/> - <path refid="exec.classpath"/> + <path refid="tests.compile.classpath"/> </path> <echo level="verbose">tests.run.classpath=${toString:tests.run.classpath}</echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-02-02 11:00:27
|
Revision: 3859 http://svn.sourceforge.net/smartfrog/?rev=3859&view=rev Author: steve_l Date: 2007-02-02 02:58:50 -0800 (Fri, 02 Feb 2007) Log Message: ----------- buildtest needs to call "published" in core/smartfrog for ivy support Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-02-02 10:58:15 UTC (rev 3858) +++ trunk/core/common.xml 2007-02-02 10:58:50 UTC (rev 3859) @@ -1310,7 +1310,7 @@ <target name="smartfrog-dist" depends="init-common" > - <ant dir="${smartfrog.home}" target="dist" inheritall="false"/> + <ant dir="${smartfrog.home}" target="published" inheritall="false"/> </target> <!-- ========================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-22 16:59:29
|
Revision: 4005 http://svn.sourceforge.net/smartfrog/?rev=4005&view=rev Author: steve_l Date: 2007-03-22 09:59:17 -0700 (Thu, 22 Mar 2007) Log Message: ----------- spelling corrections Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-03-22 16:58:43 UTC (rev 4004) +++ trunk/core/common.xml 2007-03-22 16:59:17 UTC (rev 4005) @@ -231,7 +231,7 @@ classpathref="smartfrog.classpath"/> </not> </condition> -Smartfrog distribution not found. Please create the smartfrog distribution first. +SmartFrog distribution not found. Please create the SmartFrog distribution first. Alternatively, make sure that this project is configured to locate the distribution correctly. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-27 15:49:58
|
Revision: 4022 http://svn.sourceforge.net/smartfrog/?rev=4022&view=rev Author: steve_l Date: 2007-03-27 08:49:57 -0700 (Tue, 27 Mar 2007) Log Message: ----------- extra tests for the ivy files, but no action on the results (yet) Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-03-27 15:40:44 UTC (rev 4021) +++ trunk/core/common.xml 2007-03-27 15:49:57 UTC (rev 4022) @@ -1549,12 +1549,30 @@ </target> + <target name="ivy-properties" depends="init-common-simpledefinitions,load-versions" > + <property name="ivy.dir" location="${build.extra.dir}/ivy" /> + <property name="ivy.lib.dir" location="${ivy.dir}/lib" /> + <property name="ivy.version" value="1.4.1" /> + <property name="ivy.resource" value="fr/jayasoft/ivy/ant/antlib.xml" /> + <property name="ivy.reports.dir" location="${build.dir}/ivy/reports"/> + <property name="ivy.jar" + location="${core.dir}/antbuild/ivy/lib/ivy-${ivy.version}.jar"/> + <available property="ivy.jar.found" file="${ivy.jar}" /> + <available property="ivy.resource.found" resource="${ivy.resource}" /> + <condition property="ivy.found" > + <or > + <isset property="ivy.jar.found"/> + <isset property="ivy.resource.found"/> + </or> + </condition> + </target> + <target name="maybe-declare-ivy" if="ivy.enabled" - depends="init-common-simpledefinitions,load-versions"> + depends="ivy-properties"> <typedef uri="antlib:fr.jayasoft.ivy.ant" onerror="fail" - resource="fr/jayasoft/ivy/ant/antlib.xml"> + resource="${ivy.resource}"> <classpath> - <pathelement location="${core.dir}/antbuild/ivy/lib/ivy-${ivy.version}.jar"/> + <pathelement location="${ivy.jar}"/> </classpath> </typedef> </target> @@ -1565,13 +1583,13 @@ <typedef uri="antlib:fr.jayasoft.ivy.ant" onerror="fail" resource="fr/jayasoft/ivy/ant/antlib.xml"> <classpath> - <pathelement location="${core.dir}/antbuild/ivy/lib/ivy-${ivy.version}.jar"/> + <pathelement location="${ivy.jar}"/> </classpath> </typedef> </target> <target name="maybe-ivy-init" - depends="init-common-simpledefinitions,load-versions,declare-ivy" + depends="declare-ivy" if="ivy.enabled" > <property name="ivy.lib.dir" location="${build.dir}/lib" /> <ivy:configure file="${core.dir}/antbuild/ivy/ivyconf.xml"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-28 10:06:22
|
Revision: 4029 http://svn.sourceforge.net/smartfrog/?rev=4029&view=rev Author: steve_l Date: 2007-03-28 03:06:20 -0700 (Wed, 28 Mar 2007) Log Message: ----------- SFOS-10: use <diagnostics> for better diagnostics of what is going on under a CI server Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-03-28 08:46:08 UTC (rev 4028) +++ trunk/core/common.xml 2007-03-28 10:06:20 UTC (rev 4029) @@ -1348,7 +1348,7 @@ <!-- ========================================================== --> <target name="diagnostics" depends="init" description="build file diagnostics"> - <echoproperties format="xml"/> + <diagnostics/> </target> <target name="diag2" depends="init,verify-prerequisites"> @@ -1557,6 +1557,8 @@ <property name="ivy.reports.dir" location="${build.dir}/ivy/reports"/> <property name="ivy.jar" location="${core.dir}/antbuild/ivy/lib/ivy-${ivy.version}.jar"/> + <property name="ivy.ibiblio.root" + value="http://www.ibiblio.org/maven2/"/> <available property="ivy.jar.found" file="${ivy.jar}" /> <available property="ivy.resource.found" resource="${ivy.resource}" /> <condition property="ivy.found" > @@ -1600,6 +1602,29 @@ <ivy:resolve /> </target> + <target name="ivy-probe-repository" + description="check that the repository is reachable" + depends="ivy-properties"> + <property name="ivy.probe.path" + value="${ivy.ibiblio.root}org/apache/ant/"/> + <echo>Probing ${ivy.probe.path}</echo> + <condition property="ivy.repository.reachable"> + <or> +<!-- + <isreachable url="${ivy.ibiblio.root}" timeout="10"/> +--> + <http url="${ivy.probe.path}" /> + </or> + </condition> + </target> + + <target name="ivy-require-repository" depends="ivy-probe-repository" + unless="ivy.repository.reachable"> + <fail> + Unable to reach ${ivy.ibiblio.root} + </fail> + </target> + <!--This is a trick. by running the same stuff as "maybe-ivy-init" with the opposite condition we, guarantee that the target code runs once, but only once--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-28 10:14:29
|
Revision: 4031 http://svn.sourceforge.net/smartfrog/?rev=4031&view=rev Author: steve_l Date: 2007-03-28 03:14:24 -0700 (Wed, 28 Mar 2007) Log Message: ----------- SFOS-10: use <diagnostics> for better diagnostics of what is going on under a CI server Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-03-28 10:14:08 UTC (rev 4030) +++ trunk/core/common.xml 2007-03-28 10:14:24 UTC (rev 4031) @@ -1343,7 +1343,6 @@ </target> <!-- ========================================================== --> - <!-- this is an override point --> <!-- print meaningful diagnostics --> <!-- ========================================================== --> <target name="diagnostics" depends="init" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-28 14:04:48
|
Revision: 4034 http://svn.sourceforge.net/smartfrog/?rev=4034&view=rev Author: steve_l Date: 2007-03-28 07:04:46 -0700 (Wed, 28 Mar 2007) Log Message: ----------- stopping the m2 tasks failing in the absence of a local repository that is no longer used Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-03-28 11:10:31 UTC (rev 4033) +++ trunk/core/common.xml 2007-03-28 14:04:46 UTC (rev 4034) @@ -1446,15 +1446,6 @@ value="antlib:org.apache.maven.artifact.ant"/> <available property="m2.tasks.available" resource="org/apache/maven/artifact/ant/antlib.xml"/> - <!-- location of the bit of the repository we keep under SCM --> - <property name="m2.smartfrog.scm.repository" - location="${smartfrog.components.dir}/lib"/> - <sf-tourl file="${m2.smartfrog.scm.repository}" - property="m2.smartfrog.scm.repository.url"/> - <property name="m2.smartfrog.scm.new.repository" - location="${core.dir}/antbuild/repository"/> - <sf-tourl file="${m2.smartfrog.scm.new.repository}" - property="m2.smartfrog.scm.new.repository.url"/> <property name="m2.ibiblio.repository" value="http://ibiblio.org/maven2"/> @@ -1467,36 +1458,7 @@ property="m1.local.repository.url"/> </target> -<!-- - <target name="m2-tasks" depends="m2-init" - xmlns:m2="antlib:org.apache.maven.artifact.ant"> - <fail unless="m2.tasks.available"> - you need the maven2 tasks from http://maven.apache.org/maven2/ant-tasks.html - </fail> - <presetdef name="m2-libraries"> - <m2:dependencies> - <localRepository location="${m2.repository}" /> - <remoteRepository url="${m2.smartfrog.scm.repository.url}" /> - <remoteRepository url="${m2.smartfrog.scm.new.repository.url}"/> - <remoteRepository url="${m2.ibiblio.repository}" /> - <remoteRepository url="http://cvs.apache.org/repository/" - layout="legacy"/> - <remoteRepository url="${m1.local.repository.url}" - layout="legacy"/> - - </m2:dependencies> - </presetdef> - - - <presetdef name="m2-publish-local"> - <m2:install file="${target.jar}"> - <pom refid="m2.pom"/> - </m2:install> - </presetdef> - </target> ---> - <!-- look for local then remote definitions of library versions --> <target name="load-versions" depends="init"> <property file="libraries.properties"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-28 14:40:30
|
Revision: 4038 http://svn.sourceforge.net/smartfrog/?rev=4038&view=rev Author: steve_l Date: 2007-03-28 07:40:29 -0700 (Wed, 28 Mar 2007) Log Message: ----------- SFOS-99; give every build file an all target that does dist, test and published. Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-03-28 14:24:44 UTC (rev 4037) +++ trunk/core/common.xml 2007-03-28 14:40:29 UTC (rev 4038) @@ -434,7 +434,7 @@ <attribute name="failed"/> <sequential> <sf-junitreport data="@{data}" reports="@{reports}" /> - <fail if="@{failed}">Unit tests failed see: + <fail if="@{failed}">Tests failed see: @{reports}</fail> </sequential> </macrodef> @@ -1208,6 +1208,15 @@ </target> + <target name="all" description="build, test and publish the code" + depends="test,published,dist"> + </target> + + + <target name="all" description="build, test and publish the code" + depends="test,published,dist"> + </target> + <!-- =================================================================== --> <!-- a clean distribution --> <!-- =================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-28 15:38:55
|
Revision: 4043 http://svn.sourceforge.net/smartfrog/?rev=4043&view=rev Author: steve_l Date: 2007-03-28 08:37:54 -0700 (Wed, 28 Mar 2007) Log Message: ----------- removed the duplicate target Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-03-28 15:32:51 UTC (rev 4042) +++ trunk/core/common.xml 2007-03-28 15:37:54 UTC (rev 4043) @@ -1207,16 +1207,10 @@ description="create a distribution"> </target> - <target name="all" description="build, test and publish the code" depends="test,published,dist"> </target> - - <target name="all" description="build, test and publish the code" - depends="test,published,dist"> - </target> - <!-- =================================================================== --> <!-- a clean distribution --> <!-- =================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-03-28 16:11:27
|
Revision: 4047 http://svn.sourceforge.net/smartfrog/?rev=4047&view=rev Author: steve_l Date: 2007-03-28 09:11:25 -0700 (Wed, 28 Mar 2007) Log Message: ----------- getting directories for ivy right Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-03-28 16:09:14 UTC (rev 4046) +++ trunk/core/common.xml 2007-03-28 16:11:25 UTC (rev 4047) @@ -1514,11 +1514,11 @@ <target name="ivy-properties" depends="init-common-simpledefinitions,load-versions" > - <property name="ivy.dir" location="${build.extra.dir}/ivy" /> + <property name="ivy.dir" location="${build.dir}/ivy" /> <property name="ivy.lib.dir" location="${ivy.dir}/lib" /> <property name="ivy.version" value="1.4.1" /> <property name="ivy.resource" value="fr/jayasoft/ivy/ant/antlib.xml" /> - <property name="ivy.reports.dir" location="${build.dir}/ivy/reports"/> + <property name="ivy.reports.dir" location="${ivy.dir}/reports"/> <property name="ivy.jar" location="${core.dir}/antbuild/ivy/lib/ivy-${ivy.version}.jar"/> <property name="ivy.ibiblio.root" @@ -1557,7 +1557,6 @@ <target name="maybe-ivy-init" depends="declare-ivy" if="ivy.enabled" > - <property name="ivy.lib.dir" location="${build.dir}/lib" /> <ivy:configure file="${core.dir}/antbuild/ivy/ivyconf.xml"/> </target> @@ -1609,8 +1608,7 @@ </target> <target name="ivy-report" depends="ivy-resolve" > - <property name="ivy.report.dir" location="${build.dir}/ivy/reports"/> - <ivy:report todir="${ivy.report.dir}"/> + <ivy:report todir="${ivy.reports.dir}"/> <echo> published Ivy report to ${ivy.report.dir} </echo> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-04-04 15:17:13
|
Revision: 4063 http://svn.sourceforge.net/smartfrog/?rev=4063&view=rev Author: steve_l Date: 2007-04-04 08:17:12 -0700 (Wed, 04 Apr 2007) Log Message: ----------- typo Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-04-03 12:57:49 UTC (rev 4062) +++ trunk/core/common.xml 2007-04-04 15:17:12 UTC (rev 4063) @@ -1617,7 +1617,7 @@ <target name="ivy-report" depends="ivy-resolve" > <ivy:report todir="${ivy.reports.dir}"/> <echo> published Ivy report to -${ivy.report.dir} +${ivy.reports.dir} </echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-04-12 10:55:34
|
Revision: 4082 http://svn.sourceforge.net/smartfrog/?rev=4082&view=rev Author: steve_l Date: 2007-04-12 03:55:33 -0700 (Thu, 12 Apr 2007) Log Message: ----------- you can now configure the retrieval pattern for artifacts Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-04-12 10:54:51 UTC (rev 4081) +++ trunk/core/common.xml 2007-04-12 10:55:33 UTC (rev 4082) @@ -1611,7 +1611,11 @@ </target> <target name="ivy-retrieve" depends="ivy-resolve" > - <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]" sync="true" /> + <property name="ivy.retrieve.pattern" + value="[conf]/[artifact]-[revision].[ext]" /> + <property name="ivy.retrieve.path" + value="${ivy.lib.dir}/${ivy.retrieve.pattern}" /> + <ivy:retrieve pattern="${ivy.retrieve.path}" sync="true" /> </target> <target name="ivy-report" depends="ivy-resolve" > @@ -1629,7 +1633,7 @@ xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> <ivy:publish resolver="local" pubrevision="${Version}" overwrite="true" - conf="master" + conf="master" artifactspattern="${dist.lib.dir}/[artifact]-[revision].[ext]" /> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-05-17 15:55:11
|
Revision: 4149 http://svn.sourceforge.net/smartfrog/?rev=4149&view=rev Author: steve_l Date: 2007-05-17 08:55:06 -0700 (Thu, 17 May 2007) Log Message: ----------- tweak tests to only compile if there is a test source dir. Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-05-17 12:26:08 UTC (rev 4148) +++ trunk/core/common.xml 2007-05-17 15:55:06 UTC (rev 4149) @@ -1097,10 +1097,26 @@ <!-- ========================================================== --> <!-- this is an override point --> + <!-- all things that have to be in place before tests are compiled --> + <!-- ========================================================== --> + <target name="ready-to-compile-tests" + depends="package,assert-smartfrog-testharness,declare-classpaths,test-for-test-sources" + /> + + <!--stops tests being compiled if there are no tests--> + <target name="test-for-test-sources" depends="init"> + <available file="${test.src.dir}" + type="dir" + property="test.dir.found"/> + </target> + + <!-- ========================================================== --> + <!-- this is an override point --> <!-- compile everything, copy useful files over--> <!-- ========================================================== --> <target name="compile-tests" - depends="package,assert-smartfrog-testharness,declare-classpaths"> + depends="ready-to-compile-tests" + if="test.dir.found"> <depend srcdir="${test.src.dir}" destdir="${test.classes.dir}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-05-18 10:03:02
|
Revision: 4155 http://svn.sourceforge.net/smartfrog/?rev=4155&view=rev Author: steve_l Date: 2007-05-18 03:03:01 -0700 (Fri, 18 May 2007) Log Message: ----------- add a bit more diags on javadoc, to see why xom is not javadocing properly on java1.4. Actually the problem is that we shouldnt built it on java1.4 Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-05-18 09:50:29 UTC (rev 4154) +++ trunk/core/common.xml 2007-05-18 10:03:01 UTC (rev 4155) @@ -507,9 +507,12 @@ depends="ready-to-javadoc" unless="javadoc.disabled" > - <!-- Java Docs for all --> - <echo message=""/> - <echo message="------ Creating Java Docs for ${javadoc.header} [${dist.jdocs.dir}]---------------"/> + <!-- Java Docs for all --> + <echo> + Creating Java Docs for ${javadoc.header} into + [${dist.jdocs.dir}] + (language level=${javac.java.version}) + </echo> <fail unless="dist.jdocs.dir"> We are not properly initialized, as dist.jdocs.dir is undefined. </fail> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-06-05 10:11:12
|
Revision: 4234 http://svn.sourceforge.net/smartfrog/?rev=4234&view=rev Author: steve_l Date: 2007-06-05 03:11:11 -0700 (Tue, 05 Jun 2007) Log Message: ----------- patch in a codebase setup to the base file Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-06-04 16:07:56 UTC (rev 4233) +++ trunk/core/common.xml 2007-06-05 10:11:11 UTC (rev 4234) @@ -1295,8 +1295,28 @@ <echo>reports in ${test.reports.dir}</echo> </target> + <!-- ========================================================== --> + <!-- set up any properties for deployment --> + <!-- ========================================================== --> + <target name="init-deploy-properties" depends="init"> + <property name="deploy.host" value="localhost"/> + <property name="application.name" value="${project.name}"/> + </target> + <!-- ========================================================== --> + <!-- set the property codebasel this can be overridden--> + <!-- ========================================================== --> + <target name="init-codebase" depends="declare-classpaths,init-deploy-properties" + description="set up the codebase property"> + <makeurl property="codebase"> + <path refid="tests.run.classpath"/> + </makeurl> + <echo level="verbose"> + deploying to ${deploy.host} + codebase=${codebase}</echo> + </target> + <!-- This target defines the task <sf-system-test> which is a functional tests runner ready to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-06-07 10:00:44
|
Revision: 4256 http://svn.sourceforge.net/smartfrog/?rev=4256&view=rev Author: steve_l Date: 2007-06-07 03:00:43 -0700 (Thu, 07 Jun 2007) Log Message: ----------- create empty test jars if needed Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-06-06 18:35:39 UTC (rev 4255) +++ trunk/core/common.xml 2007-06-07 10:00:43 UTC (rev 4256) @@ -1227,6 +1227,7 @@ <sf-jar destfile="${test.jar}" basedir="${test.classes.dir}" whenmanifestonly="create" + whenempty="create" includes="**/*"/> <echo level="verbose">created package ${test.jar}</echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-06-13 09:50:16
|
Revision: 4302 http://svn.sourceforge.net/smartfrog/?rev=4302&view=rev Author: steve_l Date: 2007-06-13 02:50:12 -0700 (Wed, 13 Jun 2007) Log Message: ----------- removing a spurious warning message Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-06-13 09:47:02 UTC (rev 4301) +++ trunk/core/common.xml 2007-06-13 09:50:12 UTC (rev 4302) @@ -1228,7 +1228,6 @@ <sf-jar destfile="${test.jar}" basedir="${test.classes.dir}" whenmanifestonly="create" - whenempty="create" includes="**/*"/> <echo level="verbose">created package ${test.jar}</echo> </target> @@ -1288,7 +1287,7 @@ <!-- ========================================================== --> <!-- this is an override point --> - <!-- generate test reports; ignore failur results--> + <!-- generate test reports; ignore failure results--> <!-- ========================================================== --> <target name="reports-no-failure" depends="init" @@ -1760,10 +1759,10 @@ </target> <target name="ivy-retrieve" depends="ivy-resolve" > - <property name="ivy.retrieve.pattern" + <property name="ivy.artifact.retrieve.pattern" value="[conf]/[artifact]-[revision].[ext]" /> <property name="ivy.retrieve.path" - value="${ivy.lib.dir}/${ivy.retrieve.pattern}" /> + value="${ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" /> <ivy:retrieve pattern="${ivy.retrieve.path}" sync="true" /> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-06-14 16:55:58
|
Revision: 4330 http://svn.sourceforge.net/smartfrog/?rev=4330&view=rev Author: steve_l Date: 2007-06-14 09:55:56 -0700 (Thu, 14 Jun 2007) Log Message: ----------- buildtest doesnt create javadocs; slight speedup of the cycle Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-06-14 16:44:12 UTC (rev 4329) +++ trunk/core/common.xml 2007-06-14 16:55:56 UTC (rev 4330) @@ -1468,11 +1468,14 @@ <!-- ========================================================== --> <!-- shortcut for testing --> + <!-- creates a distribution but without any javadocs (for speed)--> <!-- ========================================================== --> <target name="smartfrog-dist" depends="init-common" > - <ant dir="${smartfrog.home}" target="published" inheritall="false"/> + <ant dir="${smartfrog.home}" target="published" inheritall="false"> + <property name="javadoc.disabled" value="true" /> + </ant> </target> <!-- ========================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2007-06-15 17:45:30
|
Revision: 4335 http://svn.sourceforge.net/smartfrog/?rev=4335&view=rev Author: steve_l Date: 2007-06-15 10:45:29 -0700 (Fri, 15 Jun 2007) Log Message: ----------- delete a property that should not be there Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-06-15 14:19:19 UTC (rev 4334) +++ trunk/core/common.xml 2007-06-15 17:45:29 UTC (rev 4335) @@ -119,7 +119,6 @@ <property name="test.dir" location="${build.dir}/test"/> <property name="test.classes.dir" location="${build.test.dir}/classes"/> <property name="test.data.dir" location="${build.test.dir}/data"/> - <property name="test.datafiles.dir" location="test/files"/> <property name="test.reports.dir" location="${build.test.dir}/reports"/> <property name="dist.dir" location="dist"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |