ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r889380 - in /ant/ivy/updatesite/trunk: build.xml site-template.xml
Date Thu, 10 Dec 2009 19:40:19 GMT
Author: mbenson
Date: Thu Dec 10 19:40:18 2009
New Revision: 889380

URL: http://svn.apache.org/viewvc?rev=889380&view=rev
Log:
tweak hudson build to be compatible with updatesite clients who don't realize that pack200
still means the packed artifacts are optional

Modified:
    ant/ivy/updatesite/trunk/build.xml
    ant/ivy/updatesite/trunk/site-template.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=889380&r1=889379&r2=889380&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Thu Dec 10 19:40:18 2009
@@ -194,6 +194,7 @@
 
     <target name="generate-site">
         <mkdir dir="${updatesite.dir}" />
+        <property name="site.pack200" value="true" />
         <copy file="${basedir}/site-template.xml" tofile="${updatesite.dir}/site.xml"
overwrite="true">
             <filterchain>
                 <replacetokens>
@@ -201,6 +202,7 @@
                     <token key="UPDATESITE_URL" value="${updatesite.url}" />
                     <token key="IVY_VERSION" value="${ivy.version}" />
                     <token key="IVYDE_VERSION" value="${ivyde.version}" />
+                    <token key="SITE_PACK200" value="${site.pack200}" />
                 </replacetokens>
             </filterchain>
         </copy>
@@ -403,6 +405,10 @@
         <property name="ivyde.zip" refid="ivyde.zip.id" />
     </target>
 
-    <target name="hudson-build" depends="clean,hudson-find-ivy-jar,hudson-find-ivyde-zip,install-ivy-and-ivyde,optimize,checksum"
/>
+    <target name="suppress-pack200">
+        <property name="site.pack200" value="false" />
+    </target>
+
+    <target name="hudson-build" depends="clean,hudson-find-ivy-jar,hudson-find-ivyde-zip,suppress-pack200,install-ivy-and-ivyde,optimize,checksum"
/>
 
 </project>

Modified: ant/ivy/updatesite/trunk/site-template.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/site-template.xml?rev=889380&r1=889379&r2=889380&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/site-template.xml (original)
+++ ant/ivy/updatesite/trunk/site-template.xml Thu Dec 10 19:40:18 2009
@@ -17,7 +17,7 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<site pack200="true"
+<site pack200="@SITE_PACK200@"
       mirrorsURL="@MIRRORS_URL@"
       digestURL="./">
    <description url="@UPDATESITE_URL@">



Mime
View raw message