You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2012/01/17 09:57:52 UTC

svn commit: r1232345 - in /tomcat/trunk: .gitignore build.xml

Author: rjung
Date: Tue Jan 17 08:57:51 2012
New Revision: 1232345

URL: http://svn.apache.org/viewvc?rev=1232345&view=rev
Log:
Build handling of "target" directories:
- do no longer exclude from copying to dist/src
- Add comment to .gitignore why we do not ignore "target"

Those directories are in use in
test/webapp-3.0-virtual-library and
test/webapp-3.0-virtual-webapp.

Modified:
    tomcat/trunk/.gitignore
    tomcat/trunk/build.xml

Modified: tomcat/trunk/.gitignore
URL: http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1232345&r1=1232344&r2=1232345&view=diff
==============================================================================
--- tomcat/trunk/.gitignore (original)
+++ tomcat/trunk/.gitignore Tue Jan 17 08:57:51 2012
@@ -14,9 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -----------------------------------------------------------------------------
-output
 logs
 nbproject
+output
+# Next line commented out, because test/webapp-3.0-virtual-library and
+# test/webapp-3.0-virtual-webapp use it:
+# target
 work
 build.properties
 mvn.properties

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1232345&r1=1232344&r2=1232345&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jan 17 08:57:51 2012
@@ -1653,7 +1653,11 @@ Apache Tomcat ${version} native binaries
             <filename name="**/.classpath"/>
             <filename name="**/.project"/>
             <filename name="**/output/**"/>
+            <!-- Comented out, because
+                 test/webapp-3.0-virtual-library and
+                 test/webapp-3.0-virtual-webapp use it:
             <filename name="**/target/**"/>
+            -->
             <filename name="**/build.properties"/>
             <filename name="**/mvn.properties"/>
             <filename name="**/*.iml" />



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org