sanders 02/02/01 18:20:52
Modified: proposal/vindico/src/java/org/apache/alexandria/om
Project.java
Log:
No cvs for projects without it, no build for
projects without it
Revision Changes Path
1.7 +33 -27
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Project.java 2 Feb 2002 01:50:23 -0000 1.6
+++ Project.java 2 Feb 2002 02:20:51 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
1.6 2002/02/02 01:50:23 sanders Exp $
- * $Revision: 1.6 $
- * $Date: 2002/02/02 01:50:23 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
1.7 2002/02/02 02:20:51 sanders Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/02 02:20:51 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Project provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.6 $ $Date: 2002/02/02 01:50:23 $
+ * @version $Revision: 1.7 $ $Date: 2002/02/02 02:20:51 $
*/
public class Project {
@@ -239,10 +239,18 @@
}
helper.attribute("name", "all");
+ String depends = "";
if (getCvs() != null) {
- helper.attribute("depends", "cvs-" + name + ", build-" + name);
- } else {
- helper.attribute("depends", "build-" + name);
+ depends = "cvs-" + name;
+ }
+ if (getScript() != null) {
+ if (depends.length() > 0) {
+ depends += ",";
+ }
+ depends += "build-" + name;
+ }
+ if (depends.length() > 0) {
+ helper.attribute("depends", depends);
}
helper.element("target");
@@ -255,33 +263,31 @@
cvs.build(helper);
}
- helper.attribute("name", "build-" + name);
- helper.element("target");
+ if (getScript() != null) {
+ helper.attribute("name", "build-" + name);
+ helper.element("target");
- helper.attribute("message", "Calling build for " + name);
- helper.element("echo", true);
+ helper.attribute("message", "Calling build for " + name);
+ helper.element("echo", true);
- //only do the actual build if this is a buildable package.
- //FIXME Do we need a 'processable' attribute for projects?
- if (packageDir == null) {
-// helper.attribute("dir", "${basedir}/../builds/" + name);
-// helper.element("mkdir", true);
-
- helper.attribute("preservelastmodified", "yes");
- helper.attribute("todir", "${build.home}");
- helper.attribute("includeEmptyDirs", "no");
- helper.element("copy");
- helper.attribute("dir", "${basedir}/../pristine/" +
getParentModule().getName());
- helper.element("fileset", true);
- helper.popElement();
- }
+ //only do the actual build if this is a buildable package.
+ //FIXME Do we need a 'processable' attribute for projects?
+ if (packageDir == null) {
+ helper.attribute("preservelastmodified", "yes");
+ helper.attribute("todir", "${build.home}");
+ helper.attribute("includeEmptyDirs", "no");
+ helper.element("copy");
+ helper.attribute("dir", "${basedir}/../pristine/" +
getParentModule().getName());
+ helper.element("fileset", true);
+ helper.popElement();
+ }
- if (getScript() != null) {
//Note that the IScript object needs a ${project.home} set
script.build(helper);
+
+ helper.popElement();
}
- helper.popElement();
helper.popElement();
try {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
