notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1359 - trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1359 - trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks
- Date: Tue, 11 Apr 2006 22:51:25 +0200
Author: mcconnell
Date: 2006-04-11 22:51:24 +0200 (Tue, 11 Apr 2006)
New Revision: 1359
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
Log:
fix bug in PrepareTask that was incorrectly concatonating exclude path
strings (resulting in things lik exes being filtered and consequently
corrupted)
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
2006-04-11 04:12:47 UTC (rev 1358)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
2006-04-11 20:51:24 UTC (rev 1359)
@@ -88,7 +88,7 @@
// setup the file system
//
- String filters = resource.getProperty( SRC_FILTERED_INCLUDES_KEY,
SRC_FILTERED_INCLUDES_VALUE );
+ String filters = context.getProperty( SRC_FILTERED_INCLUDES_KEY,
SRC_FILTERED_INCLUDES_VALUE );
mkDir( context.getTargetDirectory() );
if( context.getSrcMainDirectory().exists() )
{
@@ -135,9 +135,9 @@
if( context.getEtcMainDirectory().exists() )
{
final String includes =
- resource.getProperty( ETC_FILTERED_INCLUDES_KEY,
ETC_FILTERED_INCLUDES_VALUE );
+ context.getProperty( ETC_FILTERED_INCLUDES_KEY,
ETC_FILTERED_INCLUDES_VALUE );
final String excludes =
- resource.getProperty( ETC_FILTERED_EXCLUDES_KEY,
ETC_FILTERED_EXCLUDES_VALUE );
+ context.getProperty( ETC_FILTERED_EXCLUDES_KEY,
ETC_FILTERED_EXCLUDES_VALUE );
//
// copy ${etc}/main content to ${target}/build/main
@@ -152,9 +152,9 @@
if( context.getEtcTestDirectory().exists() )
{
final String includes =
- resource.getProperty( ETC_FILTERED_INCLUDES_KEY,
ETC_FILTERED_INCLUDES_VALUE );
+ context.getProperty( ETC_FILTERED_INCLUDES_KEY,
ETC_FILTERED_INCLUDES_VALUE );
final String excludes =
- resource.getProperty( ETC_FILTERED_EXCLUDES_KEY,
ETC_FILTERED_EXCLUDES_VALUE );
+ context.getProperty( ETC_FILTERED_EXCLUDES_KEY,
ETC_FILTERED_EXCLUDES_VALUE );
//
// copy ${etc}/test content to ${target}/build/test
@@ -169,9 +169,9 @@
if( context.getEtcDirectory().exists() )
{
final String includes =
- resource.getProperty( ETC_FILTERED_INCLUDES_KEY,
ETC_FILTERED_INCLUDES_VALUE );
+ context.getProperty( ETC_FILTERED_INCLUDES_KEY,
ETC_FILTERED_INCLUDES_VALUE );
final String excludes =
- resource.getProperty( ETC_FILTERED_EXCLUDES_KEY,
ETC_FILTERED_EXCLUDES_VALUE );
+ context.getProperty( ETC_FILTERED_EXCLUDES_KEY,
ETC_FILTERED_EXCLUDES_VALUE );
final File etc = context.getEtcDirectory();
//
@@ -183,7 +183,7 @@
String test = context.getEtcTestDirectory().toString() + "/**";
File target = context.getTargetDirectory();
final String standard = main + "," + test;
- copy( etc, target, true, includes, standard + excludes );
+ copy( etc, target, true, includes, standard + "," + excludes );
copy( etc, target, false, excludes, standard );
}
}
- r1359 - trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks, mcconnell at BerliOS, 04/11/2006
Archive powered by MHonArc 2.6.24.