[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Build build.xml,1.4,1.5

[Camille T. <tus...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Build
In directory sc8-pr-cvs1:/tmp/cvs-serv6716

Modified Files:
	build.xml 
Log Message:
Modified build.xml so that it builds correctly when ran locally.


Index: build.xml
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Build/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.xml	21 Sep 2002 15:29:38 -0000	1.4
--- build.xml	27 Nov 2002 09:55:09 -0000	1.5
***************
*** 1 ****
! <project name="ERExtensions" default="all" basedir="..">
    <property name="project.principal.class" value="er.extensions.ERExtensions" />
    <property name="project.name" value="${ant.project.name}" />

    <!-- dont touch from here on 
    <property name="project.dir" value="${basedir}" /> 
    <property name="wonder.root" value="${project.dir}" />-->

    <!-- ==================================================== -->
    <!-- Sets up base properties                              -->
    <!-- ==================================================== -->

    <target name="macosx">
        <condition property="is-macosx">
            <and>
                <os family="mac" />
                <os family="unix" />
            </and>
        </condition>
    </target>

    <target name="windows">
        <condition property="is-windows">
            <os family="windows" />
        </condition>
    </target>

    <target name="unix">
        <condition property="is-unix">
            <and>
                <os family="unix" />
                <not><os family="mac" /></not>
            </and>
        </condition>
    </target>

    <target name="check-macosx" if="is-macosx" depends="macosx">
        <echo message="is Mac OS X ..." />
        <property name="next.root" value="/System" />
        <property name="wo.woroot" value="${next.root}" />
        <property name="wo.localroot" value="/" />
        <property name="build.root" value="${user.home}/Roots" />
    </target>

    <target name="check-windows" if="is-windows" depends="windows">
        <echo message="is Windows ..." />
        <property environment="env" />
        <property name="next.root" value="${env.NEXT_ROOT}" />
        <property name="wo.woroot" value="${next.root}" />
        <property name="wo.localroot" value="${next.root}/Local" />
        <property name="build.root" value="C:/Roots" />
    </target>
   
    <target name="check-unix" if="is-unix" depends="unix">
        <echo message="is Unix ..." />
        <property name="next.root" value="/" />
        <property name="wo.woroot" value="${next.root}" />
        <property name="wo.localroot" value="${next.root}/Local" />
        <property name="build.root" value="${user.home}/Roots" />
    </target>

    <target name="init" depends="check-macosx, check-windows, check-unix" unless="init"
                description="initialize properties">
        <property name="wo.system.root" value="${wo.woroot}/Library/Frameworks" />
        <property name="wo.local.root" value="${wo.localroot}/Library/Frameworks" />
        <property name="wo.server.root" value="/Library/WebServer/Documents/WebObjects/Frameworks" />
        <property name="wonder.root" value="${basedir}" />
    </target>
    
    

    <target name="clean" depends="init">
        <ant antfile="../../../Build/build/common.xml" target="${ant.project.name}.clean" />
    </target>

    <target name="install" depends="init">
        <ant antfile="../../../Build/build/common.xml" target="install" />
    </target>

    <target name="usage" depends="init">
        <ant antfile="../../../Build/build/common.xml" target="usage" />
    </target>

    <target name="all" depends="init">
        <ant antfile="../../../Build/build/common.xml" target="${ant.project.name}.all" />
    </target>
</project>
\ No newline at end of file
--- 1 ----
! <project name="ERExtensions" default="all" basedir="../../../..">
    <property name="project.principal.class" value="er.extensions.ERExtensions" />
    <property name="project.name" value="${ant.project.name}" />

    <!-- dont touch from here on 
    <property name="project.dir" value="${basedir}" /> 
    <property name="wonder.root" value="${project.dir}" />-->

    <!-- ==================================================== -->
    <!-- Sets up base properties                              -->
    <!-- ==================================================== -->

    <target name="macosx">
        <condition property="is-macosx">
            <and>
                <os family="mac" />
                <os family="unix" />
            </and>
        </condition>
    </target>

    <target name="windows">
        <condition property="is-windows">
            <os family="windows" />
        </condition>
    </target>

    <target name="unix">
        <condition property="is-unix">
            <and>
                <os family="unix" />
                <not><os family="mac" /></not>
            </and>
        </condition>
    </target>

    <target name="check-macosx" if="is-macosx" depends="macosx">
        <echo message="is Mac OS X ..." />
        <property name="next.root" value="/System" />
        <property name="wo.woroot" value="${next.root}" />
        <property name="wo.localroot" value="/" />
        <property name="build.root" value="${user.home}/Roots" />
    </target>

    <target name="check-windows" if="is-windows" depends="windows">
        <echo message="is Windows ..." />
        <property environment="env" />
        <property name="next.root" value="${env.NEXT_ROOT}" />
        <property name="wo.woroot" value="${next.root}" />
        <property name="wo.localroot" value="${next.root}/Local" />
        <property name="build.root" value="C:/Roots" />
    </target>
   
    <target name="check-unix" if="is-unix" depends="unix">
        <echo message="is Unix ..." />
        <property name="next.root" value="/" />
        <property name="wo.woroot" value="${next.root}" />
        <property name="wo.localroot" value="${next.root}/Local" />
        <property name="build.root" value="${user.home}/Roots" />
    </target>

    <target name="init" depends="check-macosx, check-windows, check-unix" unless="init"
                description="initialize properties">
        <property name="wo.system.root" value="${wo.woroot}/Library/Frameworks" />
        <property name="wo.local.root" value="${wo.localroot}/Library/Frameworks" />
        <property name="wo.server.root" value="/Library/WebServer/Documents/WebObjects/Frameworks" />
        <property name="wonder.root" value="${basedir}" />
    </target>
    
    

    <target name="clean" depends="init">
        <ant antfile="Build/build/common.xml" target="${ant.project.name}.clean" />
    </target>

    <target name="install" depends="init">
        <ant antfile="Build/build/common.xml" target="install" />
    </target>

    <target name="usage" depends="init">
        <ant antfile="Build/build/common.xml" target="usage" />
    </target>

    <target name="all" depends="init">
        <ant antfile="Build/build/common.xml" target="${ant.project.name}.all" />
    </target>
</project>
\ No newline at end of file