Author: kkolinko
Date: Wed Jun 9 14:43:39 2010
New Revision: 953033
URL: http://svn.apache.org/viewvc?rev=953033&view=rev
Log:
Do not evaluate "execute.installer" in dist.xml, as it is never used:
"skip.installer" is used instead. Backport of r952478.
It is just a cleanup and removal of obsolete comment.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=953033&r1=953032&r2=953033&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 9 14:43:39 2010
@@ -132,10 +132,3 @@ PATCHES PROPOSED TO BACKPORT:
the AccessLog interface. I suppose that might be "long t1, long t2" instead
of "long time".
2) I see no way to turn off this feature or filter the output.
-
-* Do not evaluate "execute.installer" in dist.xml, as it is never used:
- "skip.installer" is used instead. Backport of r952478.
- It is just a cleanup and removal of obsolete comment. Not important.
- http://people.apache.org/~kkolinko/patches/2010-06-07_tc6_build_cleanup.patch
- +1: kkolinko, jfclere, markt
- -1:
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=953033&r1=953032&r2=953033&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jun 9 14:43:39 2010
@@ -142,19 +142,6 @@
<delete dir="${tomcat.deployer}"/>
<delete dir="${tomcat.dist}" failonerror="false"/>
-
- <!-- This is why releasing must be done on a Windows box:
- otherwise this check fails and the .exe distro is not generated -->
- <condition property="execute.installer">
- <and>
- <os family="windows" />
- <available file="${nsis.exe}" />
- <available file="${nsis.installoptions.dll}" />
- <available file="${nsis.nsexec.dll}" />
- <available file="${nsis.nsisdl.dll}" />
- </and>
- </condition>
-
</target>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=953033&r1=953032&r2=953033&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jun 9 14:43:39 2010
@@ -303,6 +303,11 @@
<code>conf/catalina.policy</code> file, to make the text more readable
when cited in documentation. (kkolinko)
</update>
+ <fix>
+ Do not evaluate the <code>execute.installer</code> property when
building
+ a release. The <code>skip.installer</code> property is used instead.
+ (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
