Author: markt
Date: Sun Jun 17 18:01:37 2012
New Revision: 1351136
URL: http://svn.apache.org/viewvc?rev=1351136&view=rev
Log:
Clean up minor issues in source distribution
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1351134-1351135
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1351136&r1=1351135&r2=1351136&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sun Jun 17 18:01:37 2012
@@ -1692,7 +1692,7 @@ Apache Tomcat ${version} native binaries
</target>
- <target name="dist-source">
+ <target name="dist-source" depends="compile-prepare">
<mkdir dir="${tomcat.dist}/src"/>
@@ -1703,6 +1703,7 @@ Apache Tomcat ${version} native binaries
<or>
<filename name="**/.settings/**" />
<filename name="**/.classpath"/>
+ <filename name="**/.checkstyle"/>
<filename name="**/.project"/>
<filename name="**/output/**"/>
<!-- Commented out, because
@@ -1715,12 +1716,15 @@ Apache Tomcat ${version} native binaries
<filename name="**/*.iml" />
<filename name="**/*.asc" />
<filename name="**/*.tmp" />
+ <filename name="**/*.jj" />
<filename name="**/maven-ant-tasks-*.jar" />
<filename name="**/thumbs.db" />
<filename name="**/Thumbs.db" />
<filename name="*.launch"/>
<filename name="bin/setenv.*" />
+ <filename
name="java/org/apache/catalina/startup/catalina.properties" />
<filename name="logs/**" />
+ <filename name="webapps/docs/jdbc-pool.xml" />
<filename name="work/**" />
<filename name="modules/jdbc-pool/bin/**" />
<filename name="modules/jdbc-pool/includes/**" />
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1351136&r1=1351135&r2=1351136&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jun 17 18:01:37 2012
@@ -72,6 +72,10 @@
Fix cleanup of temporary files in <code>TestNamingContext</code> test.
(kkolinko)
</fix>
+ <fix>
+ Remove a few files from the source distribution that are not required
+ since they are copied / generated during the build. (markt)
+ </fix>
</subsection>
</section>
<section name="Tomcat 7.0.28 (markt)">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
