[prev in list] [next in list] [prev in thread] [next in thread] 

List:       woden-dev
Subject:    svn commit: r348484 - in /incubator/woden/java: build.properties build.xml
From:       hughesj () apache ! org
Date:       2005-11-23 16:52:01
Message-ID: 20051123165202.99135.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: hughesj
Date: Wed Nov 23 08:51:56 2005
New Revision: 348484

URL: http://svn.apache.org/viewcvs?rev=348484&view=rev
Log:
Previously:
downloads directory: prerequisite downloads such as xmlschema and xerces
classes directory: woden classes
classesapi directory: API classes when buildAPI target run
classestest directory: test classes when buildTests target run

All these dirs were peers with the 'java' directory.

If running inside eclipse:
a) project had to be called 'java'
b) the above directories were created as children of the workspace directory, so not \
visible from the woden project in eclipse once ant had finished.

Therefore:
1) downloads directory now a child of java
2) classes, classesapi and classestest children of java/build

also:
3) added showProperties target to show all the properties used. init now depends on \
showProperties


Modified:
    incubator/woden/java/build.properties
    incubator/woden/java/build.xml

Modified: incubator/woden/java/build.properties
URL: http://svn.apache.org/viewcvs/incubator/woden/java/build.properties?rev=348484&r1=348483&r2=348484&view=diff
 ==============================================================================
--- incubator/woden/java/build.properties (original)
+++ incubator/woden/java/build.properties Wed Nov 23 08:51:56 2005
@@ -24,7 +24,7 @@
 XercesJar2           = xml-apis.jar
 
 ! The location of the Woden build home
-build.home           = ../
+build.home           = ${basedir}
 
 ! The version of Woden to build
 version              = 1.0.0

Modified: incubator/woden/java/build.xml
URL: http://svn.apache.org/viewcvs/incubator/woden/java/build.xml?rev=348484&r1=348483&r2=348484&view=diff
 ==============================================================================
--- incubator/woden/java/build.xml (original)
+++ incubator/woden/java/build.xml Wed Nov 23 08:51:56 2005
@@ -22,19 +22,18 @@
 <project name="woden" default="buildImplAndAPI" basedir=".">
 	<property file="${basedir}/build.properties"/>
 	<property name="build.home" value="."/>
-	<property name="javaDir" value="${build.home}/java"/>
-	<property name="build.output" value="${javaDir}/build"/>
+	<property name="build.output" value="${build.home}/build"/>
 	<property name="version" value="1.0.0"/>
 	
 	<property name="downloads" value="${build.home}/downloads"/>
 	<property name="libraryDir" value="${downloads}/lib"/>
-	<property name="build.classes" value="${build.home}/classes"/>
-	<property name="build.classes.api" value="${build.home}/classesapi"/>
-	<property name="build.classes.test" value="${build.home}/classestest"/>
+	<property name="build.classes" value="${build.output}/classes"/>
+	<property name="build.classes.api" value="${build.output}/classesapi"/>
+	<property name="build.classes.test" value="${build.output}/classestest"/>
 	<property name="test.results" value="${build.output}/test-results"/>
-	<property name="src.home" value="${javaDir}/src"/>
-	<property name="testsrc.home" value="${javaDir}/test/"/>
-	<property name="eclipseplugin" value="${javaDir}/eclipseplugin"/>
+	<property name="src.home" value="${build.home}/src"/>
+	<property name="testsrc.home" value="${build.home}/test/"/>
+	<property name="eclipseplugin" value="${build.home}/eclipseplugin"/>
 	<property name="manifestfile" value="META-INF/MANIFEST.MF"/>
 	<property name="build.javadoc" value="${build.output}/Javadoc"/>
 	
@@ -44,8 +43,35 @@
 	<target name="buildAll" depends="clean, init, buildAPI, buildImplAndAPI, \
buildEclipsePlugin, buildJavadoc, buildTests, runTests"/>  
 	<target name="distBuild" depends="buildAll, createArchives, createChecksums"/>
+
+	<target name="showProperties">
+		<echo message="basedir=${basedir}"/>
+		<echo message="build.output=${build.output}"/>
+		<echo message="downloads=${downloads}"/>
+		<echo message="libraryDir=${libraryDir}"/>
+		<echo message="build.classes=${build.classes}"/>
+		<echo message="build.classes.api=${build.classes.api}"/>
+		<echo message="build.classes.test=${build.classes.test}"/>
+		<echo message="test.results=${test.results}"/>
+		<echo message="src.home=${src.home}"/>
+		<echo message="testsrc.home=${testsrc.home}"/>
+		<echo message="eclipseplugin=${eclipseplugin}"/>
+		<echo message="manifestfile=${manifestfile}"/>
+		<echo message="build.javadoc=${build.javadoc}"/>
+		<echo message="XmlSchemaURL=${XmlSchemaURL}"/>
+		<echo message="XmlSchemaFile=${XmlSchemaFile}"/>
+		<echo message="XercesURL=${XercesURL}"/>
+		<echo message="XercesFile=${XercesFile}"/>
+		<echo message="XercesJar1=${XercesJar1}"/>
+		<echo message="XercesJar2=${XercesJar2}"/>
+		<echo message="build.home=${build.home}"/>
+		<echo message="version=${version}"/>
+		<echo message="milestone=${milestone}"/>
+		<echo message="buildType=${buildType}"/>
+	</target>
+
 	
-	<target name="init" depends="getPreReq">
+	<target name="init" depends="showProperties, getPreReq">
 		<tstamp>
      		<format property="timestamp" pattern="yyyyMMdd_hhmm"/>
   		</tstamp>
@@ -268,7 +294,7 @@
 		</copy>
 		<!-- Copy the root files such as license, readme -->
 		<copy todir="${archiveDir}">
-			<fileset dir="${javaDir}">
+			<fileset dir="${build.home}">
 				<include name="LICENSE"/>
 				<include name="LICENSE.dom"/>
 				<include name="LICENSE.sax"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]