costin 2003/03/12 15:15:17
Modified: . build.properties.default build.xml
Log:
Add back downloading - the other target might use it.
Fix the ../repository ( it needs location ).
Fix the clean-build of modeler.
Revision Changes Path
1.75 +2 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- build.properties.default 12 Mar 2003 22:53:47 -0000 1.74
+++ build.properties.default 12 Mar 2003 23:15:17 -0000 1.75
@@ -36,7 +36,7 @@
# ----- Default Base Path for Dependent Packages -----
#base.path=/usr/share/java
-base.path=../repository
+#base.path=../repository
# --------------------------------------------------
1.99 +15 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- build.xml 12 Mar 2003 22:53:47 -0000 1.98
+++ build.xml 12 Mar 2003 23:15:17 -0000 1.99
@@ -7,6 +7,11 @@
<!-- property values you must customize for successful building!!! -->
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
+
+ <!-- If not set explicitely in one of the user overrides, set it here
+ -->
+ <property name="base.path" location="../repository" />
+
<property file="build.properties.default"/>
<!-- Project Properties -->
@@ -447,6 +452,8 @@
<ant dir="${cvs.base}/jakarta-commons/modeler" target="jar" >
<property name="commons-logging.jar"
location="${tomcat.build}/server/lib/commons-logging.jar" />
<property name="commons-modeler.jar"
location="${tomcat.build}/server/lib/commons-modeler.jar" />
+ <property name="jmx.jar" location="${jmx.jar}" />
+ <property name="commons-digester.jar" location="${commons-digester.jar}" />
<property name="build.home" value="${tomcat.build}" />
</ant>
</target>
@@ -1340,18 +1347,20 @@
<!--
This is our own stuff - don't get binaries, we'll build it ourself
- <antcall target="cvsbuild">
- <param name="location" value="${commons-modeler.cvs.loc}"/>
- <param name="subdir" value="${commons-modeler.home}"/>
- <param name="destfile" value="${commons-modeler.jar}"/>
- </antcall>
+-->
+ <ant target="cvsbuild">
+ <property name="location" value="${commons-modeler.cvs.loc}"/>
+ <property name="subdir" value="${commons-modeler.home}"/>
+ <property name="destfile" value="${commons-modeler.jar}"/>
+ <property name="jmx.jar" location="${jmx.jar}" />
+ <property name="commons-digester.jar" location="${commons-digester.jar}" />
+ </ant>
<antcall target="cvsbuild">
<param name="location" value="${commons-el.cvs.loc}"/>
<param name="subdir" value="${commons-el.home}"/>
<param name="destfile" value="${commons-el.jar}"/>
</antcall>
--->
<antcall target="downloadfile">
<param name="sourcefile" value="${nsis.loc}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
