sanders 02/02/01 09:24:41
Modified: proposal/vindico build.xml
proposal/vindico/src/java/org/apache/alexandria/om
Project.java Script.java Workspace.java
Log:
More build work. Trying to get bootstrap-ant to execute. Still a work in
progress.
Revision Changes Path
1.5 +6 -2 jakarta-alexandria/proposal/vindico/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 29 Jan 2002 17:30:47 -0000 1.4
+++ build.xml 1 Feb 2002 17:24:41 -0000 1.5
@@ -2,7 +2,7 @@
<!--
Jakarta Vindico (Alexandria)
- $Id: build.xml,v 1.4 2002/01/29 17:30:47 sanders Exp $
+ $Id: build.xml,v 1.5 2002/02/01 17:24:41 sanders Exp $
-->
<!-- User's overrides to existing properties -->
@@ -176,10 +176,14 @@
<taskdef name="vindico" classname="org.apache.alexandria.Vindico">
<classpath refid="compile.classpath"/>
</taskdef>
- <delete dir="${vindico.basedir}"/>
+ <!--delete dir="${vindico.basedir}"/-->
<mkdir dir="${vindico.basedir}"/>
<mkdir dir="${vindico.basedir}/pristine"/>
+
+ <delete dir="${vindico.basedir}/logs"/>
<mkdir dir="${vindico.basedir}/logs"/>
+
+ <delete dir="${vindico.basedir}/builds"/>
<mkdir dir="${vindico.basedir}/builds"/>
<vindico workspace="${vindico.profile}"/>
<ant dir="${vindico.basedir}/builds" target="vindico"
output="${vindico.basedir}/logs/masterbuild.txt"/>
1.5 +38 -32
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Project.java 31 Jan 2002 16:56:22 -0000 1.4
+++ Project.java 1 Feb 2002 17:24:41 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
1.4 2002/01/31 16:56:22 sanders Exp $
- * $Revision: 1.4 $
- * $Date: 2002/01/31 16:56:22 $
+ * $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 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Project provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.4 $ $Date: 2002/01/31 16:56:22 $
+ * @version $Revision: 1.5 $ $Date: 2002/02/01 17:24:41 $
*/
public class Project {
@@ -217,17 +217,19 @@
helper.attribute("basedir", ".");
helper.element("project");
- helper.attribute("name", "logdir");
+ helper.attribute("name", "log.dir");
helper.attribute("value", "${basedir}/../logs");
helper.element("property", true);
- helper.attribute("name", "project.home");
- helper.attribute("value", "${basedir}/../builds/" + name + "/" + home);
- helper.element("property", true);
+ if (getScript() != null) {
+ helper.attribute("name", "build.home");
+ helper.attribute("value", "${basedir}/" + name);
+ helper.element("property", true);
+ }
//print out the cvsdir if it is used.
if (getCvs() != null) {
- helper.attribute("name", "cvsdir");
+ helper.attribute("name", "cvs.dir");
helper.attribute("value", "${basedir}/../pristine");
helper.element("property", true);
}
@@ -247,19 +249,19 @@
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", "${cvsdir}");
- helper.attribute("package", cvs.getModule());
- helper.element("cvs", 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();
@@ -269,16 +271,20 @@
helper.attribute("message", "Calling build for " + name);
helper.element("echo", true);
- helper.attribute("dir", "${basedir}/../builds/" + name);
- helper.element("mkdir", true);
-
- helper.attribute("preservelastmodified", "yes");
- helper.attribute("todir", "${basedir}../builds/" + name);
- helper.attribute("includeEmptyDirs", "no");
- helper.element("copy");
- helper.attribute("dir", "${basedir}/../pristine/" +
getParentModule().getName() + "/" + name);
- 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("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();
+ }
if (getScript() != null) {
//Note that the IScript object need a ${project.home} set
1.4 +6 -6
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.java
Index: Script.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Script.java 31 Jan 2002 16:56:22 -0000 1.3
+++ Script.java 1 Feb 2002 17:24:41 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.java,v
1.3 2002/01/31 16:56:22 sanders Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/31 16:56:22 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.java,v
1.4 2002/02/01 17:24:41 sanders Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/01 17:24:41 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
* Script provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.3 $ $Date: 2002/01/31 16:56:22 $
+ * @version $Revision: 1.4 $ $Date: 2002/02/01 17:24:41 $
*/
public class Script implements IScript {
@@ -88,8 +88,8 @@
}
public void build(XMLHelper helper) {
- helper.attribute("executable", name);
- helper.attribute("dir", "${project.home}");
+ helper.attribute("executable", name + ".bat");
+ helper.attribute("dir", "${build.home}");
helper.element("exec", true);
}
}
1.6 +6 -4
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java
Index: Workspace.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Workspace.java 31 Jan 2002 16:56:22 -0000 1.5
+++ Workspace.java 1 Feb 2002 17:24:41 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
1.5 2002/01/31 16:56:22 sanders Exp $
- * $Revision: 1.5 $
- * $Date: 2002/01/31 16:56:22 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
1.6 2002/02/01 17:24:41 sanders Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/01 17:24:41 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.5 $ $Date: 2002/01/31 16:56:22 $
+ * @version $Revision: 1.6 $ $Date: 2002/02/01 17:24:41 $
*/
public class Workspace {
@@ -232,6 +232,7 @@
helper.attribute("antfile", "build-" + projectName + ".xml");
helper.attribute("target", "cvs-" + projectName);
helper.attribute("output", logPath + "/" + project.getName() +
"-cvs.xml");
+ helper.attribute("inheritAll", "false");
helper.element("ant");
helper.comment("From project: " + cvs.getParentProject().getName());
helper.popElement();
@@ -253,6 +254,7 @@
helper.attribute("antfile", "build-" + projectName + ".xml");
helper.attribute("target", "build-" + projectName);
helper.attribute("output", logPath + "/" + project.getName() +
"-build.xml");
+ helper.attribute("inheritAll", "false");
helper.element("ant");
if (project.getParentModule() != null) {
helper.comment("From module: " +
project.getParentModule().getName());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
