From: <te...@us...> - 2009-07-15 22:28:42
|
Revision: 4640 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4640&view=rev Author: tehlike Date: 2009-07-15 22:28:37 +0000 (Wed, 15 Jul 2009) Log Message: ----------- Build file modifications: 1. Making project builds optimized 2. Adding "test" to package target dependencies. Modified Paths: -------------- trunk/nhibernate/build-common/common-project.xml trunk/nhibernate/build-common/common.xml trunk/nhibernate/default.build trunk/nhibernate/teamcity.build Modified: trunk/nhibernate/build-common/common-project.xml =================================================================== --- trunk/nhibernate/build-common/common-project.xml 2009-07-15 18:50:23 UTC (rev 4639) +++ trunk/nhibernate/build-common/common-project.xml 2009-07-15 22:28:37 UTC (rev 4640) @@ -146,6 +146,7 @@ debug="${build.debug}" output="${bin.dir}/${project::get-name()}.exe" if="${sign}" + optimize="true" > <nowarn> <warning number="1591" /> <!-- No XML comment for publicly visible member --> @@ -161,6 +162,7 @@ debug="${build.debug}" output="${bin.dir}/${project::get-name()}.exe" unless="${sign}" + optimize="true" > <nowarn> <warning number="1591" /> <!-- No XML comment for publicly visible member --> Modified: trunk/nhibernate/build-common/common.xml =================================================================== --- trunk/nhibernate/build-common/common.xml 2009-07-15 18:50:23 UTC (rev 4639) +++ trunk/nhibernate/build-common/common.xml 2009-07-15 22:28:37 UTC (rev 4640) @@ -173,7 +173,7 @@ <property name="build.root.dir" value="${root.dir}/build/${build.name}" /> <property name="build.dir" value="${build.root.dir}" /> - <property name="bin.dir" value="${build.dir}/bin/${nant.settings.currentframework}" dynamic="true" /> + <property name="bin.dir" value="${build.dir}/bin/${nant.settings.currentframework}" /> <property name="testresults.dir" value="${bin.dir}/test-results" /> <property name="tools.dir" value="${root.dir}/Tools"/> </target> Modified: trunk/nhibernate/default.build =================================================================== --- trunk/nhibernate/default.build 2009-07-15 18:50:23 UTC (rev 4639) +++ trunk/nhibernate/default.build 2009-07-15 22:28:37 UTC (rev 4640) @@ -335,7 +335,7 @@ </copy> </target> - <target name="package" depends="init binaries reference-zip sources-zip binaries-zip" + <target name="package" depends="init binaries test reference-zip sources-zip binaries-zip" description="Creates files for the General Available Release on SourceForge"> <echo message="Created a '${project.config}' package in ${build.dir}" /> Modified: trunk/nhibernate/teamcity.build =================================================================== --- trunk/nhibernate/teamcity.build 2009-07-15 18:50:23 UTC (rev 4639) +++ trunk/nhibernate/teamcity.build 2009-07-15 22:28:37 UTC (rev 4640) @@ -2,13 +2,13 @@ <project name="NHibernate TeamCity Build" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd" default="clean-configure-test"> <property name="root.dir" value="." /> <include buildfile="${root.dir}/default.build" /> + <if test="${not property::exists('CCNetLabel') and not property::exists('build.number')}"> <fail>This build file is for use with CruiseControl.NET or TeamCity</fail> </if> - <property name="build.number" value="${CCNetLabel}" if="${property::exists('CCNetLabel')}" /> - <target name="clean-configure-test" depends="cleanall init copy-teamcity-configuration build test"> + <target name="clean-configure-test" depends="cleanall init copy-teamcity-configuration package"> </target> <target name="copy-teamcity-configuration"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |