ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/script ant
Date Mon, 31 Mar 2003 09:22:25 GMT
bodewig     2003/03/31 01:22:25

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/optional/starteam
                        Tag: ANT_15_BRANCH TreeBasedTask.java
               src/script Tag: ANT_15_BRANCH ant
  Log:
  Merge fixes for 17646 and 17721 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.130 +5 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.263.2.129
  retrieving revision 1.263.2.130
  diff -u -r1.263.2.129 -r1.263.2.130
  --- WHATSNEW	27 Mar 2003 10:07:19 -0000	1.263.2.129
  +++ WHATSNEW	31 Mar 2003 09:22:24 -0000	1.263.2.130
  @@ -33,6 +33,11 @@
   * The prefix attribute of <zipfileset> would not generate directory
     entries for the prefix itself.  Bugzilla Report 18403.
   
  +* starteam checkout can now handle deleted labels.  Bugzilla Report 17646.
  +
  +* The Unix wrapper script failed if you invoked it as a relative
  +  symlink and ANT_HOME has not been set.  Bugzilla Report 17721.
  +
   Other Changes:
   --------------
   * Added ability to specify manifest encoding for the <jar> and 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.4   +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
  
  Index: TreeBasedTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java,v
  retrieving revision 1.8.2.3
  retrieving revision 1.8.2.4
  diff -u -r1.8.2.3 -r1.8.2.4
  --- TreeBasedTask.java	13 Feb 2003 13:59:53 -0000	1.8.2.3
  +++ TreeBasedTask.java	31 Mar 2003 09:22:25 -0000	1.8.2.4
  @@ -566,7 +566,7 @@
           for (int i = 0; i < allLabels.length; i++) {
               Label stLabel = allLabels[i];
               log("checking label " + stLabel.getName(), Project.MSG_DEBUG);
  -            if (stLabel.getName().equals(this.label)) {
  +            if (stLabel != null && !stLabel.isDeleted() && stLabel.getName().equals(this.label))
{
                   if (!stLabel.isRevisionLabel() && !stLabel.isViewLabel()) {
                       throw new BuildException("Unexpected label type.");
                   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.19.2.15 +4 -4      ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant,v
  retrieving revision 1.19.2.14
  retrieving revision 1.19.2.15
  diff -u -r1.19.2.14 -r1.19.2.15
  --- ant	21 Feb 2003 11:54:51 -0000	1.19.2.14
  +++ ant	31 Mar 2003 09:22:25 -0000	1.19.2.15
  @@ -55,7 +55,7 @@
     while [ -h "$PRG" ] ; do
       ls=`ls -ld "$PRG"`
       link=`expr "$ls" : '.*-> \(.*\)$'`
  -    if expr "$link" : '.*/.*' > /dev/null; then
  +    if expr "$link" : '/.*' > /dev/null; then
   	PRG="$link"
       else
   	PRG=`dirname "$PRG"`"/$link"
  @@ -150,9 +150,9 @@
   
     # OSX hack to make Ant work with jikes
     if $darwin ; then
  -    OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
  -    if [ -d ${OSXHACK} ] ; then
  -      for i in ${OSXHACK}/*.jar
  +    OSXHACK="${JAVA_HOME}/../Classes"
  +    if [ -d "${OSXHACK}" ] ; then
  +      for i in "${OSXHACK}"/*.jar
         do
           JIKESPATH="$JIKESPATH:$i"
         done
  
  
  

Mime
View raw message