inpath support

3 files changed, 46 insertions, 11 deletions

diff --git a/docs/devGuideDB/ajc.xml b/docs/devGuideDB/ajc.xml
index dd35fca32..afe218887 100644
--- a/docs/devGuideDB/ajc.xml
+++ b/docs/devGuideDB/ajc.xml
@@ -27,7 +27,8 @@
       </para>
 
     <para> The arguments after the options specify the source file(s) to compile.
-        (Specify source classes using the <parameter>-injars</parameter> option, below.)
+        (Specify source classes using the <parameter>-injars</parameter> or
+        <parameter>-inpath</parameter> options, below.)
         Files may be listed directly on the command line, or listed in a file.
         The <parameter>-argfile <replaceable>file</replaceable></parameter> 
         and <parameter>@<replaceable>file</replaceable></parameter> forms
@@ -60,12 +61,21 @@
       <varlistentry>
         <term>-injars <replaceable>JarList</replaceable></term>
         <listitem><para>
-        Accept as source bytecode any .class files inside the 
-        specified .jar files.  The output will include these
+        deprecated: since 1.2, use -inpath, which also takes
+        directories.
+        </para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-inpath <replaceable>Path</replaceable></term>
+        <listitem><para>
+        Accept as source bytecode any .class files in the 
+        .jar files or directories on Path.  
+        The output will include these
         classes, possibly as woven with any applicable aspects.
-        JarList, like classpath, is a single argument containing
-        a list of paths to jar files, delimited by the platform-
-        specific classpath delimiter.
+        Path is a single argument containing
+        a list of paths to zip files or directories, 
+        delimited by the platform-specific path delimiter.
         </para></listitem>
       </varlistentry>
 
diff --git a/docs/devGuideDB/antsupport.xml b/docs/devGuideDB/antsupport.xml
index d97aaf66f..bbadca4f6 100644
--- a/docs/devGuideDB/antsupport.xml
+++ b/docs/devGuideDB/antsupport.xml
@@ -124,9 +124,10 @@
 		be specified on the classpath, and that some sources be
 		be specified
 	    (using one or more of 
-	    <literal>sourceroots</literal>
-	    <literal>injars</literal>
-	    <literal>argfiles</literal> and 
+	    <literal>sourceroots</literal>,
+	    <literal>injars</literal>,
+	    <literal>inpath</literal>,
+	    <literal>argfiles</literal>, and/or 
 	    <literal>srcdir</literal> (with patterns)).
 	    When in incremental mode, only
 	    <literal>sourceroots</literal> may be specified.
@@ -182,7 +183,18 @@
 				(<xref linkend="antTasks-iajc-paths"/>)
 				</para></entry>
 				<entry><para>
-				Input zip files with .class file entries for bytecode weaving.					
+				Deprecated - use inpath instead.
+				Read .class files for bytecode weaving
+				from zip files (only).
+				</para></entry>
+			</row>
+			<row>
+				<entry><para>inpath, inpathRef
+				(<xref linkend="antTasks-iajc-paths"/>)
+				</para></entry>
+				<entry><para>
+				Read .class files for bytecode weaving
+				from directories or zip files (like classpath).					
 				</para></entry>
 			</row>
 			<row>
@@ -362,7 +374,7 @@
 				</para></entry>
 				<entry><para>		
 				Experimental option to produce binaries that can only be used as input 
-				for the <literal>-injars</literal> option.
+				for the <literal>-injars</literal> or <literal>-inpath</literal> option.
 				Usually aspects are compiled normally and put on the
 				<literal>aspectpath</literal>.
 				</para></entry>
@@ -636,6 +648,7 @@
 	<literal>sourceroots</literal>,
 	<literal>argfiles</literal>,
 	<literal>injars</literal>,
+	<literal>inpath</literal>,
 	<literal>classpath</literal>,
 	<literal>bootclasspath</literal>,
 	<literal>forkclasspath</literal>, and
@@ -891,6 +904,7 @@
 		<listitem><para>
 		<literal>-Xcopyinjars</literal>: 
 			copy resources from any input jars to output
+			(default behavior since 1.1.1)
 		</para></listitem>
 		<listitem><para>
 		<literal>-Xsourcerootcopyfilter {filter}</literal>: 
diff --git a/docs/dist/doc/changes.html b/docs/dist/doc/changes.html
index 475b30422..8d5211aaa 100644
--- a/docs/dist/doc/changes.html
+++ b/docs/dist/doc/changes.html
@@ -144,6 +144,8 @@ All rights reserved.
 <h2>Changes in AspectJ</h2>
 
 <ul>
+  <li> <a href="#1.2">1.2</a> (released TODO XXX) 
+  </li>
   <li> <a href="#1.1.1">1.1.1</a> (released 2003-09) 
   </li>
 	<li> 1.1.0 (released 2003-06-06) 
@@ -187,6 +189,15 @@ All rights reserved.
 
 <hr />
 
+<h2><a name="1.2">1.2</a></h2>
+<p>Some of the more significant bug fixes and enhancements in this release include:
+  <ul>
+     <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=46347">46347</a> 
+     The ajc compiler now can read .class files from directories as well as
+     zip files for bytecode weaving. 
+     </li>
+  </ul>
+
 <h2><a name="1.1.1">1.1.1</a></h2>
 
 <p>All known P1 and P2 bugs have been fixed in this release. The <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&target_milestone=1.1.1">full list of bug fixes</a>