Commit 54d05f39 authored by Emmanuel Bourg's avatar Emmanuel Bourg

Imported Upstream version 1.9.7

parent 8c8b4a2d
......@@ -109,6 +109,7 @@ Don Brown
Don Ferguson
Don Jeffery
Drew Sudell
Earl Hood
Edison Guo
Eduard Wirch
Edwin Woudt
......@@ -153,6 +154,7 @@ Ingenonsya France
Ingmar Stein
Irene Rusman
Isaac Shabtay
Issa Gorissen
Ivan Ivanov
J Bleijenbergh
Jack J. Woehr
......@@ -176,6 +178,7 @@ Jeff Gettle
Jeff Martin
Jeff Tulley
Jeff Turner
Jeffrey Adamson
Jene Jasper
Jeremy Mawson
Jerome Lacoste
......@@ -310,6 +313,7 @@ Rami Ojares
Randy Watler
Raphael Pierquin
Ray Waldin
Reinhard Pointner
Remie Bolte
René Krell
Richard Evans
......@@ -388,6 +392,7 @@ Tom Dimock
Tom Eugelink
Tom May
Tomasz Bech
Tomáš Zezula
Trejkaz Xaoza
Ulrich Schmidt
Uwe Schindler
......
Apache Ant
Copyright 1999-2015 The Apache Software Foundation
Copyright 1999-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
......
Changes from Ant 1.9.6 TO Ant 1.9.7
===================================
Changes that could break older environments:
-------------------------------------------
* <exec> and <apply> used to ignore the dir attribute if it was the
same as the current working directory. They now no longer do,
which changes the behavior for vmlauncher="false" which would have
used the project's basedir rather than the current working
directory in that case.
Bugzilla Report 58555
Fixed bugs:
-----------
* ZipOutputStream could cause an ArrayIndexOutOfBoundsException when
adding entries with comments. This never happens when using Ant as
a build tool but may affect users using Ant's zip package as a
library.
* <gunzip> and <bunzip2> didn't work for non-filesystem resources.
* <jar> ignored the zip64Mode attribute when creating manifest-only
jars. This resulted in jar files that couldn't be read by Java5.
Bugzilla Report 58428
* <untar> will now detect GNU tar longname/link records even if they
don't use the names used by GNU tar itself. star is known to
create archives of that kind.
https://issues.apache.org/jira/browse/COMPRESS-324
* <script> could fail to find javax.script on JDK9 with Jigsaw.
Bugzilla Report 58271
* <import> sometimes failed to normalize file names which could lead
to files getting imported twice which in turn could lead to targets
getting executed twice.
Bugzilla Report 58886
* TarInputStream now properly extraxt directory entries with a
non-zero size.
* <union> would drop file resources pointing to the same file but
using different names.
Bugzilla Report 57965
* <replace>'s result was undefined when using the replacefilterfile
attribute and some keys inside the properties files have been
substrings of other keys. Keys are now sorted by descending size.
Bugzilla Report 58997
* Ant fails to run when arguments contain double-quote character.
Bugzilla Report 58898
* Ant fails to run if ANT_HOME contains a double-quote character.
Bugzilla Report 58874
* Definer's way to parse URLs from classloader breaks with
recent Java 9 builds (b108).
Bugzilla Report 59130
* <ant> and <antcall> now preserve the ext status set by an <exit>
task.
Bugzilla Report 59228
Other changes:
--------------
* <scp> now supports (filesystem-only) resource collections in
addition to filesets.
Bugzilla Report 50769
* The <http> condition has a new optional attribute followRedirects.
Bugzilla Report 58840
* <java> now supports Java9 modules.
https://github.com/apache/ant/pull/15
* <javac> now supports Java9 modules.
https://github.com/apache/ant/pull/16
* <sshexec> and <scp> have two new attributes serverAliveInterval and
serverAliveCountMax that can be used to keep a intermediaries from
closing idle connections.
Bugzilla Report 59162
Changes from Ant 1.9.5 TO Ant 1.9.6
===================================
......@@ -13,8 +100,9 @@ Fixed bugs:
Other changes:
--------------
* Hidden <javaconstant> resource is published now. It reads the
value of a specified java constant.
* Hidden <javaconstant> resource is published now. It reads the
value of a specified java constant.
Changes from Ant 1.9.4 TO Ant 1.9.5
......
......@@ -34,10 +34,10 @@
<property name="name" value="ant"/>
<!-- this is the groupId of ant in the Maven repository -->
<property name="groupid" value="org/apache/ant"/>
<property name="project.version" value="1.9.6"/>
<property name="project.version" value="1.9.7"/>
<!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
<property name="pom.version" value="1.9.6"/>
<property name="manifest-version" value="1.9.6"/>
<property name="pom.version" value="1.9.7"/>
<property name="manifest-version" value="1.9.7"/>
<property name="bootstrap.jar" value="ant-bootstrap.jar"/>
<property name="ant.package" value="org/apache/tools/ant"/>
......@@ -500,16 +500,6 @@
</or>
</condition>
<!-- http client needs commons logging -->
<condition property="apache-httpclient.present">
<and>
<available
classname="org.apache.commons.httpclient.HttpClient"
classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
<isset property="commons.logging.present"/>
</and>
</condition>
<available property="rhino.present"
classname="org.mozilla.javascript.Scriptable"
classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
......
......@@ -463,6 +463,10 @@
<first>Drew</first>
<last>Sudell</last>
</name>
<name>
<first>Earl</first>
<last>Hood</last>
</name>
<name>
<first>Edison</first>
<last>Guo</last>
......@@ -636,6 +640,10 @@
<first>Isaac</first>
<last>Shabtay</last>
</name>
<name>
<first>Issa</first>
<last>Gorissen</last>
</name>
<name>
<first>Ivan</first>
<last>Ivanov</last>
......@@ -727,6 +735,10 @@
<first>Jeff</first>
<last>Turner</last>
</name>
<name>
<first>Jeffrey</first>
<last>Adamson</last>
</name>
<name>
<first>Jene</first>
<last>Jasper</last>
......@@ -1253,6 +1265,10 @@
<first>Ray</first>
<last>Waldin</last>
</name>
<name>
<first>Reinhard</first>
<last>Pointner</last>
</name>
<name>
<first>Remie</first>
<last>Bolte</last>
......@@ -1560,6 +1576,10 @@
<first>Tomasz</first>
<last>Bech</last>
</name>
<name>
<first>Tomáš</first>
<last>Zezula</last>
</name>
<name>
<first>Trejkaz</first>
<last>Xaoz</last>
......
......@@ -95,7 +95,12 @@ to send input to it is via the input and inputstring attributes.</p>
<tr>
<td valign="top">dir</td>
<td valign="top">the directory in which the command should be executed.</td>
<td align="center" valign="top">No</td>
<td align="center" valign="top">No.<br/>
<strong>Note:</strong> the default used when dir has not been
specified depends on the <code>vmlauncher</code> attribute. If
<code>vmlauncher</code> is <code>true</code> the task will use
the current working directory, otherwise it uses the project's basedir.
</td>
</tr>
<tr>
<td valign="top">relative</td>
......
......@@ -229,6 +229,13 @@ of 400 or greater are viewed as invalid.</p>
<em>since Ant 1.8.0</em></td>
<td align="center">No</td>
</tr>
<tr>
<td valign="top">followRedirects</td>
<td valign="top">Whether redirects should be followed. The default
is <code>true</code><br/>
<em>since Ant 1.9.7</em></td>
<td align="center">No</td>
</tr>
</table>
<h4><a name="socket">socket</a></h4>
......
......@@ -171,7 +171,12 @@ or the task will fail as follows:
<tr>
<td valign="top">dir</td>
<td valign="top">the directory in which the command should be executed.</td>
<td align="center" valign="top">No</td>
<td align="center" valign="top">No.<br/>
<strong>Note:</strong> the default used when dir has not been
specified depends on the <code>vmlauncher</code> attribute. If
<code>vmlauncher</code> is <code>true</code> the task will use
the current working directory, otherwise it uses the project's basedir.
</td>
</tr>
<tr>
<td valign="top">os</td>
......
......@@ -559,7 +559,7 @@ Sealed: false</code></pre></blockquote>
The following shows how to create a jar file specifying a service
with an implementation of the JDK6 scripting interface:
</p>
<blockquote><pre>&lt;jar jarfile="pinky.jar"&gt;
<blockquote><pre>&lt;jar destfile="pinky.jar"&gt;
&lt;fileset dir="build/classes"/&gt;
&lt;service type="javax.script.ScriptEngineFactory"
provider="org.acme.PinkyLanguage"/&gt;
......@@ -573,7 +573,7 @@ Sealed: false</code></pre></blockquote>
with two implementations of the JDK6 scripting interface:
</p>
<blockquote><pre>
&lt;jar jarfile="pinkyandbrain.jar"&gt;
&lt;jar destfile="pinkyandbrain.jar"&gt;
&lt;fileset dir="classes"/&gt;
&lt;service type="javax.script.ScriptEngineFactory"&gt;
&lt;provider classname="org.acme.PinkyLanguage"/&gt;
......
......@@ -54,9 +54,9 @@ attributes.</p>
<td align="center" valign="top"><b>Required</b></td>
</tr>
<tr>
<td valign="top">classname</td>
<td valign="top"><a name="classname">classname</a></td>
<td valign="top">the Java class to execute.</td>
<td align="center" valign="top">Either <tt>jar</tt> or <tt>classname</tt></td>
<td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
</tr>
<tr>
<td valign="top">jar</td>
......@@ -64,7 +64,7 @@ attributes.</p>
Main-Class entry in the manifest). Fork must be set to true if this option is selected.
See notes below for more details.
</td>
<td align="center" valign="top">Either <tt>jar</tt> or <tt>classname</tt></td>
<td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
</tr>
<tr>
<td valign="top">args</td>
......@@ -119,6 +119,25 @@ attributes.</p>
(ignored if fork is disabled)</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">module</td>
<td valign="top">The initial or main module to resolve. To specify
the module main class use the <a href="#classname">classname</a> attribute.
Fork must be set to true if this option is selected.<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
</tr>
<tr>
<td valign="top">modulepath</td>
<td valign="top">Specify where to find application modules. A list of directories of modules, module files or exploded modules.<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">modulepathref</td>
<td valign="top">The modulepath to use, given as <a
href="../using.html#references">reference</a> to a PATH defined elsewhere.
<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">failonerror</td>
<td valign="top">Stop the buildprocess if the command exits with a
......@@ -312,6 +331,18 @@ error and would mean the build exits.
, then <code>&lt;java&gt;</code> <b>must</b> return 0 otherwise the build will
exit, as the class was run by the build JVM.</p>
<a name="modulepath"><h4>modulepath</h4>
<i><b>Since Ant 1.9.7</b></i>
<p><code>Java</code>'s <i>modulepath</i> attribute is a <a
href="../using.html#path">PATH like structure</a> and can also be set via a nested
<i>modulepath</i> element.</p>
<a name="upgrademodulepath"><h4>upgrademodulepath</h4>
<i><b>Since Ant 1.9.7</b></i>
<p>The location of modules that replace upgradeable modules in the runtime image
can be specified using this <a href="../using.html#path">PATH like structure</a>.</p>
<h3>JAR file execution</h3>
<p>The parameter of the <tt>jar</tt> attribute is of type <tt>File</tt>;
......@@ -400,6 +431,31 @@ log-prefix to <code>[java1.4]</code>.
JVM, as it takes different parameters for other JVMs,
That JVM can be started from <code>&lt;exec&gt;</code> if required.</p>
<pre>
&lt;java
fork=&quot;true&quot;
failonerror=&quot;true&quot;
maxmemory=&quot;128m&quot;
module=&quot;TestModule&quot;
modulepath=&quot;lib:dist/test.jar&quot;/&gt;
</pre>
Runs the module TestModule resolved on the modulepath <tt>lib/:dist/test.jar</tt>
with a maximum memory of 128MB. Any non zero return code breaks the build.
<pre>
&lt;java
fork=&quot;true&quot;
failonerror=&quot;true&quot;
maxmemory=&quot;128m&quot;
module=&quot;TestModule&quot;
classname=&quot;Main&quot;&gt;
&lt;modulepath&gt;
&lt;pathelement location=&quot;lib&quot;/&gt;
&lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
&lt;/modulepath&gt;
&lt;/java&gt;
</pre>
Runs the class Main in module TestModule resolved on the modulepath <tt>lib/:dist/test.jar</tt>
with a maximum memory of 128MB. Any non zero return code breaks the build.
</body>
</html>
......@@ -135,7 +135,7 @@ invoking the compiler.</p>
<td valign="top">srcdir</td>
<td valign="top">Location of the java files. (See the
<a href="#srcdirnote">note</a> below.)</td>
<td align="center" valign="top">Yes, unless nested <code>&lt;src&gt;</code> elements are present.</td>
<td align="center" valign="top">Yes, unless nested <code>&lt;src&gt;</code> elements or <code>modulesourcepath</code> attribute or elements are present.</td>
</tr>
<tr>
<td valign="top">destdir</td>
......@@ -459,6 +459,51 @@ invoking the compiler.</p>
</td>
<td align="center" valign="top">No - default is "true"</td>
</tr>
<tr>
<td valign="top">modulepath</td>
<td valign="top">
Specify where to find application modules. A list of directories of modules, module files or exploded modules.
<em>since Ant 1.9.7</em>
</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">modulepathref</td>
<td valign="top">
The modulepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">modulesourcepath</td>
<td valign="top">
Specify where to find input source files for multiple module compilation.
<em>since Ant 1.9.7</em>
</td>
<td align="center" valign="top">Yes, unless <code>srcdir</code> attribute or nested <code>&lt;src&gt;</code> elements are present</td>
</tr>
<tr>
<td valign="top">modulesourcepathref</td>
<td valign="top">
The modulesourcepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">upgrademodulepath</td>
<td valign="top">
Specify the location of modules that replace upgradeable modules in the runtime image.
<em>since Ant 1.9.7</em>
</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">upgrademodulepathref</td>
<td valign="top">
The upgrademodulepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No</td>
</tr>
</table>
<h3>Parameters specified as nested elements</h3>
......@@ -468,17 +513,23 @@ supports most attributes of <code>&lt;fileset&gt;</code>
<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
<code>&lt;patternset&gt;</code> elements.</p>
<h4><code>srcdir</code>, <code>classpath</code>, <code>sourcepath</code>,
<code>bootclasspath</code> and <code>extdirs</code></h4>
<code>bootclasspath</code>, <code>modulepath</code>, <code>modulesourcepath</code>,
<code>upgrademodulepath</code> and <code>extdirs</code></h4>
<p><code>&lt;javac&gt;</code>'s <code>srcdir</code>, <code>classpath</code>,
<code>sourcepath</code>, <code>bootclasspath</code>, and
<code>extdirs</code> attributes are
<code>sourcepath</code>, <code>bootclasspath</code>,
<code>extdirs</code>, <code>modulepath</code>, <code>modulesourcepath</code>,
and <code>upgrademodulepath</code> attributes are
<a href="../using.html#path">path-like structures</a>
and can also be set via nested
<code>&lt;src&gt;</code> (note the different name!),
<code>&lt;classpath&gt;</code>,
<code>&lt;sourcepath&gt;</code>,
<code>&lt;bootclasspath&gt;</code> and
<code>&lt;extdirs&gt;</code> elements, respectively.</p>
<code>&lt;bootclasspath&gt;</code>,
<code>&lt;extdirs&gt;</code>,
<code>&lt;modulepath&gt;</code>,
<code>&lt;modulesourcepath&gt;</code> and
<code>&lt;upgrademodulepath&gt;</code>
elements, respectively.</p>
<h4>compilerarg</h4>
......@@ -710,6 +761,31 @@ the <tt>&lt;compilerarg&gt;</tt> element:
<p>in which case your compiler adapter can support attributes and
nested elements of its own.</p>
<pre> &lt;javac srcdir=&quot;${src}&quot;
destdir=&quot;${build}&quot;
includeantruntime=&quot;false&quot;
modulepath=&quot;modules&quot;
source=&quot;9&quot;
/&gt;</pre>
<p>compiles all <code>.java</code> files in a single module under the <code>${src}</code> directory,
and stores the <code>.class</code> files in the <code>${build}</code> directory. The compilation uses
application modules located in <code>modules</code> folder.The source level is <code>9</code> to enable modules.</p>
<pre> &lt;javac modulesourcepath=&quot;${src}/*/{gen,lin{32,64}}/classes&quot;
destdir=&quot;${build}&quot;
includeantruntime=&quot;false&quot;
modulepath=&quot;modules&quot;
source=&quot;9&quot;
/&gt;</pre>
<p>compiles all <code>.java</code> files in <code>gen/classes</code>, <code>lin32/classes</code> and
<code>lin64/classes</code> in all source modules under the <code>${src}</code> directory.
Generates module directories in the <code>${build}</code> directory. Each generated module directory under
the <code>${build}</code> directory contains <code>.class</code> files from corresponding source module.
The <code>*</code> is a token representing the name of any of the modules in the compilation module set.
The <code>{ ... , ... }</code> express alternates for expansion.
The compilation uses application modules located in <code>modules</code> folder.The source level is
<code>9</code> to enable modules.</p>
<h3>Jikes Notes</h3>
<p>You need Jikes 1.15 or later.</p>
......
......@@ -200,13 +200,31 @@ for more information. This task has been tested with jsch-0.1.2 and later.</p>
remote server. Default is 755. <em>since Ant 1.9.5</em>.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">serverAliveIntervalSeconds</td>
<td valign="top">Sets a timeout interval in seconds after which if no data has
been received from the server, the task will send a message through
the encrypted channel to request a response from the server.
<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No, the default is 0, indicating
that these messages will not be sent to the server</td>
</tr>
<tr>
<td valign="top">serverAliveCountMax</td>
<td valign="top">The number of server alive messages which may be
sent without receiving any messages back from the server. Only
used if serverAliveIntervalSeconds is not 0.
<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No, defaults to 3</td>
</tr>
</table>
<h3>Parameters specified as nested elements</h3>
<h4>fileset</h4>
<p><a href="../Types/fileset.html">FileSet</a>s are used to select
sets of files to copy.
To use a fileset, the <code>todir</code> attribute must be set.</p>
<h4>fileset or resource collections</h4>
<p><a href="../Types/fileset.html">FileSet</a>s or <a href="../Types/resources.html#collection">Resource Collection</a>s are used to select
groups of files to copy. To use a fileset or a resource collection, the <code>todir</code> attribute must be set.</p>
Prior to Ant 1.9.7 only &lt;fileset&gt; has been supported as a nested element.
<h3>Examples</h3>
<p><b>Copy a single local file to a remote machine</b></p>
......@@ -253,9 +271,18 @@ authentication.</b></p>
&lt;include name=&quot;**/*.java&quot;/&gt;
&lt;/fileset&gt;
&lt;/scp&gt;
</pre>
<p><b>Copy a set of files to a remote directory in reverse last-modified order</b></p>
<pre>
&lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
&lt;fileset dir=&quot;src_dir&quot; excludes=&quot;**/*.java&quot;/&gt;
&lt;sort&gt;
&lt;reverse&gt;
&lt;date /&gt;
&lt;/reverse&gt;
&lt;fileset dir=&quot;src_dir&quot;&gt;
&lt;include name=&quot;**/*&quot; /&gt;
&lt;/fileset&gt;
&lt;/sort&gt;
&lt;/scp&gt;
</pre>
......
......@@ -230,6 +230,23 @@ and won't work with versions of jsch earlier than
<em>since Ant 1.9.4</em></td>
<td align="center" valign="top">No, defaults to false</td>
</tr>
<tr>
<td valign="top">serverAliveIntervalSeconds</td>
<td valign="top">Sets a timeout interval in seconds after which if no data has
been received from the server, the task will send a message through
the encrypted channel to request a response from the server.
<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No, the default is 0, indicating
that these messages will not be sent to the server</td>
</tr>
<tr>
<td valign="top">serverAliveCountMax</td>
<td valign="top">The number of server alive messages which may be
sent without receiving any messages back from the server. Only
used if serverAliveIntervalSeconds is not 0.
<em>since Ant 1.9.7</em></td>
<td align="center" valign="top">No, defaults to 3</td>
</tr>
</table>
<h3>Examples</h3>
......
......@@ -92,7 +92,8 @@ element which is used to perform Entity and URI resolution.</p>
<td valign="top">extension</td>
<td valign="top">desired file extension to be used for the targets. If not
specified, the default is &quot;.html&quot;. Will be ignored if
a nested <code>&lt;mapper&gt;</code> has been specified.</td>
a nested <code>&lt;mapper&gt;</code> or both <code>in</code> and
<code>out</code> have been specified.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
......
......@@ -19,14 +19,14 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
<title>Apache Ant 1.9.6 User Manual</title>
<title>Apache Ant 1.9.7 User Manual</title>
</head>
<body bgcolor="#FFFFFF">
<div align="center">
<h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
<h1>Apache Ant&trade; 1.9.6 Manual</h1>
<p align="left">This is the manual for version 1.9.6 of
<h1>Apache Ant&trade; 1.9.7 Manual</h1>
<p align="left">This is the manual for version 1.9.7 of
<a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>.
If your version
of Ant (as verified with <tt>ant -version</tt>) is older or newer than this
......
......@@ -62,7 +62,7 @@
</ul>
<center>
<p>Version: 1.9.6</p>
<p>Version: 1.9.7</p>
</center>
......
......@@ -77,13 +77,18 @@ ant.project.invoked-targets
been specified on the command line (the IDE,
an &lt;ant&gt; task ...) when invoking the current
project.
This property is set when the first target is executed.
So you can't use it in the implicit target (directly
under the &lt;project&gt; tag).
This property is set properly when the first target is executed.
If you use it in the implicit target (directly
under the &lt;project&gt; tag) the list will be
empty if no target has been specified while it
will contain the project's default target in this
case for tasks nested into targets..
ant.java.version the JVM version Ant detected; currently it can hold
the values &quot;1.7&quot;, &quot;1.6&quot;, &quot;1.5&quot;,
&quot;1.4&quot;, &quot;1.3&quot; and &quot;1.2&quot;.
ant.core.lib the absolute path of the <code>ant.jar</code> file.
the values &quot;1.9&quot;, &quot;1.8&quot;,
&quot;1.7&quot;, &quot;1.6&quot;, &quot;1.5&quot;,
&quot;1.4&quot;, &quot;1.3&quot; and
&quot;1.2&quot;. ant.core.lib the absolute path
of the <code>ant.jar</code> file.
</pre>
<p>There is also another property, but this is set by the launcher
......
......@@ -17,18 +17,10 @@
#
# Simple shell script that checks whether changed files contain a copyright
# statement for a given year.
# statement.
#
# Rename (or symlink) this script to the year you want to check, i.e. name it
# 2002 if you want to check for copyright statements that do not contain
# the year 2002.
#
# Use this script instead of your usual cvs update command.
#
# Usage YEAR [precommit]
#
# If the optional all argument has been omitted, the proposal directory will
# be skipped.
# Use this script instead of your usual git pull command.
#
if [ -n "$TMP" ]; then
......@@ -41,45 +33,21 @@ else
fi
fi
YEAR=`basename $0`
SCM_COMMAND=git
SCM_ARGS="diff --name-only ..origin"
if [ $YEAR = yearcheck.sh ]; then
YEAR=`date -R | cut -d ' ' -f 4`
fi
git fetch
precommit_call=false
for arg in "$@" ; do
if [ "$arg" = "precommit" ] ; then
precommit_call=true
fi
done
"$SCM_COMMAND" $SCM_ARGS > "$TEMP_DIR"/update
if [ -d ".svn" ]; then
SCM_COMMAND=svn
if $precommit_call ; then
SCM_ARGS=status
CUT_ARGS="-c 8-"
else
SCM_ARGS=up
CUT_ARGS="-c 4-"
fi
else
SCM_COMMAND=cvs
SCM_ARGS="-z3 update -dP"