hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-hivemind/hivebuild dependency.xml dependency.properties
Date Wed, 04 Aug 2004 15:27:24 GMT
hlship      2004/08/04 08:27:24

  Modified:    hivebuild/src/java/org/apache/hivemind/build Grabber.java
               hivebuild dependency.xml dependency.properties
  Log:
  Allow for md5 sums that include the name of the file summed.
  
  Revision  Changes    Path
  1.2       +7 -0      jakarta-hivemind/hivebuild/src/java/org/apache/hivemind/build/Grabber.java
  
  Index: Grabber.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/src/java/org/apache/hivemind/build/Grabber.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Grabber.java	28 Jul 2004 19:19:35 -0000	1.1
  +++ Grabber.java	4 Aug 2004 15:27:23 -0000	1.2
  @@ -187,6 +187,13 @@
           reader.close();
   
           String recordedDigest = buffer.toString().trim();
  +        
  +        // Sometimes a digest has a string identifying the file after the hex string; discard
  +        // that.
  +        
  +        int firstSpace = recordedDigest.indexOf(' ');
  +        if (firstSpace > 0)
  +        	recordedDigest = recordedDigest.substring(0, firstSpace);
   
           if (downloadedDigest.equals(recordedDigest))
               return;
  
  
  
  1.4       +3 -3      jakarta-hivemind/hivebuild/dependency.xml
  
  Index: dependency.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/dependency.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dependency.xml	28 Jul 2004 19:19:35 -0000	1.3
  +++ dependency.xml	4 Aug 2004 15:27:24 -0000	1.4
  @@ -29,9 +29,9 @@
       <attribute name="dest" description="The directory and file to copy to."/>
       <attribute name="md5" description="The URL of an MD5 checksum file used to verify
that the file was downloaded without errors." default=""/>
       <sequential>
  -    <mkdir dir="${hivebuild.classes.dir}"/>
  -    <javac includeantruntime="yes" 
  -        srcdir="${hivebuild.dir}/${java.src.dir}"
  +      <mkdir dir="${hivebuild.classes.dir}"/>
  +      <javac includeantruntime="yes"
  +        srcdir="${hivebuild.src.dir}"
           destdir="${hivebuild.classes.dir}"/>
       	<taskdef classname="org.apache.hivemind.build.Grabber" name="grabber" classpathref="grabber.classpath"/>
         <grabber src="@{src}" dest="@{dest}" md5="@{md5}"/>
  
  
  
  1.2       +2 -1      jakarta-hivemind/hivebuild/dependency.properties
  
  Index: dependency.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/dependency.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dependency.properties	28 Jul 2004 19:19:35 -0000	1.1
  +++ dependency.properties	4 Aug 2004 15:27:24 -0000	1.2
  @@ -13,4 +13,5 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
   
  -hivebuild.classes.dir=${hivebuild.dir}/${java.classes.dir}
  \ No newline at end of file
  +hivebuild.src.dir=${hivebuild.dir}/src
  +hivebuild.classes.dir=${hivebuild.dir}/target/classes
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org


Mime
View raw message