sanders 02/02/01 17:50:23
Modified: proposal/vindico/src/java/org/apache/alexandria/om
Project.java
Log:
refactor the cvs support into the cvs class
Revision Changes Path
1.6 +17 -28
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Project.java 1 Feb 2002 17:24:41 -0000 1.5
+++ Project.java 2 Feb 2002 01:50:23 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
1.5 2002/02/01 17:24:41 sanders Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/01 17:24:41 $
+ * $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 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Project provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.5 $ $Date: 2002/02/01 17:24:41 $
+ * @version $Revision: 1.6 $ $Date: 2002/02/02 01:50:23 $
*/
public class Project {
@@ -232,10 +232,18 @@
helper.attribute("name", "cvs.dir");
helper.attribute("value", "${basedir}/../pristine");
helper.element("property", true);
+
+ helper.attribute("name", "project.cvs.dir");
+ helper.attribute("value", "${cvs.dir}/" + getParentModule().getName());
+ helper.element("property", true);
}
helper.attribute("name", "all");
- helper.attribute("depends", "cvs-" + name + ", build-" + name);
+ if (getCvs() != null) {
+ helper.attribute("depends", "cvs-" + name + ", build-" + name);
+ } else {
+ helper.attribute("depends", "build-" + name);
+ }
helper.element("target");
helper.attribute("message", "Finished building " + name);
@@ -243,27 +251,9 @@
helper.popElement();
- helper.attribute("name", "cvs-" + name);
- helper.element("target");
-
- helper.attribute("message", "Calling cvs for " + name);
- helper.element("echo", true);
-
-// if (getCvs() != null) {
-// Repository repo = getCvs().getRepo();
-// if (repo.getPassword() != null) {
-// helper.attribute("cvsRoot", repo.getCvsRoot());
-// helper.attribute("password", repo.getPassword());
-// helper.element("cvspass", true);
-// }
-// helper.attribute("command", "checkout");
-// helper.attribute("cvsRoot", cvs.getRepo().getCvsRoot());
-// helper.attribute("dest", "${cvs.dir}");
-// helper.attribute("package", cvs.getModule());
-// helper.element("cvs", true);
-// }
-
- helper.popElement();
+ if (getCvs() != null) {
+ cvs.build(helper);
+ }
helper.attribute("name", "build-" + name);
helper.element("target");
@@ -287,12 +277,11 @@
}
if (getScript() != null) {
- //Note that the IScript object need a ${project.home} set
+ //Note that the IScript object needs a ${project.home} set
script.build(helper);
}
helper.popElement();
-
helper.popElement();
try {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
