conor       2004/02/02 07:03:31

  Modified:    docs/manual tutorial-tasks-filesets-properties.html
               docs/manual/OptionalTasks dotnet.html
  Log:
  Merge
  
  Revision  Changes    Path
  1.3       +6 -6      ant/docs/manual/tutorial-tasks-filesets-properties.html
  
  Index: tutorial-tasks-filesets-properties.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/tutorial-tasks-filesets-properties.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -u -r1.2 -r1.3
  --- tutorial-tasks-filesets-properties.html   29 Sep 2003 14:30:17 -0000      
1.2
  +++ tutorial-tasks-filesets-properties.html   2 Feb 2004 15:03:31 -0000       
1.3
  @@ -914,13 +914,13 @@
   The other way - BugZilla - is slightly more difficult. But it has the 
advantage that entries
   will not be forgotten (once per week a report is generated). So I will show 
this way.</p>
   
  -<p>You must have a BugZilla account for that. So open the <a 
href="http://nagoya.apache.org/bugzilla/";>
  +<p>You must have a BugZilla account for that. So open the <a 
href="http://issues.apache.org/bugzilla/";>
   BugZilla Main Page [12]</a> and follow the link
  -<a href="http://nagoya.apache.org/bugzilla/createaccount.cgi";>Open a new 
Bugzilla account [13]</a>
  +<a href="http://issues.apache.org/bugzilla/createaccount.cgi";>Open a new 
Bugzilla account [13]</a>
   and the steps described there if you havenīt one.</p>
   
   <ol>
  -<li>From the BugZilla main page choose <a 
href="http://nagoya.apache.org/bugzilla/enter_bug.cgi";>Enter
  +<li>From the BugZilla main page choose <a 
href="http://issues.apache.org/bugzilla/enter_bug.cgi";>Enter
       a new bug report [14]</a></li>
   <li>Choose "Ant" as product </li>
   <li>Version is the last "Alpha (nightly)" (at this time 1.7)</li>
  @@ -962,9 +962,9 @@
   &nbsp;&nbsp;[9] <a 
href="http://java.sun.com/products/archive/index.html";>http://java.sun.com/products/archive/index.html</a><br/>
   &nbsp;&nbsp;[10] <a 
href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html";>http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html</a><br/>
   &nbsp;&nbsp;[11] <a 
href="http://checkstyle.sourceforge.net/";>http://checkstyle.sourceforge.net/</a><br/>
  -&nbsp;&nbsp;[12] <a 
href="http://nagoya.apache.org/bugzilla/";>http://nagoya.apache.org/bugzilla/</a><br/>
  -&nbsp;&nbsp;[13] <a 
href="http://nagoya.apache.org/bugzilla/createaccount.cgi";>http://nagoya.apache.org/bugzilla/createaccount.cgi</a><br/>
  -&nbsp;&nbsp;[14] <a 
href="http://nagoya.apache.org/bugzilla/enter_bug.cgi";>http://nagoya.apache.org/bugzilla/enter_bug.cgi</a><br/>
  +&nbsp;&nbsp;[12] <a 
href="http://issues.apache.org/bugzilla/";>http://issues.apache.org/bugzilla/</a><br/>
  +&nbsp;&nbsp;[13] <a 
href="http://issues.apache.org/bugzilla/createaccount.cgi";>http://issues.apache.org/bugzilla/createaccount.cgi</a><br/>
  +&nbsp;&nbsp;[14] <a 
href="http://issues.apache.org/bugzilla/enter_bug.cgi";>http://issues.apache.org/bugzilla/enter_bug.cgi</a><br/>
   
   <br><br><br>
   
  
  
  
  1.16      +28 -111   ant/docs/manual/OptionalTasks/dotnet.html
  
  Index: dotnet.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -w -u -r1.15 -r1.16
  --- dotnet.html       17 Dec 2003 17:48:05 -0000      1.15
  +++ dotnet.html       2 Feb 2004 15:03:31 -0000       1.16
  @@ -57,13 +57,9 @@
   code and JUnit testcases is covered in 
   <A href="http://www.iseran.com/Steve/papers/interop/";>The Wondrous curse
   of Interop</A>. The final trick, IDL and Typelib abuse, is not
  -documented as we do not want to encourage such an ugly practise. It,
  +documented as we do not want to encourage such an ugly practice. It,
   can, however, be done if absolutely necessary. 
   
  -
  -
  -
  -
   <h3>Task List</h3>
   
   <table border="0" >
  @@ -236,69 +232,6 @@
   <li>WsdlToDotnet written
   </ol>
   
  -<h4>Version 0.4</h4>
  -This is the beta-2 revision of the tasks. 
  -<ol>
  -<li>ILASM: pulled the owner attribute, added keyfile for giving binaries a 
