Author: kkolinko
Date: Tue Jul 7 11:50:52 2009
New Revision: 791802
URL: http://svn.apache.org/viewvc?rev=791802&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47464
Do not include *.class files produced by IDE into src archives of TC 5.5
Also, I limited the scope of fixcrlf task in package-src-tgz target
to process the sources dir only.
Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=791802&r1=791801&r2=791802&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jul 7 11:50:52 2009
@@ -1416,6 +1416,7 @@
<!-- tomcat-5 source -->
<copy todir="${tomcat.dist}/src/${tomcat.project}">
<fileset dir="${basedir}">
+ <exclude name="bin/**"/>
<exclude name="build/**"/>
<exclude name="dist/**"/>
<exclude name="release/**"/>
@@ -1440,6 +1441,7 @@
<!-- tomcat container source -->
<copy todir="${tomcat.dist}/src/${catalina.project}">
<fileset dir="${catalina.home}">
+ <exclude name="bin/**"/>
<exclude name="**/build/**"/>
<exclude name="**/dist/**"/>
</fileset>
@@ -1448,6 +1450,7 @@
<!-- tomcat jasper source -->
<copy todir="${tomcat.dist}/src/${jasper.project}">
<fileset dir="${jasper.home}">
+ <exclude name="bin/**"/>
<exclude name="**/build/**"/>
<exclude name="**/dist/**"/>
</fileset>
@@ -1456,6 +1459,7 @@
<!-- tomcat connectors source -->
<copy todir="${tomcat.dist}/src/${jtc.project}">
<fileset dir="${jtc.home}">
+ <exclude name="bin/**"/>
<exclude name="coyote/build/**"/>
<exclude name="http11/build/**"/>
<exclude name="jk/build/**"/>
@@ -1871,7 +1875,7 @@
<!-- Packages the source code distribution in tar.gz format -->
<target name="package-src-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
+ <fixcrlf srcdir="${tomcat.dist}/src"
excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia"
eol="lf" />
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791802&r1=791801&r2=791802&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul 7 11:50:52 2009
@@ -15,7 +15,7 @@
limitations under the License.
================================================================================
-$Revision$ $Date$
+$Id$
=================================
Apache Tomcat 5.5 Patch Proposals
@@ -96,14 +96,6 @@
+1: kkolinko, markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47464
- Do not include *.class files into src archives of TC 5.5
- Also, I limited the scope of fixcrlf task in package-src-tgz target
- to process the sources dir only.
- http://people.apache.org/~kkolinko/patches/2009-07-05_tc55_packsources.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
Reverts previous fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implements an
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
