ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r984977 - in /ant/ivy/ivyde/trunk: ./ CHANGES.txt README.txt build.xml signArtifacts.bat
Date Thu, 12 Aug 2010 21:10:52 GMT
Author: hibou
Date: Thu Aug 12 21:10:51 2010
New Revision: 984977

URL: http://svn.apache.org/viewvc?rev=984977&view=rev
Log:
merge back from branch 2.1.0:
------------------------------------------------------------------------
r950998 | jschneider | 2010-06-03 15:58:21 +0200 (Thu, 03 Jun 2010) | 1 line

Change .tgz extension to .tar.gz.
------------------------------------------------------------------------
r909449 | jschneider | 2010-02-12 16:09:10 +0100 (Fri, 12 Feb 2010) | 1 line

Port of signArtifacts.sh for Windows.
------------------------------------------------------------------------
r909448 | jschneider | 2010-02-12 16:08:39 +0100 (Fri, 12 Feb 2010) | 1 line

Fixed bug causing documentation to be dumped at the root of the distribution archives rather
than in the doc directory.
------------------------------------------------------------------------
r905755 | jschneider | 2010-02-02 20:26:33 +0100 (Tue, 02 Feb 2010) | 1 line

Windows equivalent to signArtifacts.sh.
------------------------------------------------------------------------

Added:
    ant/ivy/ivyde/trunk/signArtifacts.bat   (props changed)
      - copied unchanged from r905755, ant/ivy/ivyde/branches/2.1.0/signArtifacts.bat
Modified:
    ant/ivy/ivyde/trunk/   (props changed)
    ant/ivy/ivyde/trunk/CHANGES.txt   (props changed)
    ant/ivy/ivyde/trunk/README.txt   (props changed)
    ant/ivy/ivyde/trunk/build.xml

Propchange: ant/ivy/ivyde/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /ant/ivy/ivyde/branches/2.1.0:905755,909448-909449,950998

Propchange: ant/ivy/ivyde/trunk/CHANGES.txt
            ('svn:mergeinfo' removed)

Propchange: ant/ivy/ivyde/trunk/README.txt
            ('svn:mergeinfo' removed)

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=984977&r1=984976&r2=984977&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Thu Aug 12 21:10:51 2010
@@ -149,8 +149,8 @@
         <condition property="overwrite">
             <isfalse value="${checkUpToDate}" />
         </condition>
-        <mkdir dir="${dist.work.dir}/apache-ivyde-${build.version}" />
-        <copy todir="${dist.work.dir}/apache-ivyde-${build.version}" overwrite="${overwrite}">
+        <mkdir dir="${dist.work.dir}/apache-ivyde-${build.version}/doc" />
+        <copy todir="${dist.work.dir}/apache-ivyde-${build.version}/doc" overwrite="${overwrite}">
             <fileset dir="${src.doc.dir}">
                 <include name="style/**" />
                 <include name="js/**" />
@@ -162,8 +162,8 @@
     <target name="generate-dist-doc-html">
         <taskdef uri="antlib:xooki" file="${basedir}/doc/xooki/antlib.xml" />
         <property name="checkUpToDate" value="true" />
-        <mkdir dir="${dist.work.dir}/apache-ivyde-${build.version}" />
-        <xooki:generate destDir="${dist.work.dir}/apache-ivyde-${build.version}" checkUpToDate="${checkUpToDate}">
+        <mkdir dir="${dist.work.dir}/apache-ivyde-${build.version}/doc" />
+        <xooki:generate destDir="${dist.work.dir}/apache-ivyde-${build.version}/doc" checkUpToDate="${checkUpToDate}">
             <fileset dir="${src.doc.dir}">
                 <include name="**/*.html" />
                 <exclude name="template*.html" />

Propchange: ant/ivy/ivyde/trunk/signArtifacts.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/signArtifacts.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 12 21:10:51 2010
@@ -0,0 +1 @@
+/ant/ivy/ivyde/branches/2.1.0/signArtifacts.bat:905755-905758,909448-909449,950998



Mime
View raw message