strong name
  -(MD5 hash of the checksum)</li>
  -<li>CSC: added win32res , noConfig, utf8output, fullpaths</li>
  -<li>CSC: </li>
  -</ol>
  - 
  -<h4>Version 0.3</h4>
  -
  -The changes here reflect Beta-1 of the dotnet SDK and experience of use in 
  -more complex projects. This build does not work with the older SDK, 
  -primarily because the automatic reference feature references libraries
  -only found in the new SDK version.  
  -<p>
  -External changes</p>
  -<ul>
  -<li>Recursive inclusion of .cs and .il files</li>
  -
  -<li>Documentation enhanced, includes examples and details of all 
parameters</li>
  -
  -<li>The csc task automatically includes the common dotnet assemblies, so
  -there is no need to remember to refer to 'System.dll', 'System.Web.Services',
  - etc. This feature can be disabled by setting the 'includeDefaultReferences' 
  - flag to false. </li>
  -
  - <li> References can also be referred to using the ReferenceFiles parameter, 
which
  -is an ant path specification. The old 'references' string is still 
retained.</li>
  -<li> An 'extraoptions' attribute enables the build file to include any CSC 
options
  -which are not explicitly supported in the CSC task. </li>
  -</ul>
  -
  -Internal changes
  -<ul>
  -<li>Some minor refactoring (move common code a method)</li>
  -<li>Application of Jedits JavaStyle task resulted in a major reshaping of
  -the codebase and the insertion of a blank line every second line. Significant
  -effort was required to revert some (but not all) changes.</li>
  -<li>Removed throws clause from methods which can't throw exception<hr>
  -<h2> Change Log </h2>
  -
  -<h4>Ant1.6</h4>
  -This revision goes along with NET 1.1, though there is no reason why
  -it should not work on other versions.
  -<p>
  -
  -<ol>
  -<li>vbc task</li>
  -<li>jsharpc task</li>
  -<li>mono support</li>
  -<li>ilasm</li>
  -<li>tlbimport</li>
  -<li>Reference filesets in the compiler tasks</li>
  -<li>definitions in the compiler tasks</li>
  -<li>multiple source filesets in the compiler tasks. If these are used, the
  -implicit fileset is disabled</li>
  -</ol>
  -
  -The compile tasks: vbc, jsharpc, and csc, all contain lots of common code
  -in a shared base class: if you can use one you should be able to use
  -another. 
  -
   <h4>Version 0.5</h4>
   This revision goes along with NET 1.0 (SP1) 
   <ol>
  @@ -347,22 +280,7 @@
   <li>Application of Jedits JavaStyle task resulted in a major reshaping of
   the codebase and the insertion of a blank line every second line. Significant
   effort was required to revert some (but not all) changes.</li>
  -<li>Removed throws clause from methods which can't throw exceptions </li>
  -</ul>
  -
  -The test harness has been expanded to include unicode source file  
  -(the build works but the rest of the system has 'issues' with high unicode
  -package and method names)
  -
  -<h4>Version 0.2</h4>
  -First public edition, added to the ant cvs tree. Tested on the PDC build of 
  -the dotnet SDK only, and still immature. The command execution code was 
  -refactored out into a 'NetCommand' class for re-use. The Ilasm task was added
  -at this time.
  -
  -<h4>Version 0.1</h4>
  -Initial proof of concept; very rudimentary support for CSC only. 
  -s </li>
  +<li>Removed throws clause from methods which can't throw exception
   </ul>
   
   The test harness has been expanded to include unicode source file  
  @@ -377,7 +295,6 @@
   
   <h4>Version 0.1</h4>
   Initial proof of concept; very rudimentary support for CSC only. 
  -
   
   <p align="center">Copyright &copy; 2000-2003 Apache Software Foundation. All 
rights
   Reserved.</p>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to