From: Charles C. <cch...@us...> - 2010-02-17 05:08:12
|
Update of /cvsroot/nant/nant/src/NAnt.NUnit In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12765/src/NAnt.NUnit Modified Files: NAnt.NUnit.build Log Message: Revert changes committed in patchset 3981. Gert explained how the build works and the reason behind it. Index: NAnt.NUnit.build =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.NUnit/NAnt.NUnit.build,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** NAnt.NUnit.build 15 Feb 2010 01:41:47 -0000 1.34 --- NAnt.NUnit.build 17 Feb 2010 05:08:02 -0000 1.35 *************** *** 16,22 **** <include name="../CommonAssemblyInfo.cs" /> </sources> ! <references basedir="${build.dir}/bin"> ! <include name="NAnt.Core.dll" /> ! <include name="lib/common/${framework::get-version(framework::get-target-framework())}/nunit.framework.dll" /> </references> </csc> --- 16,22 ---- <include name="../CommonAssemblyInfo.cs" /> </sources> ! <references> ! <include name="${build.dir}/bin/NAnt.Core.dll" /> ! <include name="${nant::scan-probing-paths('nunit.framework.dll')}" /> </references> </csc> *************** *** 33,40 **** <include name="../CommonAssemblyInfo.cs" /> </sources> ! <references basedir="${build.dir}/bin"> ! <include name="NAnt.Core.dll" /> ! <include name="NAnt.NUnit.dll" /> ! <include name="lib/common/neutral/NUnitCore.dll" /> </references> <resources> --- 33,40 ---- <include name="../CommonAssemblyInfo.cs" /> </sources> ! <references> ! <include name="${build.dir}/bin/NAnt.Core.dll" /> ! <include name="${build.dir}/bin/NAnt.NUnit.dll" /> ! <include name="${nant::scan-probing-paths(build.dir + '/bin','NUnitCore.dll')}" /> </references> <resources> *************** *** 52,62 **** <include name="../CommonAssemblyInfo.cs" /> </sources> ! <references basedir="${build.dir}/bin"> ! <include name="NAnt.Core.dll" /> ! <include name="NAnt.NUnit.dll" /> ! <include name="NAnt.DotNetTasks.dll" /> ! <include name="lib/common/${framework::get-version(framework::get-target-framework())}/nunit.framework.dll" /> ! <include name="lib/common/${framework::get-version(framework::get-target-framework())}/nunit.core.dll" /> ! <include name="lib/common/${framework::get-version(framework::get-target-framework())}/nunit.util.dll" /> </references> </csc> --- 52,62 ---- <include name="../CommonAssemblyInfo.cs" /> </sources> ! <references> ! <include name="${build.dir}/bin/NAnt.Core.dll" /> ! <include name="${build.dir}/bin/NAnt.NUnit.dll" /> ! <include name="${build.dir}/bin/NAnt.DotNetTasks.dll" /> ! <include name="${nant::scan-probing-paths(build.dir + '/bin','nunit.framework.dll')}" /> ! <include name="${nant::scan-probing-paths(build.dir + '/bin','nunit.core.dll')}" /> ! <include name="${nant::scan-probing-paths(build.dir + '/bin','nunit.util.dll')}" /> </references> </csc> |