Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/jaxws/build-defs.xml

    r2 r278  
    11<?xml version="1.0"?>
    22<!--
    3  Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     3 Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
    44 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55
    66 This code is free software; you can redistribute it and/or modify it
    77 under the terms of the GNU General Public License version 2 only, as
    8  published by the Free Software Foundation.  Sun designates this
     8 published by the Free Software Foundation.  Oracle designates this
    99 particular file as subject to the "Classpath" exception as provided
    10  by Sun in the LICENSE file that accompanied this code.
     10 by Oracle in the LICENSE file that accompanied this code.
    1111
    1212 This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    2020 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2121
    22  Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    23  CA 95054 USA or visit www.sun.com if you need additional information or
    24  have any questions.
     22 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     23 or visit www.oracle.com if you need additional information or have any
     24 questions.
    2525-->
    2626
    … …  
    5656    <drop-import name="jaf_src"/>
    5757    <!-- <drop-import name="jaxws_tests"/> -->
     58   
     59    <!-- Fail and print helpful messages if source does not exist. -->
     60    <target name="-src-help">
     61      <fail message="${failed.url.src.message}">
     62        <condition>
     63            <and>
     64                <not>
     65                    <and>
     66                        <available file="${jaxws_src.src.dir}" type="dir"/>
     67                        <available file="${jaf_src.src.dir}" type="dir"/>
     68                    </and>
     69                </not>
     70                <istrue value="${allow.downloads}"/>
     71            </and>
     72        </condition>
     73      </fail>
     74      <fail message="${failed.nourl.src.message}">
     75        <condition>
     76            <not>
     77                <and>
     78                    <available file="${jaxws_src.src.dir}" type="dir"/>
     79                    <available file="${jaf_src.src.dir}" type="dir"/>
     80                </and>
     81            </not>
     82        </condition>
     83      </fail>
     84    </target>
    5885
    59     <!-- Special build area preparation. -->
    60     <target name="-drop-build-prep" depends="init, -init-src-dirs">
     86    <!-- Special build area setup. -->
     87    <target name="-drop-build-setup" depends="init, -init-src-dirs">
    6188        <mkdir dir="${build.classes.dir}"/>
    6289        <copy todir="${build.classes.dir}">
    … …  
    100127    <!-- Source directory selection. -->
    101128    <target name="-init-src-dirs"
    102             depends="init, -use-drop">
     129            depends="init, -use-drop,-src-help">
    103130        <echo message="Using primary.src.dir=${primary.src.dir}"/>
    104131        <pathconvert property="src.list.id" refid="src.dir.id"/>
Note: See TracChangeset for help on using the changeset viewer.