bodewig 2004/04/13 02:20:01
Modified: java Project.java
Log:
recursively expand dependencies before validating them.
Revision Changes Path
1.60 +10 -3 gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/gump/java/Project.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Project.java 27 Feb 2004 08:31:31 -0000 1.59
+++ Project.java 13 Apr 2004 09:20:01 -0000 1.60
@@ -48,6 +48,7 @@
private Element description;
private Element url;
private Vector deliver = new Vector();
+ private boolean expanded = false;
private static String nagTo = null;
private static String nagPrefix = null;
@@ -312,6 +313,11 @@
* self contained.
*/
private void expandDepends() throws Exception {
+ if (expanded) {
+ return;
+ }
+ expanded = true;
+
String jardir = Workspace.getJarDir();
if (redistributable) {
@@ -337,6 +343,7 @@
}
if (target == null) continue;
+ target.expandDepends();
String inheritAttr = depend.getAttribute("inherit");
if ("jars".equals(inheritAttr)) {
jars.putAll(target.jars);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
