[nant-commits] CVS: nant NAnt.build,1.250,1.251

[Gert D. <dri...@us...>]

Update of /cvsroot/nant/nant
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12245

Modified Files:
	NAnt.build 
Log Message:
Use newly introduced (internal) function nant:scan-probing-paths to locate file in probing paths, instead of using lib.*.dir properties.

Index: NAnt.build
===================================================================
RCS file: /cvsroot/nant/nant/NAnt.build,v
retrieving revision 1.250
retrieving revision 1.251
diff -C2 -d -r1.250 -r1.251
*** NAnt.build	8 Mar 2008 10:17:57 -0000	1.250
--- NAnt.build	1 Jun 2008 13:45:43 -0000	1.251
***************
*** 24,32 ****
      <property name="create.assemblyinfo" value="true" />
  
-     <!-- global build settings -->
-     <property name="lib.dir" value="${path::combine(build.dir, 'bin/lib')}" dynamic="true" />
-     <property name="lib.family.dir" value="${path::combine(lib.dir, framework::get-family(framework::get-target-framework()))}" dynamic="true" />
-     <property name="lib.framework.dir" value="${path::combine(lib.family.dir, version::to-string(framework::get-version(framework::get-target-framework())))}" dynamic="true" />
- 
      <!-- default configuration -->
      <property name="project.config" value="debug" /> <!-- debug|release -->
--- 24,27 ----
***************
*** 57,63 ****
          <include name="NAnt.VisualCpp/NAnt.VisualCpp.build" />
          <include name="NAnt.VSNet/NAnt.VSNet.build" />
-         <!--
-         <include name="NAnt.NUnit/NAnt.NUnit.build" />
-         -->
      </fileset>
  
--- 52,55 ----
***************
*** 286,291 ****
              <references failonempty="true">
                  <include name="${build.dir}/bin/NAnt.Core.dll" />
!                 <include name="${lib.framework.dir}/NDoc.ExtendedUI.dll" />
!                 <include name="${lib.framework.dir}/NDoc.Core.dll" />
                  <include name="System.Web.dll" />
              </references>
--- 278,283 ----
              <references failonempty="true">
                  <include name="${build.dir}/bin/NAnt.Core.dll" />
!                 <include name="${nant::scan-probing-paths('NDoc.ExtendedUI.dll')}" />
!                 <include name="${nant::scan-probing-paths('NDoc.Core.dll')}" />
                  <include name="System.Web.dll" />
              </references>