[Wonder-cvs] CVS: Wonder/Build/build build-doc.xml, 1.21, 1.22 build.xml, 1.16, 1.17 generic.xml, 1.52, 1.53

[Bob S. <bob...@us...>]

Update of /cvsroot/wonder/Wonder/Build/build
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25402

Modified Files:
	build-doc.xml build.xml generic.xml 
Log Message:
Added ant property: ${wo.frameworks}
Using a property to store the WebObjects frameworks location.  There should be no
assumption that they are located in a structure that includes "Library/Frameworks".
This is useful if you have multiple WebObjects projects that depend on different
versions of the frameworks (like 5.3.x vs 5.2.x).
The default is to point to the same location, but to allow an override.

Added a property file lookup: build.wonder.properties.
This is useful if you have multiple ant projects and want to keep the settings
in separate files.



Index: build-doc.xml
===================================================================
RCS file: /cvsroot/wonder/Wonder/Build/build/build-doc.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** build-doc.xml	23 Aug 2006 11:32:06 -0000	1.21
--- build-doc.xml	27 Oct 2006 23:37:20 -0000	1.22
***************
*** 10,13 ****
--- 10,14 ----
  
      <property file="${basedir}/Build/build/build.properties" />
+     <property file="${user.home}/build.wonder.properties" />
      <property file="${user.home}/build.properties" />
      <property file="${basedir}/Build/build/default.properties" />

Index: build.xml
===================================================================
RCS file: /cvsroot/wonder/Wonder/Build/build/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.xml	7 Dec 2004 11:54:13 -0000	1.16
--- build.xml	27 Oct 2006 23:37:20 -0000	1.17
***************
*** 17,20 ****
--- 17,21 ----
      <!-- THE DEVELOPER MACHINE AND ALLOW BUILD CUSTOMIZATION. -->                       
      <!-- ==================================================== -->
+     <property file="${user.home}/build.wonder.properties" />
      <property file="${user.home}/build.properties" />
      <property file="Build/build/build.properties" />

Index: generic.xml
===================================================================
RCS file: /cvsroot/wonder/Wonder/Build/build/generic.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** generic.xml	23 Oct 2006 09:48:34 -0000	1.52
--- generic.xml	27 Oct 2006 23:37:20 -0000	1.53
***************
*** 196,199 ****
--- 196,200 ----
          <property name="wonder.root" value="${basedir}" />
          <property file="${wonder.root}/Build/build/build.properties" />
+         <property file="${user.home}/build.wonder.properties" />
          <property file="${user.home}/build.properties" />
          <property file="${wonder.root}/Build/build/default.properties" />
***************
*** 204,207 ****
--- 205,209 ----
          <property name="wo.woroot" value="/System" />
          <property name="wo.localroot" value="/" />
+         <property name="wo.frameworks" value="${wo.woroot}/Library/Frameworks" />
          <property name="build.root" value="${user.home}/Roots" />
          <property name="build.classes" value="${build.root}/classes/${project.name}" />
***************
*** 347,351 ****
                  <include name="${use.additional.framework.15}"/>
             </frameworks>
!             <frameworks dir="${wo.woroot}/Library/Frameworks"> 
                  <include name="JavaFoundation.framework" />
                  <include name="JavaEOAccess.framework" />
--- 349,353 ----
                  <include name="${use.additional.framework.15}"/>
             </frameworks>
!             <frameworks dir="${wo.frameworks}"> 
                  <include name="JavaFoundation.framework" />
                  <include name="JavaEOAccess.framework" />
***************
*** 360,364 ****
                  <include name="JavaWOExtensions.framework" />
              </frameworks>
!             <frameworks dir="${wo.woroot}/Library/Frameworks" if="use.webobjects.d2w"> 
                  <include name="JavaDirectToWeb.framework" />
                  <include name="JavaEOProject.framework" />
--- 362,366 ----
                  <include name="JavaWOExtensions.framework" />
              </frameworks>
!             <frameworks dir="${wo.frameworks}" if="use.webobjects.d2w"> 
                  <include name="JavaDirectToWeb.framework" />
                  <include name="JavaEOProject.framework" />